diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/watchdog | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/watchdog')
| -rw-r--r-- | package/watchdog/Makefile | 12 | ||||
| -rw-r--r-- | package/watchdog/files/watchdog.conffiles (renamed from package/watchdog/ipkg/watchdog.conffiles) | 0 | ||||
| -rw-r--r-- | package/watchdog/files/watchdog.init | 3 | ||||
| -rw-r--r-- | package/watchdog/files/watchdog.postinst (renamed from package/watchdog/ipkg/watchdog.postinst) | 0 | ||||
| -rw-r--r-- | package/watchdog/ipkg/watchdog.control | 4 |
5 files changed, 7 insertions, 12 deletions
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index a29bc79fc..3c2d61a4c 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -9,11 +9,13 @@ PKG_NAME:= watchdog PKG_VERSION:= 5.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 66480128b9dabcced2e4c8db3e60fa50 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/} +PKG_DESCR:= watchdog daemon +PKG_SECTION:= sys +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ @@ -23,12 +25,8 @@ BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_WATCHDOG}/etc/ + ${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/ ${INSTALL_DATA} ${WRKINST}/etc/watchdog.conf ${IDIR_WATCHDOG}/etc/ - ${INSTALL_DIR} ${IDIR_WATCHDOG}/etc/init.d/ - ${INSTALL_BIN} ./files/watchdog.init \ - ${IDIR_WATCHDOG}/etc/init.d/watchdog - ${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \ ${WRKINST}/usr/sbin/wd_keepalive ${IDIR_WATCHDOG}/usr/sbin/ diff --git a/package/watchdog/ipkg/watchdog.conffiles b/package/watchdog/files/watchdog.conffiles index 3ef13592a..3ef13592a 100644 --- a/package/watchdog/ipkg/watchdog.conffiles +++ b/package/watchdog/files/watchdog.conffiles diff --git a/package/watchdog/files/watchdog.init b/package/watchdog/files/watchdog.init index fba89afe5..c5be0f768 100644 --- a/package/watchdog/files/watchdog.init +++ b/package/watchdog/files/watchdog.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 15 +#PKG watchdog +#INIT 15 . /etc/rc.conf diff --git a/package/watchdog/ipkg/watchdog.postinst b/package/watchdog/files/watchdog.postinst index 17d144395..17d144395 100644 --- a/package/watchdog/ipkg/watchdog.postinst +++ b/package/watchdog/files/watchdog.postinst diff --git a/package/watchdog/ipkg/watchdog.control b/package/watchdog/ipkg/watchdog.control deleted file mode 100644 index 1cde1974e..000000000 --- a/package/watchdog/ipkg/watchdog.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: watchdog -Priority: opt -Section: sys -Description: watchdog |