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/olsrd/Makefile | 20 ++++++++++---------- package/olsrd/files/olsrd-mod-secure.conffiles | 1 + package/olsrd/files/olsrd.conffiles | 1 + package/olsrd/files/olsrd.init | 4 +++- package/olsrd/files/olsrd.postinst | 3 +++ package/olsrd/ipkg/olsrd-mod-dot-draw.control | 5 ----- package/olsrd/ipkg/olsrd-mod-dyn-gw.control | 5 ----- package/olsrd/ipkg/olsrd-mod-httpinfo.control | 5 ----- package/olsrd/ipkg/olsrd-mod-nameservice.control | 5 ----- package/olsrd/ipkg/olsrd-mod-power.control | 5 ----- package/olsrd/ipkg/olsrd-mod-secure.conffiles | 1 - package/olsrd/ipkg/olsrd-mod-secure.control | 5 ----- package/olsrd/ipkg/olsrd-mod-tas.control | 5 ----- package/olsrd/ipkg/olsrd.conffiles | 1 - package/olsrd/ipkg/olsrd.control | 8 -------- package/olsrd/ipkg/olsrd.postinst | 3 --- 16 files changed, 18 insertions(+), 59 deletions(-) create mode 100644 package/olsrd/files/olsrd-mod-secure.conffiles create mode 100644 package/olsrd/files/olsrd.conffiles create mode 100644 package/olsrd/files/olsrd.postinst delete mode 100644 package/olsrd/ipkg/olsrd-mod-dot-draw.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-dyn-gw.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-httpinfo.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-nameservice.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-power.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-secure.conffiles delete mode 100644 package/olsrd/ipkg/olsrd-mod-secure.control delete mode 100644 package/olsrd/ipkg/olsrd-mod-tas.control delete mode 100644 package/olsrd/ipkg/olsrd.conffiles delete mode 100644 package/olsrd/ipkg/olsrd.control delete mode 100644 package/olsrd/ipkg/olsrd.postinst (limited to 'package/olsrd') diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 2fc229e90..c45b72fc5 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -9,7 +9,10 @@ PKG_NAME:= olsrd PKG_VERSION:= 0.5.6-r2 PKG_RELEASE:= 1 PKG_MD5SUM:= acf15dbd0af521a6826541b567c6473a -MASTER_SITES:= http://www.olsr.org/releases/0.5/ +PKG_DESCR:= implementation of the Optimized Link State Routing protocol +PKG_SECTION:= net +PKG_URL:= http://www.olsr.org +PKG_SITES:= http://www.olsr.org/releases/0.5/ include ${TOPDIR}/mk/package.mk @@ -23,11 +26,11 @@ ${2}-install: endef -$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_mod_template,OLSRD_MOD_DYN_GW,dyn_gw)) $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo)) @@ -48,11 +51,8 @@ do-build: all libs install install_libs do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} - ${INSTALL_DIR} ${IDIR_OLSRD}/etc/init.d - ${INSTALL_DIR} ${IDIR_OLSRD}/usr/sbin + ${INSTALL_DIR} ${IDIR_OLSRD}/usr/sbin ${IDIR_OLSRD}/etc ${INSTALL_DATA} ${WRKINST}/etc/olsrd.conf ${IDIR_OLSRD}/etc/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/olsrd ${IDIR_OLSRD}/usr/sbin/ - ${INSTALL_BIN} ./files/olsrd.init \ - ${IDIR_OLSRD}/etc/init.d/olsrd include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/olsrd/files/olsrd-mod-secure.conffiles b/package/olsrd/files/olsrd-mod-secure.conffiles new file mode 100644 index 000000000..34e90b80a --- /dev/null +++ b/package/olsrd/files/olsrd-mod-secure.conffiles @@ -0,0 +1 @@ +/etc/olsrd.d/olsrd_secure_key diff --git a/package/olsrd/files/olsrd.conffiles b/package/olsrd/files/olsrd.conffiles new file mode 100644 index 000000000..a0b5e8eaa --- /dev/null +++ b/package/olsrd/files/olsrd.conffiles @@ -0,0 +1 @@ +/etc/olsrd.conf diff --git a/package/olsrd/files/olsrd.init b/package/olsrd/files/olsrd.init index 1e99a446b..4d348d88f 100644 --- a/package/olsrd/files/olsrd.init +++ b/package/olsrd/files/olsrd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG olsrd +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/olsrd/files/olsrd.postinst b/package/olsrd/files/olsrd.postinst new file mode 100644 index 000000000..fb6fa2bca --- /dev/null +++ b/package/olsrd/files/olsrd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf olsrd olsrd NO diff --git a/package/olsrd/ipkg/olsrd-mod-dot-draw.control b/package/olsrd/ipkg/olsrd-mod-dot-draw.control deleted file mode 100644 index f0a343282..000000000 --- a/package/olsrd/ipkg/olsrd-mod-dot-draw.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: olsrd-mod-dot-draw -Priority: optional -Section: net -Description: a dot topology information plugin for olsrd -Depends: olsrd diff --git a/package/olsrd/ipkg/olsrd-mod-dyn-gw.control b/package/olsrd/ipkg/olsrd-mod-dyn-gw.control deleted file mode 100644 index 69a41a5b1..000000000 --- a/package/olsrd/ipkg/olsrd-mod-dyn-gw.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: olsrd-mod-dyn-gw -Priority: optional -Section: net -Description: a dynamic internet gateway plugin for olsrd -Depends: olsrd diff --git a/package/olsrd/ipkg/olsrd-mod-httpinfo.control b/package/olsrd/ipkg/olsrd-mod-httpinfo.control deleted file mode 100644 index 770dc0474..000000000 --- a/package/olsrd/ipkg/olsrd-mod-httpinfo.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: olsrd-mod-httpinfo -Priority: optional -Section: net -Description: a small informative web server plugin for olsrd -Depends: olsrd diff --git a/package/olsrd/ipkg/olsrd-mod-nameservice.control b/package/olsrd/ipkg/olsrd-mod-nameservice.control deleted file mode 100644 index 2caa8152b..000000000 --- a/package/olsrd/ipkg/olsrd-mod-nameservice.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: olsrd-mod-nameservice -Priority: optional -Section: net -Description: a lightweight hostname resolver plugin for olsrd -Depends: olsrd diff --git a/package/olsrd/ipkg/olsrd-mod-power.control b/package/olsrd/ipkg/olsrd-mod-power.control deleted file mode 100644 index 168126b3d..000000000 --- a/package/olsrd/ipkg/olsrd-mod-power.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: olsrd-mod-power -Priority: optional -Section: net -Description: a power status plugin for olsrd -Depends: olsrd diff --git a/package/olsrd/ipkg/olsrd-mod-secure.conffiles b/package/olsrd/ipkg/olsrd-mod-secure.conffiles deleted file mode 100644 index 34e90b80a..000000000 --- a/package/olsrd/ipkg/olsrd-mod-secure.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/olsrd.d/olsrd_secure_key diff --git a/package/olsrd/ipkg/olsrd-mod-secure.control b/package/olsrd/ipkg/olsrd-mod-secure.control deleted file mode 100644 index ff2eb3a9a..000000000 --- a/package/olsrd/ipkg/olsrd-mod-secure.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: olsrd-mod-secure -Priority: optional -Section: net -Description: a message signing plugin to secure olsrd routing domain -Depends: olsrd diff --git a/package/olsrd/ipkg/olsrd-mod-tas.control b/package/olsrd/ipkg/olsrd-mod-tas.control deleted file mode 100644 index 91ad4c665..000000000 --- a/package/olsrd/ipkg/olsrd-mod-tas.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: olsrd-mod-tas -Priority: optional -Section: net -Description: a Tiny Application Server (TAS) plugin for olsrd -Depends: olsrd diff --git a/package/olsrd/ipkg/olsrd.conffiles b/package/olsrd/ipkg/olsrd.conffiles deleted file mode 100644 index a0b5e8eaa..000000000 --- a/package/olsrd/ipkg/olsrd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/olsrd.conf diff --git a/package/olsrd/ipkg/olsrd.control b/package/olsrd/ipkg/olsrd.control deleted file mode 100644 index 37cdf0908..000000000 --- a/package/olsrd/ipkg/olsrd.control +++ /dev/null @@ -1,8 +0,0 @@ -Package: olsrd -Priority: optional -Section: net -Description: The olsr.org OLSR daemon - olsrd is an implementation of the Optimized Link State Routing protocol. - OLSR is a routing protocol for mobile ad-hoc networks. The protocol is - pro-active, table driven and utilizes a technique called multipoint - relaying for message flooding. diff --git a/package/olsrd/ipkg/olsrd.postinst b/package/olsrd/ipkg/olsrd.postinst deleted file mode 100644 index fb6fa2bca..000000000 --- a/package/olsrd/ipkg/olsrd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf olsrd olsrd NO -- cgit v1.2.3