watchdog: Fix case where ${B} != ${S}

(From OE-Core rev: 0ecfe4fd7d89252a7db6c9361fb5674cb098796d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-03-21 14:19:26 +00:00
parent dbfb8dc7fb
commit 55f1e47eaa
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,27 @@
Fix out of tree build support:
| installing /etc/watchdog.conf
| /bin/mkdir -p '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man5'
| /bin/mkdir -p '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man8'
| /usr/bin/install -c -m 644 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/watchdog.conf.5 '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man5'
| /usr/bin/install -c -m 644 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/watchdog.8 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/wd_keepalive.8 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/wd_identify.8 '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man8'
| /usr/bin/install: cannot stat `watchdog.conf': No such file or directory
| make[2]: *** [install-etc-local] Error 1
Upstream-Status: Pending
RP 2013/03/21
Index: watchdog-5.13/Makefile.am
===================================================================
--- watchdog-5.13.orig/Makefile.am 2013-02-01 11:15:44.000000000 +0000
+++ watchdog-5.13/Makefile.am 2013-03-21 11:59:35.637139031 +0000
@@ -16,7 +16,7 @@
else \
echo "installing $(CONFIG_FILENAME)"; \
$(mkinstalldirs) `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \
- $(INSTALL_DATA) watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \
+ $(INSTALL_DATA) $(srcdir)/watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \
fi
install-data-local: install-etc-local

View File

@ -9,6 +9,7 @@ LICENSE = "GPL-2.0+"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
file://fixsepbuild.patch \
file://fix-ping-failure.patch"
SRC_URI[md5sum] = "153455f008f1cf8f65f6ad9586a21ff1"
SRC_URI[sha256sum] = "141e0faf3ee4d8187a6ff4e00b18ef7b7a4ce432a2d4c8a6e6fdc62507fc6eb0"