diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2021-08-28 15:21:19 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-29 09:10:55 -0700 |
commit | 584852c8dea20ce3082229ee8ce9a90287c6725f (patch) | |
tree | 6913a7339d2529d8f89726e9c44584642370b1fb /meta-oe/recipes-navigation | |
parent | 88783990b91e50a3bb8a5174b5e6c793f92f3b6a (diff) | |
download | meta-openembedded-584852c8dea20ce3082229ee8ce9a90287c6725f.tar.gz |
gpsd: Correct the installation of gpsd.hotplug if systemd is not enabled
Reported-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-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.bb | 1 |
2 files changed, 30 insertions, 0 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 new file mode 100644 index 000000000..172f47825 --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch | |||
@@ -0,0 +1,29 @@ | |||
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.bb index bf5e0efed..98f0e67a8 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb | |||
@@ -6,6 +6,7 @@ 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[md5sum] = "b4f96cb01cbc06542b1cb66b3296078d" | 12 | SRC_URI[md5sum] = "b4f96cb01cbc06542b1cb66b3296078d" |