Merge pull request #2395 from adamg88/snafu-cleanup

packages: cleanup patch snafu's
This commit is contained in:
Adam 2023-11-21 22:04:22 +00:00 committed by GitHub
commit 6192eb5504
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 49 deletions

View file

@ -70,20 +70,3 @@ diff -rupN pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket pipewi
SocketMode=0660
[Install]
diff -rupN pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket.rej pipewire-0.3.84/src/daemon/systemd/system/pipewire.socket.rej
--- pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket.rej 1970-01-01 00:00:00.000000000 +0000
+++ pipewire-0.3.84/src/daemon/systemd/system/pipewire.socket.rej 2023-11-13 16:36:28.096495134 +0000
@@ -0,0 +1,13 @@
+--- src/daemon/systemd/system/pipewire.socket 2023-08-07 01:36:39.320782246 +0000
++++ src/daemon/systemd/system/pipewire.socket 2023-08-07 22:38:25.418008336 +0000
+@@ -4,8 +4,8 @@ Description=PipeWire Multimedia System S
+ [Socket]
+ Priority=6
+ ListenStream=%t/pipewire/pipewire-0
+-SocketUser=pipewire
+-SocketGroup=pipewire
++SocketUser=root
++SocketGroup=root
+ SocketMode=0660
+
+ [Install]

View file

@ -27,34 +27,3 @@ diff -rupN wireplumber-0.4.15.orig/src/systemd/system/wireplumber@.service.in wi
Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire
Environment=GIO_USE_VFS=local
diff -rupN wireplumber-0.4.15.orig/src/systemd/system/wireplumber@.service.in.orig wireplumber-0.4.15/src/systemd/system/wireplumber@.service.in.orig
--- wireplumber-0.4.15.orig/src/systemd/system/wireplumber@.service.in.orig 1970-01-01 00:00:00.000000000 +0000
+++ wireplumber-0.4.15/src/systemd/system/wireplumber@.service.in.orig 2023-10-12 16:24:26.000000000 +0000
@@ -0,0 +1,27 @@
+# Service file to run WirePlumber in split mode, i.e. run multiple
+# WirePlumber instances with different module sets.
+# The template argument is used to load the configuration file, e.g.
+# wireplumber@main.service loads main.conf,
+# wireplumber@policy.service loads policy.conf, etc.
+[Unit]
+Description=Multimedia Service Session Manager (%i)
+After=pipewire.service
+BindsTo=pipewire.service
+Conflicts=pipewire-media-session.service
+
+[Service]
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+NoNewPrivileges=yes
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+Type=simple
+AmbientCapabilities=CAP_SYS_NICE
+ExecStart=@WP_BINARY@ -c %i.conf
+Restart=on-failure
+User=pipewire
+Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire
+Environment=GIO_USE_VFS=local
+
+[Install]
+WantedBy=pipewire.service

View file

@ -15,6 +15,12 @@ lock_source_dir "${1}"
# Check again in case of concurrent access - if nothing needs to be downloaded, exit now...
_get_file_already_downloaded && exit 0
# Check if a package source directory already exists and clean it out if it does
if [ -d "${SOURCES}/${1}" ]; then
build_msg "CLR_CLEAN" "DELETE" "(${1}/${1}-*)"
rm -rf "${SOURCES}/${1}/${1}-"*
fi
# At this point, we need to download something...
build_msg "CLR_GET" "GET" "${1} (archive)" "indent"

View file

@ -48,7 +48,7 @@ pkg_lock_status "GETPKG" "${PKG_NAME}" "unpack" "processing package repository..
rm -f "${STAMP_URL}" "${STAMP_SHA}"
GIT_CLONE_PARAMS="--recursive"
GIT_CLONE_PARAMS="--recursive --shallow-submodules --filter=tree:0"
GIT_SUBMODULE_PARAMS=""
[ -n "${PKG_GIT_CLONE_BRANCH}" ] && GIT_CLONE_PARAMS="${GIT_CLONE_PARAMS} --branch ${PKG_GIT_CLONE_BRANCH}"