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/miredo/Makefile | 10 +++++++--- package/miredo/files/miredo-server.init | 4 +++- package/miredo/files/miredo-server.postinst | 3 +++ package/miredo/files/miredo.conffiles | 1 + package/miredo/files/miredo.init | 4 +++- package/miredo/files/miredo.postinst | 3 +++ package/miredo/ipkg/miredo-server.control | 5 ----- package/miredo/ipkg/miredo-server.postinst | 3 --- package/miredo/ipkg/miredo.conffiles | 1 - package/miredo/ipkg/miredo.control | 5 ----- package/miredo/ipkg/miredo.postinst | 3 --- 11 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 package/miredo/files/miredo-server.postinst create mode 100644 package/miredo/files/miredo.conffiles create mode 100644 package/miredo/files/miredo.postinst delete mode 100644 package/miredo/ipkg/miredo-server.control delete mode 100644 package/miredo/ipkg/miredo-server.postinst delete mode 100644 package/miredo/ipkg/miredo.conffiles delete mode 100644 package/miredo/ipkg/miredo.control delete mode 100644 package/miredo/ipkg/miredo.postinst (limited to 'package/miredo') diff --git a/package/miredo/Makefile b/package/miredo/Makefile index 144c0528d..90161bd97 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -9,13 +9,17 @@ PKG_NAME:= miredo PKG_VERSION:= 1.1.6 PKG_RELEASE:= 1 PKG_MD5SUM:= bf49c1ddc068746760787d0cf76e40de -MASTER_SITES:= http://www.remlab.net/files/miredo/ +PKG_DESCR:= A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon +PKG_SECTION:= net +PKG_URL:= http://www.remlab.net +PKG_SITES:= http://www.remlab.net/files/miredo/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-chroot \ diff --git a/package/miredo/files/miredo-server.init b/package/miredo/files/miredo-server.init index d8282e316..6231573a4 100644 --- a/package/miredo/files/miredo-server.init +++ b/package/miredo/files/miredo-server.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG miredo-server +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/miredo/files/miredo-server.postinst b/package/miredo/files/miredo-server.postinst new file mode 100644 index 000000000..00c88c459 --- /dev/null +++ b/package/miredo/files/miredo-server.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf miredo-server miredo-server NO diff --git a/package/miredo/files/miredo.conffiles b/package/miredo/files/miredo.conffiles new file mode 100644 index 000000000..f4d3b04af --- /dev/null +++ b/package/miredo/files/miredo.conffiles @@ -0,0 +1 @@ +/etc/miredo/miredo.conf diff --git a/package/miredo/files/miredo.init b/package/miredo/files/miredo.init index bb4b3fdcd..d1e846ad7 100644 --- a/package/miredo/files/miredo.init +++ b/package/miredo/files/miredo.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG miredo +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/miredo/files/miredo.postinst b/package/miredo/files/miredo.postinst new file mode 100644 index 000000000..37667f8da --- /dev/null +++ b/package/miredo/files/miredo.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf miredo miredo NO diff --git a/package/miredo/ipkg/miredo-server.control b/package/miredo/ipkg/miredo-server.control deleted file mode 100644 index ebbc3cc58..000000000 --- a/package/miredo/ipkg/miredo-server.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: miredo-server -Priority: optional -Section: net -Depends: kmod-ipv6, kmod-tun, libpthread, uclibc++ -Description: A Teredo (IPv6 tunneling over UDP through NAT) server daemon diff --git a/package/miredo/ipkg/miredo-server.postinst b/package/miredo/ipkg/miredo-server.postinst deleted file mode 100644 index 00c88c459..000000000 --- a/package/miredo/ipkg/miredo-server.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf miredo-server miredo-server NO diff --git a/package/miredo/ipkg/miredo.conffiles b/package/miredo/ipkg/miredo.conffiles deleted file mode 100644 index f4d3b04af..000000000 --- a/package/miredo/ipkg/miredo.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/miredo/miredo.conf diff --git a/package/miredo/ipkg/miredo.control b/package/miredo/ipkg/miredo.control deleted file mode 100644 index 2794f3bde..000000000 --- a/package/miredo/ipkg/miredo.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: miredo -Priority: optional -Section: net -Depends: kmod-ipv6, kmod-tun, libpthread, uclibc++ -Description: A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon diff --git a/package/miredo/ipkg/miredo.postinst b/package/miredo/ipkg/miredo.postinst deleted file mode 100644 index 37667f8da..000000000 --- a/package/miredo/ipkg/miredo.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf miredo miredo NO -- cgit v1.2.3