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/base-files/Makefile | 12 ++++-------- package/base-files/files/base-files.conffiles | 13 +++++++++++++ package/base-files/files/etc/init.d/boot | 2 +- package/base-files/files/etc/init.d/done | 2 +- package/base-files/files/etc/init.d/rcK | 2 +- package/base-files/files/etc/init.d/rcS | 2 +- package/base-files/ipkg/base-files.conffiles | 13 ------------- package/base-files/ipkg/base-files.control | 3 --- 8 files changed, 21 insertions(+), 28 deletions(-) create mode 100644 package/base-files/files/base-files.conffiles delete mode 100644 package/base-files/ipkg/base-files.conffiles delete mode 100644 package/base-files/ipkg/base-files.control (limited to 'package/base-files') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 6f503b2c7..62eebd4c1 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -9,6 +9,9 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 PKG_RELEASE:= 5 +PKG_DESCR:= basic filesystem structure and scripts +PKG_SECTION:= base + WRKDIST= ${WRKDIR}/base-files NO_DISTFILES:= 1 ifeq ($(CPU_ARCH),x86_64) @@ -22,18 +25,11 @@ ICONTROL_ADDON_BASE_FILES= "Package: base-files-${PKG_ID}" include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-install: $(CP) ./files/* $(IDIR_BASE_FILES) $(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES) - typeset -i REV; \ - if fgrep xml .svn/entries >/dev/null 2>&1; then \ - let REV="$$(sed -n '/revision=/s/^.*"\([0-9]*\)".*$$/\1/p' \ - .svn/entries)"; \ - else \ - let REV="$$(head -n 4 .svn/entries | tail -1)"; \ - fi; ${SED} 's,$$R,'$$REV,g $(IDIR_BASE_FILES)/etc/banner $(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf echo /bin/sh >${IDIR_BASE_FILES}/etc/shells diff --git a/package/base-files/files/base-files.conffiles b/package/base-files/files/base-files.conffiles new file mode 100644 index 000000000..2495e2ee4 --- /dev/null +++ b/package/base-files/files/base-files.conffiles @@ -0,0 +1,13 @@ +/etc/banner +/etc/group +/etc/hosts +/etc/ipkg.conf +/etc/modules +/etc/passwd +/etc/profile +/etc/protocols +/etc/sysctl.conf +/etc/network/interfaces +/etc/rc.conf +/etc/sysctl.conf +/etc/shadow diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index c81d7ea65..f71e46240 100644 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -1,5 +1,5 @@ #!/bin/sh -#FWINIT 10 +#INIT 10 [[ $1 = autostart ]] || exit 0 . /etc/functions.sh diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done index 018d52a43..e5b655bb6 100644 --- a/package/base-files/files/etc/init.d/done +++ b/package/base-files/files/etc/init.d/done @@ -1,4 +1,4 @@ #!/bin/sh -#FWINIT 98 +#INIT 98 [[ $1 = autostart ]] && sysctl -p >&- exit 0 diff --git a/package/base-files/files/etc/init.d/rcK b/package/base-files/files/etc/init.d/rcK index 3cf210fa7..e94d1a296 100755 --- a/package/base-files/files/etc/init.d/rcK +++ b/package/base-files/files/etc/init.d/rcK @@ -4,7 +4,7 @@ busybox reboot -d 60 -f & # just in case… { [[ -f /proc/diag/led/power ]] && echo f >/proc/diag/led/power test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1 - grep '^#FWINIT ' /etc/init.d/* | \ + grep '^#INIT ' /etc/init.d/* | \ sort -rnk2 | \ while read line; do shebang=$(sed -n '1s/^#![ ]*//p' ${line%%:*}) diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS index f9c47e425..fd56feebf 100755 --- a/package/base-files/files/etc/init.d/rcS +++ b/package/base-files/files/etc/init.d/rcS @@ -1,7 +1,7 @@ #!/bin/sh export PATH=/bin:/sbin:/usr/bin:/usr/sbin { - grep '^#FWINIT ' /etc/init.d/* | \ + grep '^#INIT ' /etc/init.d/* | \ sort -nk2 | \ while read line; do /bin/sh ${line%%:*} autostart 2>&1 diff --git a/package/base-files/ipkg/base-files.conffiles b/package/base-files/ipkg/base-files.conffiles deleted file mode 100644 index 2495e2ee4..000000000 --- a/package/base-files/ipkg/base-files.conffiles +++ /dev/null @@ -1,13 +0,0 @@ -/etc/banner -/etc/group -/etc/hosts -/etc/ipkg.conf -/etc/modules -/etc/passwd -/etc/profile -/etc/protocols -/etc/sysctl.conf -/etc/network/interfaces -/etc/rc.conf -/etc/sysctl.conf -/etc/shadow diff --git a/package/base-files/ipkg/base-files.control b/package/base-files/ipkg/base-files.control deleted file mode 100644 index 00e2d7746..000000000 --- a/package/base-files/ipkg/base-files.control +++ /dev/null @@ -1,3 +0,0 @@ -Priority: base -Section: base -Description: basic filesystem structure and scripts -- cgit v1.2.3