diff options
8 files changed, 48 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc new file mode 100644 index 000000000..08ffa6285 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc @@ -0,0 +1,5 @@ +#Keep this as a reminder +#MACHINEOVERRIDES .= ":kingfisher" +#PACKAGE_EXTRA_ARCHS_append = " kingfisher" + +PREFERRED_PROVIDER_virtual/gpsd-conf ?= "gpsd-kingfisher-conf" diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/files/gpsd.kingfisher b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/files/gpsd.kingfisher new file mode 100644 index 000000000..7e991dc0f --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/files/gpsd.kingfisher @@ -0,0 +1,4 @@ +# If you must specify a non-NMEA driver, uncomment and modify the next line +GPSD_SOCKET="/var/run/gpsd.sock" +GPSD_OPTIONS="" +GPS_DEVICES="/dev/ttySC2" diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb new file mode 100644 index 000000000..748e59a8d --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "King fisher specific gpsd config" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" + +SRC_URI = " \ + file://gpsd.kingfisher \ +" + +inherit update-alternatives + +RPROVIDES_${PN} += "virtual/gpsd-conf" + +ALTERNATIVE_${PN} = "gspd-defaults" +ALTERNATIVE_LINK_NAME[gspd-defaults] = "${sysconfdir}/default/gpsd" +ALTERNATIVE_TARGET[gspd-defaults] = "${sysconfdir}/default/gpsd.kingfisher" +ALTERNATIVE_PRIORITY[gspd-defaults] = "20" + +COMPATIBLE_MACHINE = "ulcb" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + install -d ${D}/${sysconfdir}/default + install -m 0644 ${WORKDIR}/gpsd.kingfisher ${D}/${sysconfdir}/default/gpsd.kingfisher +} + +FILES_${PN} = "${sysconfdir}/default/gpsd.kingfisher" +CONFFILES_${PN} = "${sysconfdir}/default/gpsd.kingfisher" diff --git a/meta-agl-profile-core/recipes-navigation/gpsd/gpsd_%.bbappend b/meta-agl-profile-core/recipes-navigation/gpsd/gpsd_%.bbappend index af72aece9..da434e08e 100644 --- a/meta-agl-profile-core/recipes-navigation/gpsd/gpsd_%.bbappend +++ b/meta-agl-profile-core/recipes-navigation/gpsd/gpsd_%.bbappend @@ -1,5 +1,7 @@ SYSTEMD_SERVICE_${PN} += " gpsdctl@.service" +RPROVIDES_${PN}-conf += "virtual/gpsd-conf" + do_install_append() { # use the systemd compatible gpsd.rules install -d ${D}/${sysconfdir}/udev/rules.d diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb index daebe4bde..473bac751 100644 --- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb @@ -12,5 +12,6 @@ PACKAGES = "\ RDEPENDS_${PN} += "\ gpsd \ + virtual/gpsd-conf \ geoclue \ " diff --git a/templates/machine/h3ulcb/50_local.conf.inc b/templates/machine/h3ulcb/50_local.conf.inc index 4bb2a8219..43e117372 100644 --- a/templates/machine/h3ulcb/50_local.conf.inc +++ b/templates/machine/h3ulcb/50_local.conf.inc @@ -2,3 +2,6 @@ MACHINE = "h3ulcb" #see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc require conf/include/agl_h3ulcb.inc +#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc +require conf/include/rcar-gen3-adas.inc + diff --git a/templates/machine/m3ulcb-nogfx/50_local.conf.inc b/templates/machine/m3ulcb-nogfx/50_local.conf.inc index 521dedb46..3fd5d6eec 100644 --- a/templates/machine/m3ulcb-nogfx/50_local.conf.inc +++ b/templates/machine/m3ulcb-nogfx/50_local.conf.inc @@ -1,3 +1,6 @@ MACHINE = "m3ulcb" #see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc require conf/include/agl_m3ulcb-nogfx.inc + +#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc +require conf/include/rcar-gen3-adas.inc diff --git a/templates/machine/m3ulcb/50_local.conf.inc b/templates/machine/m3ulcb/50_local.conf.inc index c75bc5311..e2fe41a8a 100644 --- a/templates/machine/m3ulcb/50_local.conf.inc +++ b/templates/machine/m3ulcb/50_local.conf.inc @@ -1,3 +1,6 @@ MACHINE = "m3ulcb" #see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc require conf/include/agl_m3ulcb.inc + +#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc +require conf/include/rcar-gen3-adas.inc |