diff options
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch | 29 | ||||
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb (renamed from meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb) | 8 |
2 files changed, 3 insertions, 34 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch deleted file mode 100644 index 172f47825f..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From c7183b2cc4a42f6ca7c2dc687ee7881efe9aeb73 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
| 3 | Date: Sat, 28 Aug 2021 14:22:02 +0200 | ||
| 4 | Subject: [PATCH] SConscript: Correct the installation of gpsd.hotplug | ||
| 5 | |||
| 6 | Without this, `scons systemd=false && scons udev-install` fails with: | ||
| 7 | |||
| 8 | cp .../gpsd/gpsd-3.23.1~dev/gpsd.hotplug /home/pkj/gpsd/foobar/lib/udev | ||
| 9 | cp: cannot stat '.../gpsd/gpsd-3.23.1~dev/gpsd.hotplug': No such file or directory | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://gitlab.com/gpsd/gpsd/-/merge_requests/277] | ||
| 12 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
| 13 | --- | ||
| 14 | SConscript | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/SConscript b/SConscript | ||
| 18 | index 1cd3354e1..e578012f5 100644 | ||
| 19 | --- a/SConscript | ||
| 20 | +++ b/SConscript | ||
| 21 | @@ -3060,7 +3060,7 @@ if env['systemd']: | ||
| 22 | hotplug_wrapper_install = [] | ||
| 23 | else: | ||
| 24 | hotplug_wrapper_install = [ | ||
| 25 | - 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'], | ||
| 26 | + 'cp $SRCDIR/../gpsd.hotplug ' + DESTDIR + env['udevdir'], | ||
| 27 | 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug' | ||
| 28 | ] | ||
| 29 | |||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb index aaf7429291..eb3dc30e4f 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb | |||
| @@ -6,11 +6,9 @@ DEPENDS = "dbus ncurses python3 pps-tools" | |||
| 6 | PROVIDES = "virtual/gpsd" | 6 | PROVIDES = "virtual/gpsd" |
| 7 | 7 | ||
| 8 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | 8 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ |
| 9 | file://0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch \ | 9 | file://gpsd.init \ |
| 10 | file://gpsd.init \ | 10 | " |
| 11 | " | 11 | SRC_URI[sha256sum] = "0b991ce9a46538c4ea450f7a8ee428ff44fb4f8d665fddf2ffe40fe0ae9a6c09" |
| 12 | SRC_URI[md5sum] = "b4f96cb01cbc06542b1cb66b3296078d" | ||
| 13 | SRC_URI[sha256sum] = "522c2362a7eb2d7ac37eaa1504f12aded1c373479a87ba06cc6795974b567bbc" | ||
| 14 | 12 | ||
| 15 | inherit scons update-rc.d python3-dir python3native systemd update-alternatives | 13 | inherit scons update-rc.d python3-dir python3native systemd update-alternatives |
| 16 | 14 | ||
