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/iproute2/Makefile | 17 ++++++++++++----- package/iproute2/ipkg/ip.control | 4 ---- package/iproute2/ipkg/tc.control | 5 ----- 3 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 package/iproute2/ipkg/ip.control delete mode 100644 package/iproute2/ipkg/tc.control (limited to 'package/iproute2') diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 58650bfd1..d2703e645 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -9,13 +9,20 @@ PKG_NAME:= iproute2 PKG_VERSION:= 2.6.29-1 PKG_RELEASE:= 1 PKG_MD5SUM:= c1bc258a6c345905e79935ac7a3cc582 +PKG_DESCR:= iproute2 routing control utility +PKG_SECTION:= net +PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 +PKG_SITES:= http://developer.osdl.org/dev/iproute2/download/ + +PKG_DESCR_1:= iproute2 traffic control utility +PKG_DEPENDS_1:= kmod-sched + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -MASTER_SITES:= http://developer.osdl.org/dev/iproute2/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) do-configure: ${SED} "s:-O2:${TARGET_CFLAGS}:g" ${WRKBUILD}/Makefile @@ -31,10 +38,10 @@ do-configure: ${SED} "s, netem,," ${WRKBUILD}/Makefile do-build: - ${MAKE} -j1 -C ${WRKBUILD}/netem \ + ${MAKE} -C ${WRKBUILD}/netem \ HOSTCC=${HOSTCC} \ CCOPTS="-I${LINUX_DIR}" \ - ${MAKE} -j1 -C ${WRKBUILD} ${TARGET_CONFIGURE_OPTS} \ + ${MAKE} -C ${WRKBUILD} ${TARGET_CONFIGURE_OPTS} \ CFLAGS="-D_GNU_SOURCE ${TARGET_CFLAGS} -I ../include -DRESOLVE_HOSTNAMES" \ KERNEL_INCLUDE=${LINUX_DIR}/include all tc/tc ip/ip \ CCOPTS="-I${LINUX_DIR}" diff --git a/package/iproute2/ipkg/ip.control b/package/iproute2/ipkg/ip.control deleted file mode 100644 index 8206dd37a..000000000 --- a/package/iproute2/ipkg/ip.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ip -Section: net -Priority: optional -Description: iproute2 routing control utility diff --git a/package/iproute2/ipkg/tc.control b/package/iproute2/ipkg/tc.control deleted file mode 100644 index 8950da394..000000000 --- a/package/iproute2/ipkg/tc.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: tc -Section: net -Priority: optional -Description: iproute2 traffic control utility -Depends: kmod-sched -- cgit v1.2.3