diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-navigation')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch | 29 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb (renamed from meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb) | 10 |
3 files changed, 5 insertions, 36 deletions
diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb index d2058ba57..8d74eb4a2 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Machine specific gpsd config" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" # empty by default diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch deleted file mode 100644 index 172f47825..000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c7183b2cc4a42f6ca7c2dc687ee7881efe9aeb73 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> -Date: Sat, 28 Aug 2021 14:22:02 +0200 -Subject: [PATCH] SConscript: Correct the installation of gpsd.hotplug - -Without this, `scons systemd=false && scons udev-install` fails with: - - cp .../gpsd/gpsd-3.23.1~dev/gpsd.hotplug /home/pkj/gpsd/foobar/lib/udev - cp: cannot stat '.../gpsd/gpsd-3.23.1~dev/gpsd.hotplug': No such file or directory - -Upstream-Status: Submitted [https://gitlab.com/gpsd/gpsd/-/merge_requests/277] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> ---- - SConscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConscript b/SConscript -index 1cd3354e1..e578012f5 100644 ---- a/SConscript -+++ b/SConscript -@@ -3060,7 +3060,7 @@ if env['systemd']: - hotplug_wrapper_install = [] - else: - hotplug_wrapper_install = [ -- 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'], -+ 'cp $SRCDIR/../gpsd.hotplug ' + DESTDIR + env['udevdir'], - 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug' - ] - diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb index aaf742929..4740e0c98 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb @@ -6,13 +6,11 @@ DEPENDS = "dbus ncurses python3 pps-tools" PROVIDES = "virtual/gpsd" SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - file://0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch \ - file://gpsd.init \ -" -SRC_URI[md5sum] = "b4f96cb01cbc06542b1cb66b3296078d" -SRC_URI[sha256sum] = "522c2362a7eb2d7ac37eaa1504f12aded1c373479a87ba06cc6795974b567bbc" + file://gpsd.init \ + " +SRC_URI[sha256sum] = "0b991ce9a46538c4ea450f7a8ee428ff44fb4f8d665fddf2ffe40fe0ae9a6c09" -inherit scons update-rc.d python3-dir python3native systemd update-alternatives +inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig INITSCRIPT_PACKAGES = "gpsd-conf" INITSCRIPT_NAME = "gpsd" |