diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-06-29 19:46:48 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-29 19:46:48 +0000 |
| commit | 079a67fc75edf4d2671ed9cbef0d77870450920e (patch) | |
| tree | 24e3d8ba9ee79f6eface2012d3c7922929a282ae | |
| parent | 085c69220f3ab2f01fb840407815e56523544c8f (diff) | |
| parent | 09f317a13d8e1ed60dd1a2d2f06db392189723e2 (diff) | |
merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
and 6ccfcb3e298f740c7e45b8312a95877c3f842f6d
| -rw-r--r-- | packages/watchdog/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/watchdog/files/mkinstalldirs.patch | 17 | ||||
| -rw-r--r-- | packages/watchdog/watchdog_5.2.bb | 5 |
3 files changed, 21 insertions, 1 deletions
diff --git a/packages/watchdog/files/.mtn2git_empty b/packages/watchdog/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/watchdog/files/.mtn2git_empty diff --git a/packages/watchdog/files/mkinstalldirs.patch b/packages/watchdog/files/mkinstalldirs.patch new file mode 100644 index 0000000000..468f269965 --- /dev/null +++ b/packages/watchdog/files/mkinstalldirs.patch @@ -0,0 +1,17 @@ +--- + watchdog-5.2/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: watchdog-5.2/Makefile.am +=================================================================== +--- watchdog-5.2.orig/Makefile.am ++++ watchdog-5.2/Makefile.am +@@ -15,7 +15,7 @@ + echo "NOT installing $(CONFIG_FILENAME) - exists already"; \ + else \ + echo "installing $(CONFIG_FILENAME)"; \ +- mkinstalldirs `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \ ++ $(mkinstalldirs) `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \ + $(INSTALL_DATA) watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \ + fi + diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb index fc3509466a..12f41b6ee7 100644 --- a/packages/watchdog/watchdog_5.2.bb +++ b/packages/watchdog/watchdog_5.2.bb @@ -1,9 +1,12 @@ DESCRIPTION = "Software watchdog" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" -PR = "r2" +PR = "r3" LICENSE = "GPL" SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz" + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + FILES = "${sysconfdir}/watchdog.conf ${sbindir}/watchdog" #CONFFILES = "${sysconfdir}/watchdog.conf" |