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/vrrpd | |
| 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/vrrpd')
| -rw-r--r-- | package/vrrpd/Makefile | 10 | ||||
| -rw-r--r-- | package/vrrpd/files/vrrpd.init | 4 | ||||
| -rw-r--r-- | package/vrrpd/files/vrrpd.postinst (renamed from package/vrrpd/ipkg/vrrpd.postinst) | 0 | ||||
| -rw-r--r-- | package/vrrpd/ipkg/vrrpd.control | 4 |
4 files changed, 7 insertions, 11 deletions
diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile index 695333b68..863fc1012 100644 --- a/package/vrrpd/Makefile +++ b/package/vrrpd/Makefile @@ -9,12 +9,13 @@ PKG_NAME:= vrrpd PKG_VERSION:= 1.0 PKG_RELEASE:= 9 PKG_MD5SUM:= 6d5066ea1a6ced817376ca0f54765447 - -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/} +PKG_DESCR:= An implementation of the Virtual Router Redundancy Protocol +PKG_SECTION:= net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VRRPD,vrrpd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,VRRPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto MAKE_FLAGS:= CC="${TARGET_CC}" \ @@ -23,9 +24,6 @@ MAKE_FLAGS:= CC="${TARGET_CC}" \ ALL_TARGET:= vrrpd do-install: - ${INSTALL_DIR} ${IDIR_VRRPD}/etc/init.d/ - ${INSTALL_BIN} ./files/vrrpd.init \ - ${IDIR_VRRPD}/etc/init.d/vrrpd ${INSTALL_DIR} ${IDIR_VRRPD}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/vrrpd ${IDIR_VRRPD}/usr/sbin/ diff --git a/package/vrrpd/files/vrrpd.init b/package/vrrpd/files/vrrpd.init index 4660428fb..cbac88074 100644 --- a/package/vrrpd/files/vrrpd.init +++ b/package/vrrpd/files/vrrpd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 70 +#PKG vrrpd +#INIT 70 + . /etc/rc.conf case $1 in diff --git a/package/vrrpd/ipkg/vrrpd.postinst b/package/vrrpd/files/vrrpd.postinst index 4f40f8b1e..4f40f8b1e 100644 --- a/package/vrrpd/ipkg/vrrpd.postinst +++ b/package/vrrpd/files/vrrpd.postinst diff --git a/package/vrrpd/ipkg/vrrpd.control b/package/vrrpd/ipkg/vrrpd.control deleted file mode 100644 index 435dda18f..000000000 --- a/package/vrrpd/ipkg/vrrpd.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: vrrpd -Priority: optional -Section: net -Description: An implementation of the Virtual Router Redundancy Protocol |