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/ulogd/Makefile | 26 ++++++++++++++------------ package/ulogd/files/ulogd.conffiles | 1 + package/ulogd/files/ulogd.init | 4 +++- package/ulogd/files/ulogd.postinst | 3 +++ package/ulogd/ipkg/ulogd-mod-extra.control | 5 ----- package/ulogd/ipkg/ulogd-mod-mysql.control | 5 ----- package/ulogd/ipkg/ulogd-mod-pcap.control | 5 ----- package/ulogd/ipkg/ulogd-mod-pgsql.control | 5 ----- package/ulogd/ipkg/ulogd-mod-sqlite.control | 5 ----- package/ulogd/ipkg/ulogd.conffiles | 1 - package/ulogd/ipkg/ulogd.control | 4 ---- package/ulogd/ipkg/ulogd.postinst | 3 --- 12 files changed, 21 insertions(+), 46 deletions(-) create mode 100644 package/ulogd/files/ulogd.conffiles create mode 100644 package/ulogd/files/ulogd.postinst delete mode 100644 package/ulogd/ipkg/ulogd-mod-extra.control delete mode 100644 package/ulogd/ipkg/ulogd-mod-mysql.control delete mode 100644 package/ulogd/ipkg/ulogd-mod-pcap.control delete mode 100644 package/ulogd/ipkg/ulogd-mod-pgsql.control delete mode 100644 package/ulogd/ipkg/ulogd-mod-sqlite.control delete mode 100644 package/ulogd/ipkg/ulogd.conffiles delete mode 100644 package/ulogd/ipkg/ulogd.control delete mode 100644 package/ulogd/ipkg/ulogd.postinst (limited to 'package/ulogd') diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index b0d4dfbdc..f57d35499 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -9,20 +9,25 @@ PKG_NAME:= ulogd PKG_VERSION:= 1.24 PKG_RELEASE:= 7 PKG_MD5SUM:= 05b4ed2926b9a22aaeaf642917bbf8ff -MASTER_SITES:= ftp://ftp.netfilter.org/pub/ulogd/ \ +PKG_DESCR:= Netfilter userspace logging daemon +PKG_SECTION:= net +PKG_DEPENDS:= iptables +PKG_URL:= http://www.netfilter.org/projects/ulogd +PKG_SITES:= ftp://ftp.netfilter.org/pub/ulogd/ \ ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \ ftp://ftp.de.netfilter.org/pub/netfilter/ulogd/ \ ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= @@ -55,13 +60,10 @@ CONFIGURE_ARGS+= --with-sqlite3=${STAGING_DIR}/usr endif post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} - ${INSTALL_DIR} ${IDIR_ULOGD}/etc/init.d/ + ${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/ + ${INSTALL_DIR} ${IDIR_ULOGD}/etc ${INSTALL_DATA} ${WRKINST}/etc/ulogd.conf ${IDIR_ULOGD}/etc/ - ${INSTALL_BIN} ./files/ulogd.init \ - ${IDIR_ULOGD}/etc/init.d/ulogd - ${INSTALL_DIR} ${IDIR_ULOGD}/usr/lib/ulogd/ ${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_BASE.so ${IDIR_ULOGD}/usr/lib/ulogd/ - ${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/ulogd ${IDIR_ULOGD}/usr/sbin/ ulogd-mod-extra-install: diff --git a/package/ulogd/files/ulogd.conffiles b/package/ulogd/files/ulogd.conffiles new file mode 100644 index 000000000..287b91c95 --- /dev/null +++ b/package/ulogd/files/ulogd.conffiles @@ -0,0 +1 @@ +/etc/ulogd.conf diff --git a/package/ulogd/files/ulogd.init b/package/ulogd/files/ulogd.init index 34cbfe7b6..ef8b8c3fb 100644 --- a/package/ulogd/files/ulogd.init +++ b/package/ulogd/files/ulogd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 49 +#PKG ulogd +#INIT 49 + . /etc/rc.conf case $1 in diff --git a/package/ulogd/files/ulogd.postinst b/package/ulogd/files/ulogd.postinst new file mode 100644 index 000000000..86e3d4348 --- /dev/null +++ b/package/ulogd/files/ulogd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf ulogd ulogd NO diff --git a/package/ulogd/ipkg/ulogd-mod-extra.control b/package/ulogd/ipkg/ulogd-mod-extra.control deleted file mode 100644 index 95332ba34..000000000 --- a/package/ulogd/ipkg/ulogd-mod-extra.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ulogd-mod-extra -Priority: optional -Section: net -Description: Netfilter userspace logging daemon (extra plugins) -Depends: ulogd diff --git a/package/ulogd/ipkg/ulogd-mod-mysql.control b/package/ulogd/ipkg/ulogd-mod-mysql.control deleted file mode 100644 index 3556bb155..000000000 --- a/package/ulogd/ipkg/ulogd-mod-mysql.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ulogd-mod-mysql -Priority: optional -Section: net -Description: Netfilter userspace logging daemon (MySQL plugin) -Depends: libmysqlclient, ulogd diff --git a/package/ulogd/ipkg/ulogd-mod-pcap.control b/package/ulogd/ipkg/ulogd-mod-pcap.control deleted file mode 100644 index 521ad94e8..000000000 --- a/package/ulogd/ipkg/ulogd-mod-pcap.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ulogd-mod-pcap -Priority: optional -Section: net -Description: Netfilter userspace logging daemon (PCAP plugin) -Depends: libpcap, ulogd diff --git a/package/ulogd/ipkg/ulogd-mod-pgsql.control b/package/ulogd/ipkg/ulogd-mod-pgsql.control deleted file mode 100644 index dbc97765d..000000000 --- a/package/ulogd/ipkg/ulogd-mod-pgsql.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ulogd-mod-pgsql -Priority: optional -Section: net -Description: Netfilter userspace logging daemon (PostgreSQL plugin) -Depends: libpq, ulogd diff --git a/package/ulogd/ipkg/ulogd-mod-sqlite.control b/package/ulogd/ipkg/ulogd-mod-sqlite.control deleted file mode 100644 index d76b2d62f..000000000 --- a/package/ulogd/ipkg/ulogd-mod-sqlite.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ulogd-mod-sqlite -Priority: optional -Section: net -Description: Netfilter userspace logging daemon (SQLite plugin) -Depends: libsqlite, ulogd diff --git a/package/ulogd/ipkg/ulogd.conffiles b/package/ulogd/ipkg/ulogd.conffiles deleted file mode 100644 index 287b91c95..000000000 --- a/package/ulogd/ipkg/ulogd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ulogd.conf diff --git a/package/ulogd/ipkg/ulogd.control b/package/ulogd/ipkg/ulogd.control deleted file mode 100644 index 48eda41f3..000000000 --- a/package/ulogd/ipkg/ulogd.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ulogd -Priority: optional -Section: net -Description: Netfilter userspace logging daemon diff --git a/package/ulogd/ipkg/ulogd.postinst b/package/ulogd/ipkg/ulogd.postinst deleted file mode 100644 index 86e3d4348..000000000 --- a/package/ulogd/ipkg/ulogd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf ulogd ulogd NO -- cgit v1.2.3