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>
This commit is contained in:
Peter Kjellerstedt 2021-08-28 15:21:19 +02:00 committed by Khem Raj
parent 88783990b9
commit 584852c8de
2 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,29 @@
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'
]

View File

@ -6,6 +6,7 @@ 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"