summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-navigation/gpsd/gpsd-machine-conf_%.bbappend1
-rw-r--r--recipes-navigation/gpsd/gpsd-machine-conf_agldemo.inc8
-rw-r--r--recipes-navigation/gpsd/gpsd_agldemo.inc2
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb3
4 files changed, 10 insertions, 4 deletions
diff --git a/recipes-navigation/gpsd/gpsd-machine-conf_%.bbappend b/recipes-navigation/gpsd/gpsd-machine-conf_%.bbappend
new file mode 100644
index 000000000..77c0ef8a6
--- /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 000000000..f2bca1a68
--- /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 77dee8e0e..cb26510d0 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"
-
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb
index 9db2c0bf0..f6c5e1559 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb
@@ -12,7 +12,6 @@ PACKAGES = "\
RDEPENDS:${PN} += "\
gpsd \
+ gpsd-machine-conf \
geoclue \
- ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'virtual/gpsd-conf', '', d)} \
- ${@bb.utils.contains('AGL_FEATURES', 'agl-refhw-h3', 'gpsd-conf-refhw', '', d)} \
"