diff options
Diffstat (limited to 'meta-pipewire')
3 files changed, 21 insertions, 11 deletions
diff --git a/meta-pipewire/conf/layer.conf b/meta-pipewire/conf/layer.conf index 45a325b78..0a2365000 100644 --- a/meta-pipewire/conf/layer.conf +++ b/meta-pipewire/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-pipewire" BBFILE_PATTERN_meta-pipewire = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-pipewire = "71" -LAYERSERIES_COMPAT_meta-pipewire = "kirkstone langdale mickledore nanbield scarthgap" +LAYERSERIES_COMPAT_meta-pipewire = "styhead" LAYERDEPENDS_meta-pipewire = "openembedded-layer" # 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 22ffe5bf3..77c7d99ed 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://bluetooth.lua.d/ \ file://host.lua.d/ \ @@ -14,6 +15,10 @@ SRC_URI = "\ file://wireplumber.conf \ file://wireplumber-bluetooth.conf \ " + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" do_configure[noexec] = "1" @@ -25,27 +30,27 @@ do_install:append() { systemd_dir="${D}${sysconfdir}/systemd/system/pipewire.service.wants/" install -d ${config_dir} - install -m 0644 ${WORKDIR}/00-functions.lua ${config_dir} + install -m 0644 ${UNPACKDIR}/00-functions.lua ${config_dir} # config of the main (host) instance install -d ${config_dir}/host.lua.d/ ln -s ../00-functions.lua ${config_dir}/host.lua.d/00-functions.lua - install -m 0644 ${WORKDIR}/host.lua.d/*.lua ${config_dir}/host.lua.d/ - install -m 0644 ${WORKDIR}/wireplumber.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/host.lua.d/*.lua ${config_dir}/host.lua.d/ + install -m 0644 ${UNPACKDIR}/wireplumber.conf ${config_dir} # config of the bluetooth instance install -d ${config_dir}/bluetooth.lua.d/ ln -s ../00-functions.lua ${config_dir}/bluetooth.lua.d/00-functions.lua - install -m 0644 ${WORKDIR}/bluetooth.lua.d/*.lua ${config_dir}/bluetooth.lua.d/ - install -m 0644 ${WORKDIR}/bluetooth.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/bluetooth.lua.d/*.lua ${config_dir}/bluetooth.lua.d/ + install -m 0644 ${UNPACKDIR}/bluetooth.conf ${config_dir} # install the alsa-suspend script, loaded by the main 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 1a031160e..96e5c48c5 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,11 +5,16 @@ AUTHOR = "Ashok Sidipotu <ashok.sidipotu@collabora.com>" SECTION = "multimedia" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + SRC_URI = "\ file://policy.lua.d \ file://00-functions.lua \ file://policy.conf \ " + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" do_configure[noexec] = "1" @@ -19,13 +24,13 @@ do_install:append() { systemd_dir="${D}${sysconfdir}/systemd/system/pipewire.service.wants" install -d ${config_dir} - install -m 0644 ${WORKDIR}/00-functions.lua ${config_dir} + install -m 0644 ${UNPACKDIR}/00-functions.lua ${config_dir} # config of the policy instance install -d ${config_dir}/policy.lua.d/ ln -s ../00-functions.lua ${config_dir}/policy.lua.d/00-functions.lua - install -m 0644 ${WORKDIR}/policy.lua.d/*.lua ${config_dir}/policy.lua.d/ - install -m 0644 ${WORKDIR}/policy.conf ${config_dir} + install -m 0644 ${UNPACKDIR}/policy.lua.d/*.lua ${config_dir}/policy.lua.d/ + install -m 0644 ${UNPACKDIR}/policy.conf ${config_dir} # enable additional systemd services install -d ${systemd_dir} |