diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-21 14:19:26 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 16:54:36 +0000 |
| commit | 55f1e47eaaa6ad4f2e16facd1a0a53293344a6e9 (patch) | |
| tree | 99183c1bdc5c4eef19b6ab5fb46a89f524fab8db /meta/recipes-extended/watchdog/files | |
| parent | dbfb8dc7fb0f7cf0b8ff70ab405517b215445258 (diff) | |
| download | poky-55f1e47eaaa6ad4f2e16facd1a0a53293344a6e9.tar.gz | |
watchdog: Fix case where ${B} != ${S}
(From OE-Core rev: 0ecfe4fd7d89252a7db6c9361fb5674cb098796d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/watchdog/files')
| -rw-r--r-- | meta/recipes-extended/watchdog/files/fixsepbuild.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-extended/watchdog/files/fixsepbuild.patch b/meta/recipes-extended/watchdog/files/fixsepbuild.patch new file mode 100644 index 0000000000..2fad3a112f --- /dev/null +++ b/meta/recipes-extended/watchdog/files/fixsepbuild.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | Fix out of tree build support: | ||
| 2 | |||
| 3 | | installing /etc/watchdog.conf | ||
| 4 | | /bin/mkdir -p '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man5' | ||
| 5 | | /bin/mkdir -p '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man8' | ||
| 6 | | /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' | ||
| 7 | | /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' | ||
| 8 | | /usr/bin/install: cannot stat `watchdog.conf': No such file or directory | ||
| 9 | | make[2]: *** [install-etc-local] Error 1 | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | RP 2013/03/21 | ||
| 14 | |||
| 15 | Index: watchdog-5.13/Makefile.am | ||
| 16 | =================================================================== | ||
| 17 | --- watchdog-5.13.orig/Makefile.am 2013-02-01 11:15:44.000000000 +0000 | ||
| 18 | +++ watchdog-5.13/Makefile.am 2013-03-21 11:59:35.637139031 +0000 | ||
| 19 | @@ -16,7 +16,7 @@ | ||
| 20 | else \ | ||
| 21 | echo "installing $(CONFIG_FILENAME)"; \ | ||
| 22 | $(mkinstalldirs) `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \ | ||
| 23 | - $(INSTALL_DATA) watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \ | ||
| 24 | + $(INSTALL_DATA) $(srcdir)/watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \ | ||
| 25 | fi | ||
| 26 | |||
| 27 | install-data-local: install-etc-local | ||