From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/radvd/Makefile | 33 +++++++++++++-------------------- package/radvd/files/radvd.conffiles | 1 + package/radvd/files/radvd.init | 4 +++- package/radvd/files/radvd.postinst | 3 +++ package/radvd/ipkg/radvd.conffiles | 1 - package/radvd/ipkg/radvd.control | 5 ----- package/radvd/ipkg/radvd.postinst | 3 --- package/radvd/patches/no-libfl.patch | 4 ++-- package/radvd/patches/patch-Makefile_in | 12 ++++++++++++ 9 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 package/radvd/files/radvd.conffiles create mode 100644 package/radvd/files/radvd.postinst delete mode 100644 package/radvd/ipkg/radvd.conffiles delete mode 100644 package/radvd/ipkg/radvd.control delete mode 100644 package/radvd/ipkg/radvd.postinst create mode 100644 package/radvd/patches/patch-Makefile_in (limited to 'package/radvd') diff --git a/package/radvd/Makefile b/package/radvd/Makefile index 318e52ad4..89f46e94f 100644 --- a/package/radvd/Makefile +++ b/package/radvd/Makefile @@ -6,37 +6,30 @@ include ${TOPDIR}/rules.mk PKG_NAME:= radvd -PKG_VERSION:= 0.7.3 -PKG_RELEASE:= 8 -PKG_MD5SUM:= 56ce3f8cbf5966a0d531c21813320423 - -MASTER_SITES:= http://v6web.litech.org/radvd/dist/ \ +PKG_VERSION:= 1.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 614876420d76cd2bb5bcb49760c8b9e3 +PKG_DESCR:= Routing Advertisement Daemon for IPv6 +PKG_SECTION:= net +PKG_DEPENDS:= kmod-ipv6 +PKG_URL:= http://www.litech.org/radvd +PKG_SITES:= http://v6web.litech.org/radvd/dist/ \ http://download.sourcemage.org/mirror/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,RADVD,radvd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,RADVD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-configfile=/etc/radvd.conf \ --with-logfile=/var/log/radvd.log \ --with-pidfile=/var/run/radvd.pid +BUILD_STYLE:= auto +INSTALL_STYLE:= auto -do-build: - $(MAKE) -C $(WRKBUILD) \ - radvd_LDADD="" - mkdir -p $(WRKINST) - $(MAKE) -C $(WRKBUILD) \ - DESTDIR="$(WRKINST)" \ - install - -do-install: - ${INSTALL_DIR} ${IDIR_RADVD}/etc +post-install: + ${INSTALL_DIR} ${IDIR_RADVD}/etc ${IDIR_RADVD}/usr/sbin ${INSTALL_DATA} ./files/radvd.conf ${IDIR_RADVD}/etc/ - ${INSTALL_DIR} ${IDIR_RADVD}/etc/init.d - ${INSTALL_BIN} ./files/radvd.init ${IDIR_RADVD}/etc/init.d/radvd - ${INSTALL_DIR} ${IDIR_RADVD}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/radvd ${IDIR_RADVD}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/radvdump ${IDIR_RADVD}/usr/sbin/ diff --git a/package/radvd/files/radvd.conffiles b/package/radvd/files/radvd.conffiles new file mode 100644 index 000000000..a1418c0a1 --- /dev/null +++ b/package/radvd/files/radvd.conffiles @@ -0,0 +1 @@ +/etc/radvd.conf diff --git a/package/radvd/files/radvd.init b/package/radvd/files/radvd.init index ba2b60535..c6722a29e 100644 --- a/package/radvd/files/radvd.init +++ b/package/radvd/files/radvd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 51 +#PKG radvd +#INIT 51 + . /etc/rc.conf case $1 in diff --git a/package/radvd/files/radvd.postinst b/package/radvd/files/radvd.postinst new file mode 100644 index 000000000..8e3ea08f6 --- /dev/null +++ b/package/radvd/files/radvd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf radvd radvd NO diff --git a/package/radvd/ipkg/radvd.conffiles b/package/radvd/ipkg/radvd.conffiles deleted file mode 100644 index a1418c0a1..000000000 --- a/package/radvd/ipkg/radvd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/radvd.conf diff --git a/package/radvd/ipkg/radvd.control b/package/radvd/ipkg/radvd.control deleted file mode 100644 index 67df96e73..000000000 --- a/package/radvd/ipkg/radvd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: radvd -Priority: optional -Section: net -Depends: kmod-ipv6 -Description: Routing Advertisement Daemon for IPv6 diff --git a/package/radvd/ipkg/radvd.postinst b/package/radvd/ipkg/radvd.postinst deleted file mode 100644 index 8e3ea08f6..000000000 --- a/package/radvd/ipkg/radvd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf radvd radvd NO diff --git a/package/radvd/patches/no-libfl.patch b/package/radvd/patches/no-libfl.patch index e17a127c9..31af2d789 100644 --- a/package/radvd/patches/no-libfl.patch +++ b/package/radvd/patches/no-libfl.patch @@ -1,6 +1,6 @@ diff -urN radvd-0.7.3.old/scanner.l radvd-0.7.3/scanner.l ---- radvd-0.7.3.old/scanner.l 2004-10-26 07:30:34.000000000 +0200 -+++ radvd-0.7.3/scanner.l 2005-04-05 00:01:42.000000000 +0200 +--- radvd-1.2.orig/scanner.l 2008-10-14 13:34:09.000000000 +0200 ++++ radvd-1.2/scanner.l 2009-05-30 17:06:39.028934539 +0200 @@ -21,6 +21,8 @@ extern char *conf_file; diff --git a/package/radvd/patches/patch-Makefile_in b/package/radvd/patches/patch-Makefile_in new file mode 100644 index 000000000..3825f23f1 --- /dev/null +++ b/package/radvd/patches/patch-Makefile_in @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- radvd-1.2.orig/Makefile.in 2008-10-28 17:38:37.000000000 +0100 ++++ radvd-1.2/Makefile.in 2009-05-30 17:07:08.814794942 +0200 +@@ -222,7 +222,7 @@ COMMON_SRC = log.c socket.c recv.c util. + radvd_SOURCES = $(COMMON_SRC) radvd.c timer.c send.c process.c interface.c \ + device.c device-common.c privsep.c gram.y gram.h scanner.l + +-radvd_LDADD = -lfl ++radvd_LDADD = + EXTRA_radvd_SOURCES = device-linux.c device-bsd44.c privsep-linux.c privsep-bsd44.c + YFLAGS = -d + radvdump_SOURCES = $(COMMON_SRC) radvdump.c -- cgit v1.2.3