Changeset ea719e3 in freewrt

Timestamp:

Mar 13, 2007, 11:12:22 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

2e921f5

Parents:

382dde1

Message:

by request of wbx@, upgrade to fwcf 1.03, add reboot hook, etc.
somewhat tested on my asus wl-500g, both mksh and ash

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2163 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• package/base-files/files/etc/profile (modified) (1 diff)
• package/busybox/Config.in (modified) (1 diff)
• package/busybox/Makefile (modified) (2 diffs)
• package/fwcf/Config.in (modified) (1 diff)
• package/fwcf/Makefile (modified) (1 diff)
• package/fwcf/Makefile.inc (added)
• package/fwcf/hook (added)
• target/linux/brcm-2.4/squashfs-overlay/files/etc/init.d/S20jffsclean (modified) (1 diff)
• tools/Makefile (modified) (1 diff)
• tools/fwcf/Makefile (modified) (1 diff)

package/base-files/files/etc/profile

@@ -12 +12 @@
 [ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
 [ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
-reboot() { ifdown wan >&- 2>&-; /sbin/reboot; }
+reboot() { ifdown wan >&- 2>&-; /sbin/reboot "$@"; }
 
 [ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc

package/busybox/Config.in

@@ -11 +11 @@
           Most people will answer Y.
 
+# if this is enabled, halt/poweroff/reboot aren't included in the .ipk
+config BUSYBOX_CONFIG_FEATURE_FWCF_REBOOT
+        bool
+        default n
+
 menu "Busybox Configuration"
         depends FWRT_PACKAGE_BUSYBOX

package/busybox/Makefile

@@ -9 +9 @@
 PKG_NAME:=              busybox
 PKG_VERSION:=           1.4.1
-PKG_RELEASE:=           7
+PKG_RELEASE:=           8
 PKG_MD5SUM:=            5728403bce309cdabcffa414e2e64052
 PKG_INIT:=              60
@@ -54 +54 @@
         $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/network/if-down.d
         $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/network/if-post-down.d
+ifneq ($(strip ${BUSYBOX_CONFIG_HALT}),)
+ifneq ($(strip ${BUSYBOX_CONFIG_FEATURE_FWCF_REBOOT}),)
+        cd ${IDIR_BUSYBOX}/sbin && rm -f halt poweroff reboot
+endif
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/fwcf/Config.in

@@ -3 +3 @@
         tristate
         default y if FWRT_TARGET_ROOTFS_JFFS2
-        default y if FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS
         default y if FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         default n
+        select BUSYBOX_CONFIG_CAT
+        select BUSYBOX_CONFIG_CHMOD
+        select BUSYBOX_CONFIG_CHOWN
+        select BUSYBOX_CONFIG_COMM
+        select BUSYBOX_CONFIG_DD
+        select BUSYBOX_CONFIG_FIND
+        select BUSYBOX_CONFIG_GREP
+        select BUSYBOX_CONFIG_LOGGER
+        select BUSYBOX_CONFIG_LS
         select BUSYBOX_CONFIG_MD5SUM
+        select BUSYBOX_CONFIG_MKDIR
         select BUSYBOX_CONFIG_MOUNT
-        select BUSYBOX_CONFIG_LOGGER
+        select BUSYBOX_CONFIG_PRINTF
+        select BUSYBOX_CONFIG_RM
+        select BUSYBOX_CONFIG_SED
+        select BUSYBOX_CONFIG_SORT
+        select BUSYBOX_CONFIG_TAR
+        select BUSYBOX_CONFIG_UMOUNT
+        select BUSYBOX_CONFIG_XARGS
+        select BUSYBOX_CONFIG_FEATURE_FIND_TYPE
+        select BUSYBOX_CONFIG_FEATURE_FWCF_REBOOT
+        select BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS
+        select BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS
+        select BUSYBOX_CONFIG_FEATURE_SORT_BIG
         select FWRT_PACKAGE_MTD
-        depends on FWRT_TARGET_ROOTFS_JFFS2 || \
-                   FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS || \
-                   FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
         help
           The FreeWRT compressed /etc filesystem management tools

package/fwcf/Makefile

@@ -5 +5 @@
 # or at http://www.freewrt.org/licence for details.
 
-include $(TOPDIR)/rules.mk
+include ${TOPDIR}/rules.mk
+include Makefile.inc
+include ${TOPDIR}/mk/package.mk
 
-PKG_NAME=               fwcf
-PKG_VERSION=            1.01
-PKG_RELEASE=            1
-PKG_MD5SUM=             4a9d6ef494c87c6858bea15338fa67a5
-# this is mirrored at=  http://www.mirbsd.org/dist/hosted/fwcf/
-PKG_SOURCE_URL=         http://www.freewrt.org/distfiles/
-WRKDIST=                ${WRKDIR}/${PKG_NAME}
+$(eval $(call PKG_template,FWCF,fwcf,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
-include $(TOPDIR)/mk/package.mk
+BUILD_STYLE=            auto
+MAKE_FILE=              GNUmakefile
 
-$(eval $(call PKG_template,FWCF,fwcf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-CFLAGS=         ${TARGET_CFLAGS} ${TARGET_CPPFLAGS} -I${STAGING_DIR}/usr/include
-
-do-build:
-        env \
-            CC="${TARGET_CC}" \
-            CFLAGS="${CFLAGS}" \
-            LDFLAGS="${TARGET_LDFLAGS} -L${STAGING_DIR}/usr/lib" \
-            $(MAKE) -C $(WRKBUILD) all
+post-build:
+        ${BASH} ${TOPDIR}/scripts/strip-script.sh hook >${WRKBUILD}/hook
 
 do-install:
-        $(INSTALL_DIR) $(IDIR_FWCF)/sbin
-        $(INSTALL_BIN) $(WRKBUILD)/fwcf.helper.out $(IDIR_FWCF)/sbin/fwcf.helper
-        $(INSTALL_BIN) $(WRKSRC)/fwcf.sh $(IDIR_FWCF)/sbin/fwcf
+        ${INSTALL_DIR} ${IDIR_FWCF}/sbin
+        ${INSTALL_BIN} ${WRKBUILD}/fwcf.helper.out ${IDIR_FWCF}/sbin/fwcf.helper
+        ${INSTALL_BIN} ${WRKSRC}/fwcf.sh ${IDIR_FWCF}/sbin/fwcf
+        ${INSTALL_SCRIPT} ${WRKBUILD}/hook ${IDIR_FWCF}/sbin/halt
+        cd ${IDIR_FWCF}/sbin && ln halt reboot && ln halt poweroff
 
 include ${TOPDIR}/mk/pkg-bottom.mk

target/linux/brcm-2.4/squashfs-overlay/files/etc/init.d/S20jffsclean

@@ -5 +5 @@
         mtd erase data
         jffs2root --clean
-        reboot
+        busybox reboot
 }

tools/Makefile

@@ -15 +15 @@
 TARGETS+=       brcm-utils
 TARGETS+=       failsafe
-#TARGETS+=      fwcf
+TARGETS+=       fwcf
 TARGETS+=       ipkg-utils
 TARGETS+=       jffs2

tools/fwcf/Makefile

@@ -9 +9 @@
 include ../rules.mk
 
+EXTRA_SRCS=
+ifeq (${OStype},Linux)
+EXTRA_SRCS+=    ${TOPDIR}/tools/paxmirabilis/strlfun.c
+endif
+
 ${WRKBUILD}/.configured: ${WRKBUILD}/.prepared
 
 ${WRKBUILD}/fwcf.helper.out: ${WRKBUILD}/.configured
-        cd ${WRKBUILD} && SRCS=${TOPDIR}/tools/paxmirabilis/strlfun.c gmake
+        cd ${WRKBUILD} && SRCS='${EXTRA_SRCS}' gmake
 
 source: