Changeset 89869ca in freewrt

Timestamp:

Mar 24, 2007, 3:25:54 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

f88bc41

Parents:

3c3c38d

Message:

add fwcf 1.0.3, new features fwcf status, reboot/halt hooks are generating a warning if uncommitted changes exist in /etc

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@2249 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package

Files:

• busybox/Config.in (modified) (1 diff)
• busybox/Makefile (modified) (1 diff)
• fwcf/Config.in (modified) (1 diff)
• fwcf/Makefile (modified) (3 diffs)
• fwcf/files/hook (added)

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

@@ -58 +58 @@
         $(INSTALL_BIN) ./files/if-watchdog \
                 $(IDIR_BUSYBOX)/sbin/if-watchdog
+ifneq ($(strip ${BUSYBOX_CONFIG_HALT}),)
+ifneq ($(strip ${BUSYBOX_CONFIG_FEATURE_FWCF_REBOOT}),)
+        cd ${IDIR_BUSYBOX}/sbin && rm -f halt poweroff reboot
+endif
+endif
         $(RSTRIP) $(IDIR_BUSYBOX)
         $(IPKG_BUILD) $(IDIR_BUSYBOX) $(PACKAGE_DIR)

package/fwcf/Config.in

@@ -6 +6 @@
         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_SORT_BIG
         select FWRT_PACKAGE_MTD
         depends on FWRT_TARGET_ROOTFS_JFFS2 || \

package/fwcf/Makefile

@@ -8 +8 @@
 
 PKG_NAME=               fwcf
-PKG_VERSION=            1.01
+PKG_VERSION=            1.03
 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/
+PKG_MD5SUM=             d1b0e1731c14f839a0b52bfc9d6a467a
+PKG_SOURCE_URL=         http://www.freewrt.org/distfiles/ \
+                        http://www.mirbsd.org/dist/hosted/fwcf/ \
+                        http://pub.allbsd.org/dist/hosted/fwcf/
 WRKSRC=                 ${WRKDIR}/${PKG_NAME}
 
@@ -30 +31 @@
             LDFLAGS="${TARGET_LDFLAGS} -L${STAGING_DIR}/usr/lib" \
             $(MAKE) -C $(WRKBUILD) all
+        ${BASH} ${TOPDIR}/scripts/strip-script.sh ./files/hook >${WRKBUILD}/hook
         touch $@
 
@@ -36 +38 @@
         $(INSTALL_BIN) $(WRKBUILD)/fwcf.helper.out $(IDIR_FWCF)/sbin/fwcf.helper
         $(INSTALL_BIN) $(WRKSRC)/fwcf.sh $(IDIR_FWCF)/sbin/fwcf
+        ${INSTALL_BIN} ${WRKBUILD}/hook ${IDIR_FWCF}/sbin/halt
+        cd ${IDIR_FWCF}/sbin && ln -sf halt reboot && ln -sf halt poweroff
         $(RSTRIP) $(IDIR_FWCF)
         $(IPKG_BUILD) $(IDIR_FWCF) $(PACKAGE_DIR)