From 953f9ca81b1da07f61f8d417fc2765cb647dcf79 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 18 Feb 2024 16:09:28 -0500 Subject: Rework gpsd configuration To remove the use of the "virtual/gpsd-conf" RPROVIDES as part of futureproofing for YP 5.0 / Scarthgap, rework the machine-specific gpsd configuration scheme to based on the gpsd-machine-conf recipe that is intended for this upstream. The gpsd-machine-conf recipe is now unconditionally included in the navigation packagegroup, but it will be empty on machines except those that add their own content to it. Bug-AGL: SPEC-5067 Change-Id: I7f1b555f154fe77c643019dae4bb90354ca2a4b4 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29691 ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- recipes-navigation/gpsd/gpsd-machine-conf_%.bbappend | 1 + recipes-navigation/gpsd/gpsd-machine-conf_agldemo.inc | 8 ++++++++ recipes-navigation/gpsd/gpsd_agldemo.inc | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 recipes-navigation/gpsd/gpsd-machine-conf_%.bbappend create mode 100644 recipes-navigation/gpsd/gpsd-machine-conf_agldemo.inc (limited to 'recipes-navigation') diff --git a/recipes-navigation/gpsd/gpsd-machine-conf_%.bbappend b/recipes-navigation/gpsd/gpsd-machine-conf_%.bbappend new file mode 100644 index 00000000..77c0ef8a --- /dev/null +++ b/recipes-navigation/gpsd/gpsd-machine-conf_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'gpsd-machine-conf_agldemo.inc', '', d)} diff --git a/recipes-navigation/gpsd/gpsd-machine-conf_agldemo.inc b/recipes-navigation/gpsd/gpsd-machine-conf_agldemo.inc new file mode 100644 index 00000000..f2bca1a6 --- /dev/null +++ b/recipes-navigation/gpsd/gpsd-machine-conf_agldemo.inc @@ -0,0 +1,8 @@ +# Mark package as machine specific, which the upstream stub recipe +# does not do for unclear reasons. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# Allow an empty package as results from the upstream stub recipe. +# This allows using the package without needing machine specific +# hooks. +ALLOW_EMPTY:${PN} = "1" diff --git a/recipes-navigation/gpsd/gpsd_agldemo.inc b/recipes-navigation/gpsd/gpsd_agldemo.inc index 77dee8e0..cb26510d 100644 --- a/recipes-navigation/gpsd/gpsd_agldemo.inc +++ b/recipes-navigation/gpsd/gpsd_agldemo.inc @@ -8,5 +8,3 @@ do_install:append() { install -m 0755 ${WORKDIR}/sw-device-hook ${D}${sysconfdir}/gpsd/device-hook } -RPROVIDES:${PN}-conf:append = " virtual/gpsd-conf" - -- cgit 1.2.3-korg