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/tntnet/Makefile | 27 ++++++++++++++++++++------- package/tntnet/files/tntnet.conffiles | 3 +++ package/tntnet/files/tntnet.postinst | 6 ++++++ package/tntnet/ipkg/tntnet.conffiles | 3 --- package/tntnet/ipkg/tntnet.control | 4 ---- package/tntnet/ipkg/tntnet.postinst | 6 ------ 6 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 package/tntnet/files/tntnet.conffiles create mode 100644 package/tntnet/files/tntnet.postinst delete mode 100644 package/tntnet/ipkg/tntnet.conffiles delete mode 100644 package/tntnet/ipkg/tntnet.control delete mode 100644 package/tntnet/ipkg/tntnet.postinst (limited to 'package/tntnet') diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 58f987b85..59c45ed5c 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -9,19 +9,35 @@ PKG_NAME:= tntnet PKG_VERSION:= 1.6.4 PKG_RELEASE:= 1 PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996 -MASTER_SITES:= http://www.tntnet.org/download/ +PKG_DESCR:= small C++ application server +PKG_SECTION:= net +PKG_DEPENDS:= cxxtools zlib libpthread libiconv +PKG_URL:= http://www.tntnet.org +PKG_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE})) +ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) +PKG_DEPENDS+= uclibc++ +else +PKG_DEPENDS+= libstdcxx +endif + +ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y) +PKG_DEPENDS+= libopenssl +endif + +ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y) +PKG_DEPENDS+= libgnutls +endif + +$(eval $(call PKG_template,TNTNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ TLDFLAGS+= -nodefaultlibs -luClibc++ -liconv -lpthread -lcxxtools -lm -DEPENDS= libgcc, uclibc++, cxxtools, zlib, libpthread, libiconv else TLDFLAGS+= -liconv -lpthread -lcxxtools -lm -ldl -DEPENDS= libgcc, libstdcxx, cxxtools, zlib, libpthread, libiconv endif CONFIGURE_STYLE:= gnu @@ -31,10 +47,8 @@ CONFIGURE_ARGS+= --without-epoll \ --without-sendfile ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-ssl=openssl -SSL_DEPS= ", libopenssl" else ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-ssl=gnutls -SSL_DEPS= ", libgnutls" else CONFIGURE_ARGS+= --without-ssl endif @@ -62,6 +76,5 @@ post-install: ${CP} ${WRKINST}/usr/bin/tntnet ${IDIR_TNTNET}/usr/bin ${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* ${IDIR_TNTNET}/usr/lib/tntnet ${CP} ${WRKINST}/usr/lib/libtntnet.so.* ${IDIR_TNTNET}/usr/lib - echo Depends: ${DEPENDS}${SSL_DEPS} >>${IDIR_TNTNET}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tntnet/files/tntnet.conffiles b/package/tntnet/files/tntnet.conffiles new file mode 100644 index 000000000..def08bf81 --- /dev/null +++ b/package/tntnet/files/tntnet.conffiles @@ -0,0 +1,3 @@ +/etc/tntnet/tntnet.conf +/etc/tntnet/tntnet.properties +/etc/tntnet/mime.conf diff --git a/package/tntnet/files/tntnet.postinst b/package/tntnet/files/tntnet.postinst new file mode 100644 index 000000000..9d462f8d3 --- /dev/null +++ b/package/tntnet/files/tntnet.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf tntnet +gid=$(get_next_gid) +add_group tntnet $gid +add_user tntnet $(get_next_uid) $gid /www diff --git a/package/tntnet/ipkg/tntnet.conffiles b/package/tntnet/ipkg/tntnet.conffiles deleted file mode 100644 index def08bf81..000000000 --- a/package/tntnet/ipkg/tntnet.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/tntnet/tntnet.conf -/etc/tntnet/tntnet.properties -/etc/tntnet/mime.conf diff --git a/package/tntnet/ipkg/tntnet.control b/package/tntnet/ipkg/tntnet.control deleted file mode 100644 index 788b3b450..000000000 --- a/package/tntnet/ipkg/tntnet.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: tntnet -Priority: optional -Section: net -Description: a modular, multithreaded webapplicationserver diff --git a/package/tntnet/ipkg/tntnet.postinst b/package/tntnet/ipkg/tntnet.postinst deleted file mode 100644 index 9d462f8d3..000000000 --- a/package/tntnet/ipkg/tntnet.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf tntnet -gid=$(get_next_gid) -add_group tntnet $gid -add_user tntnet $(get_next_uid) $gid /www -- cgit v1.2.3