diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-11-06 16:19:44 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-09 10:21:22 +0000 |
commit | c58237560dcb20283b27a816ffbafa0818ffc98e (patch) | |
tree | 9568ac202bc1a797652a3c6d9ce805c2ca59be50 /meta/recipes-extended/watchdog/files/fixsepbuild.patch | |
parent | f5ecb7548163ed80bb0c55f32cee3644ac8a0531 (diff) | |
download | ast2050-yocto-poky-c58237560dcb20283b27a816ffbafa0818ffc98e.zip ast2050-yocto-poky-c58237560dcb20283b27a816ffbafa0818ffc98e.tar.gz |
watchdog: Upgrade to 5.14
Move the patches from generic files to watchdog
Rebased the fix-ping due to code reorg on the source
(From OE-Core rev: fb2e1fd7d2df68d02f5da7dbf4390ea03e7eafdb)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/watchdog/files/fixsepbuild.patch')
-rw-r--r-- | meta/recipes-extended/watchdog/files/fixsepbuild.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-extended/watchdog/files/fixsepbuild.patch b/meta/recipes-extended/watchdog/files/fixsepbuild.patch deleted file mode 100644 index 2fad3a1..0000000 --- a/meta/recipes-extended/watchdog/files/fixsepbuild.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 |