diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-05-23 07:37:25 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2024-12-19 22:39:59 -0500 |
| commit | 08abedf095a36d4b3664e6424687dd7a9899d1a6 (patch) | |
| tree | 37f713280296faa471ddcd0b77b60722b4b206dc /meta-pipewire | |
| parent | 145a07781f8492b859c51a8d493909aabf4e22e9 (diff) | |
Update recipes for transition to UNPACKDIR
Update recipes to handle the transition to using UNPACKDIR as the
destination for unpacked files. For recipes that had been using
S = WORKDIR, the approach used in meta-openembedded has been
followed, i.e. using UNPACKDIR in tasks for consistency.
Bug-AGL: SPEC-5147
Change-Id: I32e277e15e5aa1ac93dadc67199dedd148d3d0b9
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'meta-pipewire')
| -rw-r--r-- | meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb | 19 | ||||
| -rw-r--r-- | meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb | 9 |
2 files changed, 19 insertions, 9 deletions
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb index db2c67dcf..1e071047c 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb @@ -5,6 +5,7 @@ AUTHOR = "George Kiagiadakis <george.kiagiadakis@collabora.com>" SECTION = "multimedia" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + SRC_URI = "\ file://20-AGL-log.conf \ file://20-AGL-profiles.conf \ @@ -14,6 +15,10 @@ SRC_URI = "\ file://alsa-suspend.lua \ file://wireplumber-bluetooth.conf \ " + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" do_configure[noexec] = "1" @@ -26,19 +31,19 @@ do_install:append() { # install the configuration fragments install -d ${config_dir} - install -m 0644 ${WORKDIR}/20-AGL-log.conf ${config_dir} - install -m 0644 ${WORKDIR}/20-AGL-profiles.conf ${config_dir} - install -m 0644 ${WORKDIR}/30-AGL-alsa.conf ${config_dir} - install -m 0644 ${WORKDIR}/30-AGL-bluetooth.conf ${config_dir} - install -m 0644 ${WORKDIR}/50-AGL-pw-ic-ipc.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/20-AGL-log.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/20-AGL-profiles.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/30-AGL-alsa.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/30-AGL-bluetooth.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/50-AGL-pw-ic-ipc.conf ${config_dir} # install the alsa-suspend script, loaded by the audio instance install -d ${scripts_dir} - install -m 0644 ${WORKDIR}/alsa-suspend.lua ${scripts_dir} + install -m 0644 ${UNPACKDIR}/alsa-suspend.lua ${scripts_dir} # install dbus daemon configuration install -d ${dbus_config_dir} - install -m 0644 ${WORKDIR}/wireplumber-bluetooth.conf ${dbus_config_dir} + install -m 0644 ${UNPACKDIR}/wireplumber-bluetooth.conf ${dbus_config_dir} # enable additional systemd services install -d ${systemd_dir} diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb index 7973a0a33..b59a1c87a 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb @@ -5,10 +5,15 @@ AUTHOR = "Ashok Sidipotu <ashok.sidipotu@collabora.com>" SECTION = "multimedia" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + SRC_URI = "\ file://50-AGL-equalizer.conf \ file://50-AGL-media-role-nodes.conf \ " + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" do_configure[noexec] = "1" @@ -18,8 +23,8 @@ do_install:append() { systemd_dir="${D}${sysconfdir}/systemd/system/pipewire.service.wants" install -d ${config_dir} - install -m 0644 ${WORKDIR}/50-AGL-equalizer.conf ${config_dir} - install -m 0644 ${WORKDIR}/50-AGL-media-role-nodes.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/50-AGL-equalizer.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/50-AGL-media-role-nodes.conf ${config_dir} # enable additional systemd services install -d ${systemd_dir} |