diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-05-23 10:21:50 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2024-12-19 22:41:31 -0500 |
| commit | b8f5c41d1d447795ffa72e3ceeeaf12f6f0e1605 (patch) | |
| tree | 7db11a20de9ca399678bbd8c12b70cdf394b85e4 | |
| parent | d100e89de22d6a950b3caab4d060b7e8dc3f4e15 (diff) | |
Update recipes for transition to UNPACKDIRnext
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: I42b2b474be163c66e11a449de6eec7d748e00fbb
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
67 files changed, 313 insertions, 162 deletions
diff --git a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb index 0264ebbd7..f86a96869 100644 --- a/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb +++ b/meta-agl-demo-control-panel/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb @@ -26,12 +26,12 @@ do_install() { # genCerts.sh script to have different expiry dates than the # upstream defaults, and use AGL as the organization. install -d ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/CA.pem ${D}${sysconfdir}/kuksa-val/ - install -m 0640 -g 900 ${WORKDIR}/Server.key ${D}${sysconfdir}/kuksa-val/ - install -m 0640 -g 900 ${WORKDIR}/Server.pem ${D}${sysconfdir}/kuksa-val/ - install -m 0644 -g 900 ${WORKDIR}/jwt.key.pub ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/Client.key ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/Client.pem ${D}${sysconfdir}/kuksa-val/ + install -m 0644 ${UNPACKDIR}/CA.pem ${D}${sysconfdir}/kuksa-val/ + install -m 0640 -g 900 ${UNPACKDIR}/Server.key ${D}${sysconfdir}/kuksa-val/ + install -m 0640 -g 900 ${UNPACKDIR}/Server.pem ${D}${sysconfdir}/kuksa-val/ + install -m 0644 -g 900 ${UNPACKDIR}/jwt.key.pub ${D}${sysconfdir}/kuksa-val/ + install -m 0644 ${UNPACKDIR}/Client.key ${D}${sysconfdir}/kuksa-val/ + install -m 0644 ${UNPACKDIR}/Client.pem ${D}${sysconfdir}/kuksa-val/ } PACKAGE_BEFORE_PN += "${PN}-ca ${PN}-server ${PN}-client" diff --git a/meta-agl-demo-control-panel/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb b/meta-agl-demo-control-panel/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb index cdcbb4a82..76c21f0e3 100644 --- a/meta-agl-demo-control-panel/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb +++ b/meta-agl-demo-control-panel/recipes-demo/agl-demo-control-panel/agl-demo-control-panel_git.bb @@ -33,7 +33,7 @@ do_install() { # avoid QA complaints rm -rf ${D}${libexecdir}/${BPN}/docker - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service # Install conf file install -d ${D}${sysconfdir}/agl-demo-control-panel @@ -85,4 +85,4 @@ RDEPENDS:${PN}-conf-gateway-demo = "${PN}" RPROVIDES:${PN}-conf-gateway-demo = "agl-demo-control-panel.ini" ALTERNATIVE:${PN}-conf-gateway-demo = "agl-demo-control-panel.ini" ALTERNATIVE_TARGET_${PN}-conf-gateway-demo = "${sysconfdir}/agl-demo-control-panel/config.ini.gateway-demo" -ALTERNATIVE_PRIORITY_${PN}-conf-gateway-demo = "30"
\ No newline at end of file +ALTERNATIVE_PRIORITY_${PN}-conf-gateway-demo = "30" diff --git a/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf.bb b/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf.bb index 763103d45..4346c6503 100644 --- a/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf.bb +++ b/meta-agl-demo-control-panel/recipes-graphics/wayland/weston-agl-driver-conf.bb @@ -14,7 +14,7 @@ do_compile[noexec] = "1" do_install() { # Install override drop-in install -d ${D}${systemd_system_unitdir}/weston.service.d - install -m 0644 ${WORKDIR}/weston-agl-driver.conf ${D}${systemd_system_unitdir}/weston.service.d/ + install -m 0644 ${UNPACKDIR}/weston-agl-driver.conf ${D}${systemd_system_unitdir}/weston.service.d/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db_git.bb b/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db_git.bb index b2fb40340..84cb34edc 100644 --- a/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db_git.bb +++ b/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db_git.bb @@ -11,6 +11,9 @@ SRC_URI = "file://${BPN}.service \ file://${BPN}.sh \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit systemd SYSTEMD_SERVICE:${PN} = "${BPN}.service" @@ -22,8 +25,8 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} install -d ${D}${sbindir} - install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir} - install -m 0755 ${WORKDIR}/${BPN}.sh ${D}${sbindir} + install -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir} + install -m 0755 ${UNPACKDIR}/${BPN}.sh ${D}${sbindir} fi } diff --git a/meta-agl-html5-demo/recipes-demo/html5-homescreen/html5-homescreen_git.bb b/meta-agl-html5-demo/recipes-demo/html5-homescreen/html5-homescreen_git.bb index 8638c7583..dfefd70f5 100644 --- a/meta-agl-html5-demo/recipes-demo/html5-homescreen/html5-homescreen_git.bb +++ b/meta-agl-html5-demo/recipes-demo/html5-homescreen/html5-homescreen_git.bb @@ -33,7 +33,7 @@ SYSTEMD_SERVICE:${PN} = "homescreen.service" do_install() { install -d ${D}${WAM_APPLICATIONS_DIR}/${PN} cp -R --no-dereference --preserve=mode,links ${S}/dist/* ${D}${WAM_APPLICATIONS_DIR}/${PN} - install -D -m 0644 ${WORKDIR}/homescreen.service ${D}${systemd_system_unitdir}/homescreen.service + install -D -m 0644 ${UNPACKDIR}/homescreen.service ${D}${systemd_system_unitdir}/homescreen.service } FILES:${PN} = " \ diff --git a/meta-agl-html5-demo/recipes-demo/webapp-samples/webapp-samples.inc b/meta-agl-html5-demo/recipes-demo/webapp-samples/webapp-samples.inc index 1a74a46c0..8bc93f53e 100644 --- a/meta-agl-html5-demo/recipes-demo/webapp-samples/webapp-samples.inc +++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/webapp-samples.inc @@ -15,7 +15,7 @@ WAM_APPLICATIONS_DIR="${libdir}/wam_apps" do_install() { install -d ${D}${WAM_APPLICATIONS_DIR}/${PN} - install ${WORKDIR}/${APPINFO_FILE} ${D}${WAM_APPLICATIONS_DIR}/${PN}/appinfo.json + install ${UNPACKDIR}/${APPINFO_FILE} ${D}${WAM_APPLICATIONS_DIR}/${PN}/appinfo.json } FILES:${PN} = " \ diff --git a/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb b/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb index dfb763b64..3c0f981f8 100644 --- a/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb +++ b/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb @@ -21,10 +21,10 @@ do_compile[network] = "1" do_install:append() { install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/databroker-grpc-web-proxy.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/databroker-grpc-web-proxy.service ${D}${systemd_system_unitdir} install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/databroker-grpc-web-proxy.env ${D}${sysconfdir}/default/databroker-grpc-web-proxy.env + install -m 0644 ${UNPACKDIR}/databroker-grpc-web-proxy.env ${D}${sysconfdir}/default/databroker-grpc-web-proxy.env } SYSTEMD_SERVICE:${PN} = "databroker-grpc-web-proxy.service" diff --git a/meta-agl-html5-demo/recipes-wam/wam/wam-cef.inc b/meta-agl-html5-demo/recipes-wam/wam/wam-cef.inc index f0fdcd35d..0bd01a0cd 100644 --- a/meta-agl-html5-demo/recipes-wam/wam/wam-cef.inc +++ b/meta-agl-html5-demo/recipes-wam/wam/wam-cef.inc @@ -31,7 +31,7 @@ EXTRA_OECMAKE = "\ do_install:append() { cp -R --no-dereference --preserve=mode,links -v ${CEF_ROOT}/Release/* ${D}${WAM_OUT_DIR} cp -R --no-dereference --preserve=mode,links -v ${CEF_ROOT}/Resources/* ${D}${WAM_OUT_DIR} - install -v -D -m 644 ${WORKDIR}/WebAppMgr-cef.env ${D}${sysconfdir}/default/WebAppMgr.env + install -v -D -m 644 ${UNPACKDIR}/WebAppMgr-cef.env ${D}${sysconfdir}/default/WebAppMgr.env sed -i -e 's#@WAM_EXE_DIR@#${WAM_OUT_DIR}#g' ${D}${systemd_system_unitdir}/WebAppMgr.service } diff --git a/meta-agl-html5-demo/recipes-wam/wam/wam_git.bb b/meta-agl-html5-demo/recipes-wam/wam/wam_git.bb index f76641e51..9bfb1f98f 100644 --- a/meta-agl-html5-demo/recipes-wam/wam/wam_git.bb +++ b/meta-agl-html5-demo/recipes-wam/wam/wam_git.bb @@ -32,8 +32,8 @@ SYSTEMD_SERVICE:${PN} = "WebAppMgr.service" do_install:append() { install -v -d ${D}${sysconfdir}/wam install -v -m 644 ${S}/files/launch/security_policy.conf ${D}${sysconfdir}/wam/security_policy.conf - install -v -D -m 644 ${WORKDIR}/WebAppMgr.service ${D}${systemd_system_unitdir}/WebAppMgr.service - install -v -D -m 755 ${WORKDIR}/WebAppMgrCli ${D}${bindir}/WebAppMgrCli + install -v -D -m 644 ${UNPACKDIR}/WebAppMgr.service ${D}${systemd_system_unitdir}/WebAppMgr.service + install -v -D -m 755 ${UNPACKDIR}/WebAppMgrCli ${D}${bindir}/WebAppMgrCli } CXXFLAGS:append:agl-devel = " -DAGL_DEVEL" diff --git a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter-guest.bb b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter-guest.bb index 96d95113f..a42ca1777 100644 --- a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter-guest.bb +++ b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter-guest.bb @@ -6,6 +6,9 @@ inherit systemd allarch SRC_URI = "file://${QEMU_IMAGE}.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" @@ -21,7 +24,7 @@ do_install() { # Install conf file install -d ${D}${sysconfdir}/agl-qemu-runner - install -m 0644 ${WORKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ + install -m 0644 ${UNPACKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter-guest.bb b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter-guest.bb index cfab8b1a7..1f8689012 100644 --- a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter-guest.bb +++ b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter-guest.bb @@ -6,6 +6,9 @@ inherit systemd allarch SRC_URI = "file://${QEMU_IMAGE}.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" @@ -21,7 +24,7 @@ do_install() { # Install conf file install -d ${D}${sysconfdir}/agl-qemu-runner - install -m 0644 ${WORKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ + install -m 0644 ${UNPACKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-vmnet0.bb b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-vmnet0.bb index a5a12982e..43712416a 100644 --- a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-vmnet0.bb +++ b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-vmnet0.bb @@ -11,26 +11,29 @@ SRC_URI = "file://vmnet0.netdev \ file://connman-nodnsproxy.conf \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { # Install systemd-networkd vmnet0 configuration install -d ${D}${systemd_unitdir}/network - install -m 0644 ${WORKDIR}/vmnet0.netdev ${D}${systemd_unitdir}/network/ - install -m 0644 ${WORKDIR}/vmnet0.network ${D}${systemd_unitdir}/network/ + install -m 0644 ${UNPACKDIR}/vmnet0.netdev ${D}${systemd_unitdir}/network/ + install -m 0644 ${UNPACKDIR}/vmnet0.network ${D}${systemd_unitdir}/network/ # Install QEMU bridge configuration install -d ${D}${sysconfdir}/qemu - install -m 0644 ${WORKDIR}/bridge.conf ${D}${sysconfdir}/qemu/ + install -m 0644 ${UNPACKDIR}/bridge.conf ${D}${sysconfdir}/qemu/ # Configure dnsmasq to serve DHCP to the guests install -d ${D}${sysconfdir}/dnsmasq.d - install -m 0644 ${WORKDIR}/dnsmasq-qemu.conf ${D}${sysconfdir}/dnsmasq.d/ + install -m 0644 ${UNPACKDIR}/dnsmasq-qemu.conf ${D}${sysconfdir}/dnsmasq.d/ # Disable ConnMan's local DNS proxy to not conflict with dnsmasq install -d ${D}${systemd_system_unitdir}/connman.service.d/ - install -m 0644 ${WORKDIR}/connman-nodnsproxy.conf ${D}${systemd_system_unitdir}/connman.service.d/ + install -m 0644 ${UNPACKDIR}/connman-nodnsproxy.conf ${D}${systemd_system_unitdir}/connman.service.d/ } FILES:${PN} += "${systemd_unitdir}/network ${systemd_system_unitdir}" diff --git a/meta-agl-kvm-demo/recipes-extended/agl-qemu-runner/agl-qemu-runner.bb b/meta-agl-kvm-demo/recipes-extended/agl-qemu-runner/agl-qemu-runner.bb index b3e3a67dd..444a4923e 100644 --- a/meta-agl-kvm-demo/recipes-extended/agl-qemu-runner/agl-qemu-runner.bb +++ b/meta-agl-kvm-demo/recipes-extended/agl-qemu-runner/agl-qemu-runner.bb @@ -8,16 +8,19 @@ SRC_URI = "file://agl-qemu-runner.sh \ file://agl-qemu-runner@.service \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { # Install template unit install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/agl-qemu-runner@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/agl-qemu-runner@.service ${D}${systemd_system_unitdir}/ # Install script - install -D -m 0755 ${WORKDIR}/agl-qemu-runner.sh ${D}${sbindir}/agl-qemu-runner.sh + install -D -m 0755 ${UNPACKDIR}/agl-qemu-runner.sh ${D}${sbindir}/agl-qemu-runner.sh } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/meta-agl-kvm-demo/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/meta-agl-kvm-demo/recipes-graphics/wayland/weston-ini-conf_agldemo.inc index 28f871a8d..63f7be063 100644 --- a/meta-agl-kvm-demo/recipes-graphics/wayland/weston-ini-conf_agldemo.inc +++ b/meta-agl-kvm-demo/recipes-graphics/wayland/weston-ini-conf_agldemo.inc @@ -12,7 +12,7 @@ do_configure:append() { # KVM guest cluster version sed -e "s#host=.*#host=${REMOTING_KVM_OUTPUT_HOST}#" \ -e "s#port=.*#port=${REMOTING_OUTPUT_PORT}#" \ - ${WORKDIR}/remote-output.cfg.in > ${WORKDIR}/remote-output-kvm.cfg + ${UNPACKDIR}/remote-output.cfg.in > ${WORKDIR}/remote-output-kvm.cfg } do_compile:append() { @@ -29,7 +29,7 @@ do_compile:append() { rm -f ${WORKDIR}/weston.ini.kvm sed -e "s/@GUEST_VM1_ID@/${GUEST_VM1_ID}/g" \ -e "s/@GUEST_VM2_ID@/${GUEST_VM2_ID}/g" \ - ${WORKDIR}/weston.ini.kvm.in > ${WORKDIR}/weston.ini.kvm + ${UNPACKDIR}/weston.ini.kvm.in > ${WORKDIR}/weston.ini.kvm } do_install:append() { diff --git a/recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb b/recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb index 48b7965e4..48cc26dc6 100644 --- a/recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb +++ b/recipes-config/cluster-demo-config/cluster-demo-config_1.0.bb @@ -2,16 +2,19 @@ SUMMARY = "AGL cluster demo configuration file" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -SRC_URI += " \ +SRC_URI = " \ file://AGL.conf.default \ file://AGL.conf.flutter \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit allarch update-alternatives do_install() { - install -D -m 0644 ${WORKDIR}/AGL.conf.default ${D}${sysconfdir}/xdg/AGL.conf.default - install -m 0644 ${WORKDIR}/AGL.conf.flutter ${D}${sysconfdir}/xdg/ + install -D -m 0644 ${UNPACKDIR}/AGL.conf.default ${D}${sysconfdir}/xdg/AGL.conf.default + install -m 0644 ${UNPACKDIR}/AGL.conf.flutter ${D}${sysconfdir}/xdg/ } ALTERNATIVE_LINK_NAME[AGL.conf] = "${sysconfdir}/xdg/AGL.conf" diff --git a/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb b/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb index 8d737282d..12dcea718 100644 --- a/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb +++ b/recipes-config/cluster-demo-network-config/cluster-demo-network-config_1.0.bb @@ -9,6 +9,9 @@ SRC_URI = "file://cluster-demo-network-conf@.service \ file://cluster-demo-network-conf.sh \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + # Network device for dedicated connection to cluster AGL_CLUSTER_NET_DEVICE ?= "eth1" @@ -18,11 +21,11 @@ do_compile[noexec] = "1" do_install() { # Install helper script install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/cluster-demo-network-conf.sh ${D}${sbindir}/ + install -m 0755 ${UNPACKDIR}/cluster-demo-network-conf.sh ${D}${sbindir}/ # Install service unit install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/cluster-demo-network-conf@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/cluster-demo-network-conf@.service ${D}${systemd_system_unitdir}/ # Add symlink to network.target.wants install -d ${D}${sysconfdir}/systemd/system/network.target.wants diff --git a/recipes-connectivity/agl-vss-proxy/agl-vss-proxy_git.bb b/recipes-connectivity/agl-vss-proxy/agl-vss-proxy_git.bb index b16116e65..41a55c901 100644 --- a/recipes-connectivity/agl-vss-proxy/agl-vss-proxy_git.bb +++ b/recipes-connectivity/agl-vss-proxy/agl-vss-proxy_git.bb @@ -39,7 +39,7 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/agl-vss-proxy - install -m 0644 ${WORKDIR}/agl-vss-proxy.token ${D}${sysconfdir}/agl-vss-proxy/ + install -m 0644 ${UNPACKDIR}/agl-vss-proxy.token ${D}${sysconfdir}/agl-vss-proxy/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb b/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb new file mode 100644 index 000000000..a6807a0b3 --- /dev/null +++ b/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "btwilink module disabling modprobe configuration" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://btwilink-disable.conf" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + +COMPATIBLE_MACHINE = "m3ulcb|h3ulcb" + +do_compile[noexec] = "1" + +do_install() { + install -d ${D}${sysconfdir}/modprobe.d + install -m 0644 ${UNPACKDIR}/btwilink-disable.conf ${D}${sysconfdir}/modprobe.d +} diff --git a/recipes-connectivity/kuksa-val/can-dev-helper_1.0.bb b/recipes-connectivity/kuksa-val/can-dev-helper_1.0.bb index 90f5ff1cd..ae99006c5 100644 --- a/recipes-connectivity/kuksa-val/can-dev-helper_1.0.bb +++ b/recipes-connectivity/kuksa-val/can-dev-helper_1.0.bb @@ -6,6 +6,9 @@ SRC_URI = "file://can-dev-helper.service \ file://can-dev-helper.sh \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit systemd allarch SYSTEMD_SERVICE:${PN} = "${BPN}.service" @@ -14,8 +17,8 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service - install -D -m 0755 ${WORKDIR}/${BPN}.sh ${D}${sbindir}/${BPN}.sh + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -D -m 0755 ${UNPACKDIR}/${BPN}.sh ${D}${sbindir}/${BPN}.sh } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-agl.bb b/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-agl.bb index aadbb2dd3..dfcf42405 100644 --- a/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-agl.bb +++ b/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-agl.bb @@ -17,11 +17,11 @@ do_compile[noexec] = "1" do_install() { install -d ${D}${sysconfdir}/kuksa-can-provider - install -m 0644 ${WORKDIR}/config.ini ${D}${sysconfdir}/kuksa-can-provider/ - install -m 0644 ${WORKDIR}/can-provider.token ${D}${sysconfdir}/kuksa-can-provider/ - install -m 0644 ${WORKDIR}/dbc_default_values.json ${D}${sysconfdir}/kuksa-can-provider/ + install -m 0644 ${UNPACKDIR}/config.ini ${D}${sysconfdir}/kuksa-can-provider/ + install -m 0644 ${UNPACKDIR}/can-provider.token ${D}${sysconfdir}/kuksa-can-provider/ + install -m 0644 ${UNPACKDIR}/dbc_default_values.json ${D}${sysconfdir}/kuksa-can-provider/ install -d ${D}${systemd_system_unitdir}/kuksa-can-provider.service.d - install -m 0644 ${WORKDIR}/can-dev-helper.conf ${D}${systemd_system_unitdir}/kuksa-can-provider.service.d/ + install -m 0644 ${UNPACKDIR}/can-dev-helper.conf ${D}${systemd_system_unitdir}/kuksa-can-provider.service.d/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-control-panel.bb b/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-control-panel.bb index f34aed010..b149d129d 100644 --- a/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-control-panel.bb +++ b/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-control-panel.bb @@ -13,7 +13,7 @@ do_compile[noexec] = "1" do_install() { install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/kuksa-can-provider.control-panel ${D}${sysconfdir}/default/ + install -m 0644 ${UNPACKDIR}/kuksa-can-provider.control-panel ${D}${sysconfdir}/default/ } ALTERNATIVE_LINK_NAME[kuksa-can-provider.env] = "${sysconfdir}/default/kuksa-can-provider" diff --git a/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-gw-control-panel.bb b/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-gw-control-panel.bb index f2e9e6738..8aa4da5e5 100644 --- a/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-gw-control-panel.bb +++ b/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-gw-control-panel.bb @@ -13,7 +13,7 @@ do_compile[noexec] = "1" do_install() { install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/kuksa-can-provider.gw-control-panel ${D}${sysconfdir}/default/ + install -m 0644 ${UNPACKDIR}/kuksa-can-provider.gw-control-panel ${D}${sysconfdir}/default/ } ALTERNATIVE_LINK_NAME[kuksa-can-provider.env] = "${sysconfdir}/default/kuksa-can-provider" diff --git a/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-gw-hardware.bb b/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-gw-hardware.bb index 723035b6a..fa13f9955 100644 --- a/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-gw-hardware.bb +++ b/recipes-connectivity/kuksa-val/kuksa-can-provider-conf-gw-hardware.bb @@ -18,12 +18,12 @@ do_compile[noexec] = "1" do_install() { install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/kuksa-can-provider.gw-hardware ${D}${sysconfdir}/default/ + install -m 0644 ${UNPACKDIR}/kuksa-can-provider.gw-hardware ${D}${sysconfdir}/default/ install -d ${D}${sysconfdir}/kuksa-can-provider - install -m 0644 ${WORKDIR}/config.ini.gw-hardware ${D}${sysconfdir}/kuksa-can-provider/ + install -m 0644 ${UNPACKDIR}/config.ini.gw-hardware ${D}${sysconfdir}/kuksa-can-provider/ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/kuksa-can-provider-can1.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/kuksa-can-provider-can1.service ${D}${systemd_system_unitdir} fi } diff --git a/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb b/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb index 0264ebbd7..a7c216bb7 100644 --- a/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb +++ b/recipes-connectivity/kuksa-val/kuksa-certificates-agl.bb @@ -13,6 +13,9 @@ SRC_URI = "file://CA.pem \ file://jwt.key.pub \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit allarch useradd USERADD_PACKAGES = "${PN}-server" @@ -26,12 +29,12 @@ do_install() { # genCerts.sh script to have different expiry dates than the # upstream defaults, and use AGL as the organization. install -d ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/CA.pem ${D}${sysconfdir}/kuksa-val/ - install -m 0640 -g 900 ${WORKDIR}/Server.key ${D}${sysconfdir}/kuksa-val/ - install -m 0640 -g 900 ${WORKDIR}/Server.pem ${D}${sysconfdir}/kuksa-val/ - install -m 0644 -g 900 ${WORKDIR}/jwt.key.pub ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/Client.key ${D}${sysconfdir}/kuksa-val/ - install -m 0644 ${WORKDIR}/Client.pem ${D}${sysconfdir}/kuksa-val/ + install -m 0644 ${UNPACKDIR}/CA.pem ${D}${sysconfdir}/kuksa-val/ + install -m 0640 -g 900 ${UNPACKDIR}/Server.key ${D}${sysconfdir}/kuksa-val/ + install -m 0640 -g 900 ${UNPACKDIR}/Server.pem ${D}${sysconfdir}/kuksa-val/ + install -m 0644 -g 900 ${UNPACKDIR}/jwt.key.pub ${D}${sysconfdir}/kuksa-val/ + install -m 0644 ${UNPACKDIR}/Client.key ${D}${sysconfdir}/kuksa-val/ + install -m 0644 ${UNPACKDIR}/Client.pem ${D}${sysconfdir}/kuksa-val/ } PACKAGE_BEFORE_PN += "${PN}-ca ${PN}-server ${PN}-client" diff --git a/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster.bb b/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster.bb index 36b77dbcc..3605e1dc8 100644 --- a/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster.bb +++ b/recipes-connectivity/kuksa-val/kuksa-databroker-agl-demo-cluster.bb @@ -7,11 +7,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://kuksa-databroker.env" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit allarch update-alternatives do_install() { install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/kuksa-databroker.env ${D}${sysconfdir}/default/kuksa-databroker.agl-demo-cluster-support + install -m 0644 ${UNPACKDIR}/kuksa-databroker.env ${D}${sysconfdir}/default/kuksa-databroker.agl-demo-cluster-support } ALTERNATIVE:${PN} = "kuksa-databroker-env" diff --git a/recipes-connectivity/kuksa-val/kuksa-databroker-agl.bb b/recipes-connectivity/kuksa-val/kuksa-databroker-agl.bb index 2cee29305..bd8b52ec0 100644 --- a/recipes-connectivity/kuksa-val/kuksa-databroker-agl.bb +++ b/recipes-connectivity/kuksa-val/kuksa-databroker-agl.bb @@ -7,11 +7,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://kuksa-databroker.env" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit allarch update-alternatives do_install() { install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/kuksa-databroker.env ${D}${sysconfdir}/default/kuksa-databroker.agl + install -m 0644 ${UNPACKDIR}/kuksa-databroker.env ${D}${sysconfdir}/default/kuksa-databroker.agl } ALTERNATIVE:${PN} = "kuksa-databroker-env" diff --git a/recipes-connectivity/vss/vss-agl_4.2.bb b/recipes-connectivity/vss/vss-agl_4.2.bb new file mode 100644 index 000000000..fffec8ae6 --- /dev/null +++ b/recipes-connectivity/vss/vss-agl_4.2.bb @@ -0,0 +1,64 @@ +SUMMARY = "Vehicle Signal Specification with AGL overlays" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" + +DEPENDS = "vss-tools-native" + +inherit allarch update-alternatives + +require recipes-support/vss/vss.inc + +SRC_URI += "file://agl_vss_overlay.vspec \ + file://agl_vss_overlay.vspec.control-panel \ + file://agl_vss_overlay.vspec.gw-control-panel \ + file://agl_vss_overlay.vspec.gw-hardware \ +" +# Since we're not relying on the simple upstream repo Makefile, use +# best practices and output into a separate directory. +B = "${WORKDIR}/build" + +do_configure[noexec] = "1" + +VSPEC2JSON_OPTS = "-e dbc2vss,vss2dbc --no-uuid --json-pretty" + +do_compile() { + vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${UNPACKDIR}/agl_vss_overlay.vspec -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl.json + vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${UNPACKDIR}/agl_vss_overlay.vspec.control-panel -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-control-panel.json + vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${UNPACKDIR}/agl_vss_overlay.vspec.gw-control-panel -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-gw-control-panel.json + vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${UNPACKDIR}/agl_vss_overlay.vspec.gw-hardware -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-gw-hardware.json +} + +do_install() { + install -d ${D}${datadir}/vss + install -m 0644 vss_rel_${PV}-agl.json ${D}${datadir}/vss/ + install -m 0644 vss_rel_${PV}-agl-control-panel.json ${D}${datadir}/vss/ + install -m 0644 vss_rel_${PV}-agl-gw-control-panel.json ${D}${datadir}/vss/ + install -m 0644 vss_rel_${PV}-agl-gw-hardware.json ${D}${datadir}/vss/ +} + +PACKAGE_BEFORE_PN += "${PN}-control-panel ${PN}-gw-control-panel ${PN}-gw-hardware" + +ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json" + +ALTERNATIVE:${PN} = "vss.json" +ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_rel_${PV}-agl.json" +ALTERNATIVE_PRIORITY_${PN} = "20" +FILES:${PN} += "${datadir}/vss/vss_rel_${PV}-agl.json" + +ALTERNATIVE:${PN}-control-panel = "vss.json" +ALTERNATIVE_TARGET_${PN}-control-panel = "${datadir}/vss/vss_rel_${PV}-agl-control-panel.json" +ALTERNATIVE_PRIORITY_${PN}-control-panel = "30" +FILES:${PN}-control-panel += "${datadir}/vss/vss_rel_${PV}-agl-control-panel.json" + +ALTERNATIVE:${PN}-gw-hardware = "vss.json" +ALTERNATIVE_TARGET_${PN}-gw-hardware = "${datadir}/vss/vss_rel_${PV}-agl-gw-hardware.json" +ALTERNATIVE_PRIORITY_${PN}-gw-hardware = "31" +FILES:${PN}-gw-hardware += "${datadir}/vss/vss_rel_${PV}-agl-gw-hardware.json" + +# Higher priority than gw-hardware, as we want it to be the default +# if both are installed (as is the case with the full gateway demo +# setup). +ALTERNATIVE:${PN}-gw-control-panel = "vss.json" +ALTERNATIVE_TARGET_${PN}-gw-control-panel = "${datadir}/vss/vss_rel_${PV}-agl-gw-control-panel.json" +ALTERNATIVE_PRIORITY_${PN}-gw-control-panel = "32" +FILES:${PN}-gw-control-panel += "${datadir}/vss/vss_rel_${PV}-agl-gw-control-panel.json" diff --git a/recipes-core/base-files-guest/base-files-guest-fstab_1.0.0.bb b/recipes-core/base-files-guest/base-files-guest-fstab_1.0.0.bb index ad3e6e940..ccc907a79 100644 --- a/recipes-core/base-files-guest/base-files-guest-fstab_1.0.0.bb +++ b/recipes-core/base-files-guest/base-files-guest-fstab_1.0.0.bb @@ -4,17 +4,14 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI = " \ - file://fstab \ -" -S = "${WORKDIR}" +SRC_URI = "file://fstab" -#INHIBIT_DEFAULT_DEPS = "1" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install () { install -m 0755 -d ${D}${sysconfdir} - - install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab-guest + install -m 0644 ${UNPACKDIR}/fstab ${D}${sysconfdir}/fstab-guest } PACKAGES = "${PN}" diff --git a/recipes-core/dbus/dbus_agldemo.inc b/recipes-core/dbus/dbus_agldemo.inc index 826584c05..8f5a2955f 100644 --- a/recipes-core/dbus/dbus_agldemo.inc +++ b/recipes-core/dbus/dbus_agldemo.inc @@ -10,9 +10,9 @@ inherit systemd do_install:append() { if [ "${PN}" != "nativesdk-dbus" ]; then if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -m 644 -p -D ${WORKDIR}/dbus.service ${D}${systemd_user_unitdir}/dbus.service - install -m 644 -p -D ${WORKDIR}/dbus.socket ${D}${systemd_user_unitdir}/dbus.socket - install -m 644 -p -D ${WORKDIR}/dbus_env.conf ${D}${systemd_system_unitdir}/user@.service.d/dbus_env.conf + install -m 644 -p -D ${UNPACKDIR}/dbus.service ${D}${systemd_user_unitdir}/dbus.service + install -m 644 -p -D ${UNPACKDIR}/dbus.socket ${D}${systemd_user_unitdir}/dbus.socket + install -m 644 -p -D ${UNPACKDIR}/dbus_env.conf ${D}${systemd_system_unitdir}/user@.service.d/dbus_env.conf # Execute these manually on behalf of systemctl script (from systemd-systemctl-native.bb) # because it does not support systemd's user mode. diff --git a/recipes-core/psplash/psplash-inverted-config.bb b/recipes-core/psplash/psplash-inverted-config.bb index f11b255da..0bc067cf0 100644 --- a/recipes-core/psplash/psplash-inverted-config.bb +++ b/recipes-core/psplash/psplash-inverted-config.bb @@ -6,13 +6,16 @@ inherit systemd allarch SRC_URI = "file://psplash-inverted.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { # Install override install -d ${D}${systemd_system_unitdir}/psplash-start.service.d - install -m 0644 ${WORKDIR}/psplash-inverted.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/ + install -m 0644 ${UNPACKDIR}/psplash-inverted.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-core/psplash/psplash-portrait-config.bb b/recipes-core/psplash/psplash-portrait-config.bb index 7afee442c..8b32dc2dd 100644 --- a/recipes-core/psplash/psplash-portrait-config.bb +++ b/recipes-core/psplash/psplash-portrait-config.bb @@ -6,13 +6,16 @@ inherit systemd allarch SRC_URI = "file://psplash-portrait.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { # Install override install -d ${D}${systemd_system_unitdir}/psplash-start.service.d - install -m 0644 ${WORKDIR}/psplash-portrait.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/ + install -m 0644 ${UNPACKDIR}/psplash-portrait.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-core/psplash/psplash_agldemo.inc b/recipes-core/psplash/psplash_agldemo.inc index cc5b5b7b6..93d4b0583 100644 --- a/recipes-core/psplash/psplash_agldemo.inc +++ b/recipes-core/psplash/psplash_agldemo.inc @@ -8,13 +8,13 @@ SRC_URI:append = " \ SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" do_configure:append () { - cp -f ${WORKDIR}/psplash-colors.h ${S} + cp -f ${UNPACKDIR}/psplash-colors.h ${S} } do_install:append () { # Install override install -d ${D}${systemd_system_unitdir}/psplash-start.service.d - install -m 0644 ${WORKDIR}/psplash-args.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/ + install -m 0644 ${UNPACKDIR}/psplash-args.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-core/udev/demo-i2c-udev-conf_1.0.bb b/recipes-core/udev/demo-i2c-udev-conf_1.0.bb index 7707df60a..11f95469f 100644 --- a/recipes-core/udev/demo-i2c-udev-conf_1.0.bb +++ b/recipes-core/udev/demo-i2c-udev-conf_1.0.bb @@ -10,23 +10,26 @@ SRC_URI = "file://hvac-conf-in-rewrite.sh \ file://agl-service-hvac-leds.conf.in \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_compile[noexec] = "1" do_install() { install -d ${D}${sysconfdir}/xdg/AGL - install -m 0644 ${WORKDIR}/agl-service-hvac-leds.conf.in ${D}${sysconfdir}/xdg/AGL + install -m 0644 ${UNPACKDIR}/agl-service-hvac-leds.conf.in ${D}${sysconfdir}/xdg/AGL install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/hvac-conf-in-rewrite.sh ${D}${sbindir} - install -m 0755 ${WORKDIR}/rtc-i2c-attach.sh ${D}${sbindir} + install -m 0755 ${UNPACKDIR}/hvac-conf-in-rewrite.sh ${D}${sbindir} + install -m 0755 ${UNPACKDIR}/rtc-i2c-attach.sh ${D}${sbindir} if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/hvac-conf-in-rewrite@.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/rtc-i2c-attach@.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/hvac-conf-in-rewrite@.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/rtc-i2c-attach@.service ${D}${systemd_system_unitdir} install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-agl-led-rtc.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/99-agl-led-rtc.rules ${D}${sysconfdir}/udev/rules.d/ fi } diff --git a/recipes-core/udev/output-udev-conf_1.0.bb b/recipes-core/udev/output-udev-conf_1.0.bb index c4e05ad02..73273feff 100644 --- a/recipes-core/udev/output-udev-conf_1.0.bb +++ b/recipes-core/udev/output-udev-conf_1.0.bb @@ -4,12 +4,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://91-output.rules" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_compile[noexec] = "1" do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/91-output.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/91-output.rules ${D}${sysconfdir}/udev/rules.d/ fi } diff --git a/recipes-core/udev/sw-gpsd-udev-conf_1.0.bb b/recipes-core/udev/sw-gpsd-udev-conf_1.0.bb index bcad0f41b..d6572b7c8 100644 --- a/recipes-core/udev/sw-gpsd-udev-conf_1.0.bb +++ b/recipes-core/udev/sw-gpsd-udev-conf_1.0.bb @@ -4,12 +4,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://60-sw-gpsd.rules" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_compile[noexec] = "1" do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/60-sw-gpsd.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/60-sw-gpsd.rules ${D}${sysconfdir}/udev/rules.d/ fi } diff --git a/recipes-core/udev/usb-can-udev-conf_1.0.bb b/recipes-core/udev/usb-can-udev-conf_1.0.bb index 1b76550da..6b92d5823 100644 --- a/recipes-core/udev/usb-can-udev-conf_1.0.bb +++ b/recipes-core/udev/usb-can-udev-conf_1.0.bb @@ -7,16 +7,19 @@ SRC_URI = "file://60-usb-can.rules \ file://slcand-default \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_compile[noexec] = "1" do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/60-usb-can.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/60-usb-can.rules ${D}${sysconfdir}/udev/rules.d/ install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/slcand@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/slcand@.service ${D}${systemd_system_unitdir}/ install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/slcand-default ${D}${sysconfdir}/default/slcand + install -m 0644 ${UNPACKDIR}/slcand-default ${D}${sysconfdir}/default/slcand fi } diff --git a/recipes-demo/agl-persistent-storage-api/agl-persistent-storage-api_git.bb b/recipes-demo/agl-persistent-storage-api/agl-persistent-storage-api_git.bb index a326c6d81..3e5739293 100644 --- a/recipes-demo/agl-persistent-storage-api/agl-persistent-storage-api_git.bb +++ b/recipes-demo/agl-persistent-storage-api/agl-persistent-storage-api_git.bb @@ -42,7 +42,7 @@ do_install:append () { mv ${D}/usr/bin/server ${D}/usr/bin/agl-service-persistent-storage if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir} fi } diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb index 9a4e90fcb..ab495ecb6 100644 --- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb +++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb @@ -44,9 +44,9 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/agl-service-audiomixer - install -m 0644 ${WORKDIR}/agl-service-audiomixer.conf.default ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/agl-service-audiomixer.conf.gateway-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/agl-service-audiomixer.token ${D}${sysconfdir}/xdg/AGL/agl-service-audiomixer/ + install -m 0644 ${UNPACKDIR}/agl-service-audiomixer.conf.default ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/agl-service-audiomixer.conf.gateway-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/agl-service-audiomixer.token ${D}${sysconfdir}/xdg/AGL/agl-service-audiomixer/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb b/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb index 721cdd7d2..95bc39eab 100644 --- a/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb +++ b/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb @@ -42,9 +42,9 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/agl-service-hvac - install -m 0644 ${WORKDIR}/agl-service-hvac.conf.default ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/agl-service-hvac.conf.gateway-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/agl-service-hvac.token ${D}${sysconfdir}/xdg/AGL/agl-service-hvac/ + install -m 0644 ${UNPACKDIR}/agl-service-hvac.conf.default ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/agl-service-hvac.conf.gateway-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/agl-service-hvac.token ${D}${sysconfdir}/xdg/AGL/agl-service-hvac/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-demo/agl-service-radio/agl-service-radio_git.bb b/recipes-demo/agl-service-radio/agl-service-radio_git.bb index bc5175243..2c5025a26 100644 --- a/recipes-demo/agl-service-radio/agl-service-radio_git.bb +++ b/recipes-demo/agl-service-radio/agl-service-radio_git.bb @@ -29,7 +29,7 @@ inherit meson pkgconfig systemd SYSTEMD_SERVICE:${PN} = "agl-service-radio.service" do_install:append() { - install -D -m 0644 ${WORKDIR}/radio.conf.kvm-demo ${D}${sysconfdir}/xdg/AGL.conf + install -D -m 0644 ${UNPACKDIR}/radio.conf.kvm-demo ${D}${sysconfdir}/xdg/AGL.conf } PACKAGE_BEFORE_PN += "${PN}-conf-kvm-demo" diff --git a/recipes-demo/agl-vss-helper/agl-vss-helper.bb b/recipes-demo/agl-vss-helper/agl-vss-helper.bb index 88e14511a..be555dab8 100644 --- a/recipes-demo/agl-vss-helper/agl-vss-helper.bb +++ b/recipes-demo/agl-vss-helper/agl-vss-helper.bb @@ -8,6 +8,9 @@ SRC_URI = "file://agl-vss-helper.py \ file://agl-vss-helper.service \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit systemd SYSTEMD_SERVICE:${PN} = "${BPN}.service" @@ -17,11 +20,11 @@ do_compile[noexec] = "1" do_install() { install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/${BPN}.py ${D}${sbindir} + install -m 0755 ${UNPACKDIR}/${BPN}.py ${D}${sbindir} install -d ${D}${sysconfdir}/xdg/AGL/${BPN} - install -m 0644 ${WORKDIR}/${BPN}.yaml ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/${BPN}.token ${D}${sysconfdir}/xdg/AGL/${BPN}/ - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -m 0644 ${UNPACKDIR}/${BPN}.yaml ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/${BPN}.token ${D}${sysconfdir}/xdg/AGL/${BPN}/ + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service } RDEPENDS:${PN} = " \ diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb index c5a56f434..d8a577bf1 100644 --- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb +++ b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb @@ -34,16 +34,16 @@ CLUSTER_DEMO_VSS_HOSTNAME ??= "192.168.10.2" SYSTEMD_SERVICE:${PN} = "${BPN}.service" do_install:append() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service # VIS authorization token file for KUKSA.val should ideally not # be readable by other users, but currently that's not doable # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/cluster-dashboard - install -m 0644 ${WORKDIR}/cluster-dashboard.conf.default ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/cluster-dashboard.conf.demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/cluster-dashboard.token ${D}${sysconfdir}/xdg/AGL/cluster-dashboard/ + install -m 0644 ${UNPACKDIR}/cluster-dashboard.conf.default ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/cluster-dashboard.conf.demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/cluster-dashboard.token ${D}${sysconfdir}/xdg/AGL/cluster-dashboard/ } ALTERNATIVE_LINK_NAME[cluster-dashboard.conf] = "${sysconfdir}/xdg/AGL/cluster-dashboard.conf" diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/recipes-demo/cluster-receiver/cluster-receiver_git.bb index 86bd66588..438c63f43 100644 --- a/recipes-demo/cluster-receiver/cluster-receiver_git.bb +++ b/recipes-demo/cluster-receiver/cluster-receiver_git.bb @@ -26,7 +26,7 @@ inherit meson pkgconfig systemd SYSTEMD_SERVICE:${PN} = "${BPN}.service" do_install:append() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service } RDEPENDS:${PN} += " \ diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb index 596843fd6..cb2c4f429 100644 --- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb +++ b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb @@ -27,7 +27,7 @@ inherit qt6-cmake pkgconfig systemd do_install:append() { # Only install unit, do not enable it by default - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service } RDEPENDS:${PN} += " \ diff --git a/recipes-demo/dashboard/dashboard_git.bb b/recipes-demo/dashboard/dashboard_git.bb index c4385400b..74a4c5002 100644 --- a/recipes-demo/dashboard/dashboard_git.bb +++ b/recipes-demo/dashboard/dashboard_git.bb @@ -36,8 +36,8 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/dashboard - install -m 0644 ${WORKDIR}/dashboard.conf ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/dashboard.token ${D}${sysconfdir}/xdg/AGL/dashboard/ + install -m 0644 ${UNPACKDIR}/dashboard.conf ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/dashboard.token ${D}${sysconfdir}/xdg/AGL/dashboard/ } RDEPENDS:${PN} += " \ diff --git a/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb b/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb index 15fce6b59..259fde80e 100644 --- a/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb +++ b/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb @@ -36,17 +36,19 @@ PUBSPEC_IGNORE_LOCKFILE = "1" SYSTEMD_SERVICE:${PN} = "flutter-cluster-dashboard.service" do_install:append() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service - install -D -m 0644 ${WORKDIR}/kvm.conf ${D}${systemd_system_unitdir}/${BPN}.service.d/kvm.conf + install -D -m 0644 ${UNPACKDIR}/kvm.conf ${D}${systemd_system_unitdir}/${BPN}.service.d/kvm.conf + + install -D -m 0644 ${UNPACKDIR}/${APP_CONFIG} ${D}${datadir}/flutter/${BPN}.json install -d ${D}${sysconfdir}/xdg/AGL/cluster-dashboard - install -m 0644 ${WORKDIR}/cluster-dashboard.yaml ${D}${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.default - install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.gateway-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.kvm-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.kvm-demo-preconfigured ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/cluster-dashboard.token ${D}${sysconfdir}/xdg/AGL/cluster-dashboard/ + install -m 0644 ${UNPACKDIR}/cluster-dashboard.yaml ${D}${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.default + install -m 0644 ${UNPACKDIR}/cluster-dashboard.yaml.demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/cluster-dashboard.yaml.gateway-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/cluster-dashboard.yaml.kvm-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/cluster-dashboard.yaml.kvm-demo-preconfigured ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/cluster-dashboard.token ${D}${sysconfdir}/xdg/AGL/cluster-dashboard/ } ALTERNATIVE_LINK_NAME[cluster-dashboard.yaml] = "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml" diff --git a/recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb b/recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb index bab8a9570..e8c42db18 100644 --- a/recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb +++ b/recipes-demo/flutter-ics-homescreen/flutter-ics-homescreen_git.bb @@ -42,23 +42,23 @@ ENABLE_VOICE_ASSISTANT = "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'agl-offl APP_AOT_EXTRA:append = " ${ENABLE_VOICE_ASSISTANT}" do_install:append() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service - install -D -m 0644 ${WORKDIR}/${BPN}.env ${D}${sysconfdir}/default/${BPN} + install -D -m 0644 ${UNPACKDIR}/kvm.conf ${D}${systemd_system_unitdir}/${BPN}.service.d/kvm.conf - install -D -m 0644 ${WORKDIR}/kvm.conf ${D}${systemd_system_unitdir}/${BPN}.service.d/kvm.conf + install -D -m 0644 ${UNPACKDIR}/${APP_CONFIG} ${D}${datadir}/flutter/${BPN}.json # VIS authorization token file for KUKSA.val should ideally not # be readable by other users, but currently that's not doable # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/ics-homescreen - install -m 0644 ${WORKDIR}/ics-homescreen.yaml ${D}${sysconfdir}/xdg/AGL/ics-homescreen.yaml.default - install -m 0644 ${WORKDIR}/ics-homescreen.yaml.gateway-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/ics-homescreen.yaml.kvm-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/ics-homescreen.yaml.kvm-gateway-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/ics-homescreen.token ${D}${sysconfdir}/xdg/AGL/ics-homescreen/ - install -m 0644 ${WORKDIR}/radio-presets.yaml ${D}${sysconfdir}/xdg/AGL/ics-homescreen/ + install -m 0644 ${UNPACKDIR}/ics-homescreen.yaml ${D}${sysconfdir}/xdg/AGL/ics-homescreen.yaml.default + install -m 0644 ${UNPACKDIR}/ics-homescreen.yaml.gateway-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/ics-homescreen.yaml.kvm-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/ics-homescreen.yaml.kvm-gateway-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/ics-homescreen.token ${D}${sysconfdir}/xdg/AGL/ics-homescreen/ + install -m 0644 ${UNPACKDIR}/radio-presets.yaml ${D}${sysconfdir}/xdg/AGL/ics-homescreen/ } ALTERNATIVE_LINK_NAME[ics-homescreen.yaml] = "${sysconfdir}/xdg/AGL/ics-homescreen.yaml" diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb index 7c2384a2e..05db9fe99 100644 --- a/recipes-demo/homescreen/homescreen_git.bb +++ b/recipes-demo/homescreen/homescreen_git.bb @@ -39,7 +39,7 @@ OE_QMAKE_CXXFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel' SYSTEMD_SERVICE:${PN} = "${BPN}.service" do_install:append() { - install -D -m0644 ${WORKDIR}/homescreen.service ${D}${systemd_system_unitdir}/homescreen.service + install -D -m0644 ${UNPACKDIR}/homescreen.service ${D}${systemd_system_unitdir}/homescreen.service # Currently using default global client and CA certificates # for KUKSA.val SSL, installing app specific ones would go here. @@ -49,8 +49,8 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/homescreen - install -m 0644 ${WORKDIR}/homescreen.conf ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/homescreen.token ${D}${sysconfdir}/xdg/AGL/homescreen/ + install -m 0644 ${UNPACKDIR}/homescreen.conf ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/homescreen.token ${D}${sysconfdir}/xdg/AGL/homescreen/ } RDEPENDS:${PN} += " \ diff --git a/recipes-demo/hvac/hvac_git.bb b/recipes-demo/hvac/hvac_git.bb index c8a53cd57..d02ccd4de 100644 --- a/recipes-demo/hvac/hvac_git.bb +++ b/recipes-demo/hvac/hvac_git.bb @@ -36,8 +36,8 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/hvac - install -m 0644 ${WORKDIR}/hvac.conf ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/hvac.token ${D}${sysconfdir}/xdg/AGL/hvac/ + install -m 0644 ${UNPACKDIR}/hvac.conf ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/hvac.token ${D}${sysconfdir}/xdg/AGL/hvac/ } RDEPENDS:${PN} += " \ diff --git a/recipes-demo/launcher/launcher_git.bb b/recipes-demo/launcher/launcher_git.bb index 214f0c5c5..b8aeff86b 100644 --- a/recipes-demo/launcher/launcher_git.bb +++ b/recipes-demo/launcher/launcher_git.bb @@ -34,7 +34,7 @@ PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" SYSTEMD_SERVICE:${PN} = "${BPN}.service" do_install:append() { - install -D -m0644 ${WORKDIR}/launcher.service ${D}${systemd_system_unitdir}/launcher.service + install -D -m0644 ${UNPACKDIR}/launcher.service ${D}${systemd_system_unitdir}/launcher.service } RDEPENDS:${PN} += " \ diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/recipes-demo/mediaplayer/mediaplayer_git.bb index 90364401c..9fe1135f8 100644 --- a/recipes-demo/mediaplayer/mediaplayer_git.bb +++ b/recipes-demo/mediaplayer/mediaplayer_git.bb @@ -31,8 +31,8 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/mediaplayer - install -m 0644 ${WORKDIR}/mediaplayer.conf ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/mediaplayer.token ${D}${sysconfdir}/xdg/AGL/mediaplayer/ + install -m 0644 ${UNPACKDIR}/mediaplayer.conf ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/mediaplayer.token ${D}${sysconfdir}/xdg/AGL/mediaplayer/ } RDEPENDS:${PN} += "libqtappfw mpd" diff --git a/recipes-demo/native-shell-client/native-shell-client_agldemo.inc b/recipes-demo/native-shell-client/native-shell-client_agldemo.inc index 4c1dc1012..6a48a9d7b 100644 --- a/recipes-demo/native-shell-client/native-shell-client_agldemo.inc +++ b/recipes-demo/native-shell-client/native-shell-client_agldemo.inc @@ -7,7 +7,7 @@ inherit systemd SYSTEMD_SERVICE:${PN} = "${BPN}.service" do_install:append() { - install -D -m 0644 ${WORKDIR}/native-shell-client.service ${D}${systemd_system_unitdir}/native-shell-client.service + install -D -m 0644 ${UNPACKDIR}/native-shell-client.service ${D}${systemd_system_unitdir}/native-shell-client.service } RCONFLICTS:${PN} = "homescreen" diff --git a/recipes-demo/navigation/ondemandnavi-config_1.0.bb b/recipes-demo/navigation/ondemandnavi-config_1.0.bb index db696c048..1f1719357 100644 --- a/recipes-demo/navigation/ondemandnavi-config_1.0.bb +++ b/recipes-demo/navigation/ondemandnavi-config_1.0.bb @@ -6,13 +6,19 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" -SRC_URI = "file://naviconfig.ini \ - " +SRC_URI = "file://naviconfig.ini" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" inherit allarch do_compile[noexec] = "1" do_install () { - install -D -m 644 ${WORKDIR}/naviconfig.ini ${D}${sysconfdir}/naviconfig.ini + install -D -m 644 ${UNPACKDIR}/naviconfig.ini ${D}${sysconfdir}/naviconfig.ini + if [ -n "${MAPBOX_ACCESS_TOKEN}" ]; then + sed -i -e 's/MAPBOX_ACCESS_TOKEN/${MAPBOX_ACCESS_TOKEN}/;s/\("enableOSM":\)true/\1false/' \ + ${D}${sysconfdir}/naviconfig.ini + fi } diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb index 7bb26ac99..aec5a3fce 100644 --- a/recipes-demo/navigation/ondemandnavi_git.bb +++ b/recipes-demo/navigation/ondemandnavi_git.bb @@ -34,10 +34,10 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/navigation - install -m 0644 ${WORKDIR}/navigation.conf ${D}${sysconfdir}/xdg/AGL/navigation.conf.default - install -m 0644 ${WORKDIR}/navigation.conf.kvm-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/navigation.conf.gateway-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/navigation.token ${D}${sysconfdir}/xdg/AGL/navigation/ + install -m 0644 ${UNPACKDIR}/navigation.conf ${D}${sysconfdir}/xdg/AGL/navigation.conf.default + install -m 0644 ${UNPACKDIR}/navigation.conf.kvm-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/navigation.conf.gateway-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/navigation.token ${D}${sysconfdir}/xdg/AGL/navigation/ } ALTERNATIVE_LINK_NAME[navigation.conf] = "${sysconfdir}/xdg/AGL/navigation.conf" diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb index 240a9e0c4..2a35c6d7f 100644 --- a/recipes-demo/navigation/tbtnavi_git.bb +++ b/recipes-demo/navigation/tbtnavi_git.bb @@ -41,9 +41,9 @@ inherit meson systemd pkgconfig update-alternatives SYSTEMD_SERVICE:${PN} = "${BPN}.service" do_install:append() { - install -D -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + install -D -m 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service - install -D -m 0644 ${WORKDIR}/kvm.conf ${D}${systemd_system_unitdir}/${BPN}.service.d/kvm.conf + install -D -m 0644 ${UNPACKDIR}/kvm.conf ${D}${systemd_system_unitdir}/${BPN}.service.d/kvm.conf # Currently using default global client and CA certificates # for KUKSA.val SSL, installing app specific ones would go here. @@ -53,10 +53,10 @@ do_install:append() { # until a packaging/sandboxing/MAC scheme is (re)implemented or # something like OAuth is plumbed in as an alternative. install -d ${D}${sysconfdir}/xdg/AGL/tbtnavi - install -m 0644 ${WORKDIR}/tbtnavi.conf ${D}${sysconfdir}/xdg/AGL/tbtnavi.conf.default - install -m 0644 ${WORKDIR}/tbtnavi.conf.kvm-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/tbtnavi.conf.gateway-demo ${D}${sysconfdir}/xdg/AGL/ - install -m 0644 ${WORKDIR}/tbtnavi.token ${D}${sysconfdir}/xdg/AGL/tbtnavi/ + install -m 0644 ${UNPACKDIR}/tbtnavi.conf ${D}${sysconfdir}/xdg/AGL/tbtnavi.conf.default + install -m 0644 ${UNPACKDIR}/tbtnavi.conf.kvm-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/tbtnavi.conf.gateway-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${UNPACKDIR}/tbtnavi.token ${D}${sysconfdir}/xdg/AGL/tbtnavi/ } ALTERNATIVE_LINK_NAME[tbtnavi.conf] = "${sysconfdir}/xdg/AGL/tbtnavi.conf" diff --git a/recipes-demo/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb index c00cd68d5..8ec2b7849 100644 --- a/recipes-demo/radio/radio_git.bb +++ b/recipes-demo/radio/radio_git.bb @@ -27,10 +27,10 @@ AGL_APP_NAME = "Radio" AGL_RADIO_PRESETS_LOCALE ?= "CES" do_install:append() { install -d ${D}${sysconfdir}/xdg/AGL - install -m 0644 ${WORKDIR}/presets-CES.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-CES.conf - install -m 0644 ${WORKDIR}/presets-ALS.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-ALS.conf - install -m 0644 ${WORKDIR}/presets-FOSDEM.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-FOSDEM.conf - install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}${sysconfdir}/xdg/AGL/radio-presets.conf + install -m 0644 ${UNPACKDIR}/presets-CES.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-CES.conf + install -m 0644 ${UNPACKDIR}/presets-ALS.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-ALS.conf + install -m 0644 ${UNPACKDIR}/presets-FOSDEM.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-FOSDEM.conf + install -m 0644 ${UNPACKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}${sysconfdir}/xdg/AGL/radio-presets.conf } FILES:${PN} += "${sysconfdir}/xdg/AGL/*" diff --git a/recipes-demo/simple-can-simulator/simple-can-simulator.bb b/recipes-demo/simple-can-simulator/simple-can-simulator.bb index 947e0c6a5..76a81e04d 100644 --- a/recipes-demo/simple-can-simulator/simple-can-simulator.bb +++ b/recipes-demo/simple-can-simulator/simple-can-simulator.bb @@ -1,15 +1,18 @@ DESCRIPTION = "Simulator that generates CAN messages of a driving car" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/simple_can_simulator.py;beginline=2;endline=22;md5=9bb9c582301261d21460d2bc5bb8c225" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/simple_can_simulator.py;beginline=2;endline=22;md5=9bb9c582301261d21460d2bc5bb8c225" SRC_URI = "file://simple_can_simulator.py" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/simple_can_simulator.py ${D}${sbindir} + install -m 0755 ${UNPACKDIR}/simple_can_simulator.py ${D}${sbindir} } RDEPENDS:${PN} = "python3" diff --git a/recipes-graphics/kms-conf/kms-conf_1.0.bb b/recipes-graphics/kms-conf/kms-conf_1.0.bb index 4a665a49b..865024e39 100644 --- a/recipes-graphics/kms-conf/kms-conf_1.0.bb +++ b/recipes-graphics/kms-conf/kms-conf_1.0.bb @@ -2,11 +2,12 @@ SUMMARY = "kms configuration file for the qt eglfs platform" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = " \ - file://kms.conf \ -" +SRC_URI = "file://kms.conf" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install:append() { install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/kms.conf ${D}${sysconfdir} + install -m 644 ${UNPACKDIR}/kms.conf ${D}${sysconfdir} } diff --git a/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc b/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc index 08b6aa495..caed32e64 100644 --- a/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc +++ b/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc @@ -7,6 +7,6 @@ SRC_URI:append = " file://cleaner.py" do_install:prepend() { for TTF in ${S}/*.ttf; do - fontforge -script ${WORKDIR}/cleaner.py ${TTF} + fontforge -script ${UNPACKDIR}/cleaner.py ${TTF} done } diff --git a/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc b/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc index fe9bd098b..f50fcd45c 100644 --- a/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc +++ b/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc @@ -8,8 +8,8 @@ SRC_URI:append = " \ DRM_LEASE_DEVICE = "lease" do_install:append() { - install -Dm644 ${WORKDIR}/agl-compositor.env ${D}${sysconfdir}/default/agl-compositor - install -m644 ${WORKDIR}/agl-compositor-guest.conf ${D}/${systemd_system_unitdir}/agl-compositor.service.d/agl-compositor-guest.conf + install -Dm644 ${UNPACKDIR}/agl-compositor.env ${D}${sysconfdir}/default/agl-compositor + install -m644 ${UNPACKDIR}/agl-compositor-guest.conf ${D}/${systemd_system_unitdir}/agl-compositor.service.d/agl-compositor-guest.conf } FILES:${PN} += "\ diff --git a/recipes-graphics/wayland/weston-agl-driver-conf.bb b/recipes-graphics/wayland/weston-agl-driver-conf.bb index 763103d45..29f65ccc2 100644 --- a/recipes-graphics/wayland/weston-agl-driver-conf.bb +++ b/recipes-graphics/wayland/weston-agl-driver-conf.bb @@ -2,19 +2,22 @@ SUMMARY = "Weston systemd configuration to run as agl-driver user" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +SRC_URI = "file://weston-agl-driver.conf" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + inherit systemd allarch features_check REQUIRED_DISTRO_FEATURES = "wayland systemd" -SRC_URI = "file://weston-agl-driver.conf" - do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { # Install override drop-in install -d ${D}${systemd_system_unitdir}/weston.service.d - install -m 0644 ${WORKDIR}/weston-agl-driver.conf ${D}${systemd_system_unitdir}/weston.service.d/ + install -m 0644 ${UNPACKDIR}/weston-agl-driver.conf ${D}${systemd_system_unitdir}/weston.service.d/ } FILES:${PN} += "${systemd_system_unitdir}" diff --git a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc index 62aa9048b..eed10159b 100644 --- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc +++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc @@ -6,7 +6,9 @@ WESTON_FRAGMENTS_BASE += "grpc-proxy" do_configure:append() { # Standalone cluster support version - cp ${WORKDIR}/remote-output.cfg.in ${WORKDIR}/remote-output.cfg + sed -e "s#host=.*#host=${REMOTING_OUTPUT_HOST}#" \ + -e "s#port=.*#port=${REMOTING_OUTPUT_PORT}#" \ + ${UNPACKDIR}/remote-output.cfg.in > ${WORKDIR}/remote-output.cfg } do_compile:append() { diff --git a/recipes-multimedia/musicpd/mpd_agldemo.inc b/recipes-multimedia/musicpd/mpd_agldemo.inc index 513aa5096..e2e733813 100644 --- a/recipes-multimedia/musicpd/mpd_agldemo.inc +++ b/recipes-multimedia/musicpd/mpd_agldemo.inc @@ -45,6 +45,6 @@ USERADD_PARAM:${PN} = " \ # lightmediascanner configuration. do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${WORKDIR}/mpd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/mpd.conf + install -D -m 0644 ${UNPACKDIR}/mpd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/mpd.conf fi } diff --git a/recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend b/recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend index f39efc1c0..a7412b1ae 100644 --- a/recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend +++ b/recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend @@ -3,6 +3,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://30-AGL-demo-v4l2.conf" do_install:append() { - install -D -m 0644 ${WORKDIR}/30-AGL-demo-v4l2.conf ${D}${sysconfdir}/wireplumber/wireplumber.conf.d/ + # override the one from meta-agl to be able to set as default USB camera + # such that camera-gstreamer and implicitly pipewire work out of the box + install -D -m 0644 ${UNPACKDIR}/30-v4l2-monitor.lua ${D}${sysconfdir}/wireplumber/host.lua.d/ } diff --git a/recipes-navigation/geoclue/geoclue_agldemo.inc b/recipes-navigation/geoclue/geoclue_agldemo.inc index 14f730eea..9f339a70c 100644 --- a/recipes-navigation/geoclue/geoclue_agldemo.inc +++ b/recipes-navigation/geoclue/geoclue_agldemo.inc @@ -5,5 +5,5 @@ SRC_URI += "file://geoclue.conf.agl" PACKAGECONFIG = "nmea lib" do_install:append() { - install -D -m 0644 ${WORKDIR}/geoclue.conf.agl ${D}${sysconfdir}/geoclue/geoclue.conf + install -D -m 0644 ${UNPACKDIR}/geoclue.conf.agl ${D}${sysconfdir}/geoclue/geoclue.conf } diff --git a/recipes-navigation/gpsd/gpsd_agldemo.inc b/recipes-navigation/gpsd/gpsd_agldemo.inc index cb26510d0..1154435bc 100644 --- a/recipes-navigation/gpsd/gpsd_agldemo.inc +++ b/recipes-navigation/gpsd/gpsd_agldemo.inc @@ -5,6 +5,6 @@ SRC_URI += "file://sw-device-hook" do_install:append() { # Install device-hook script for starting NMEA output on Sierra Wireless modems install -d ${D}${sysconfdir}/gpsd - install -m 0755 ${WORKDIR}/sw-device-hook ${D}${sysconfdir}/gpsd/device-hook + install -m 0755 ${UNPACKDIR}/sw-device-hook ${D}${sysconfdir}/gpsd/device-hook } diff --git a/recipes-support/udisks/udisks2_agldemo.inc b/recipes-support/udisks/udisks2_agldemo.inc index a3b2ac4d7..3077f55d0 100644 --- a/recipes-support/udisks/udisks2_agldemo.inc +++ b/recipes-support/udisks/udisks2_agldemo.inc @@ -12,13 +12,13 @@ do_install:append () { sed -i 's/^WantedBy=.*/WantedBy=multi-user.target/' ${D}${systemd_unitdir}/system/udisks2.service install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/automount.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/automount.service ${D}${systemd_unitdir}/system install -d ${D}${libexecdir} - install -m 0755 ${WORKDIR}/automount.sh ${D}${libexecdir}/automount.sh + install -m 0755 ${UNPACKDIR}/automount.sh ${D}${libexecdir}/automount.sh install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-udisks2.rules ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${UNPACKDIR}/99-udisks2.rules ${D}${sysconfdir}/udev/rules.d } FILES:${PN}:append = " \ |