Changeset 2163

Show
Ignore:
Timestamp:
03/13/07 23:12:22 (2 years ago)
Author:
tg
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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/base-files/files/etc/profile

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

  • trunk/freewrt/package/busybox/Config.in

    r414 r2163  
    1111          Most people will answer Y. 
    1212 
     13# if this is enabled, halt/poweroff/reboot aren't included in the .ipk 
     14config BUSYBOX_CONFIG_FEATURE_FWCF_REBOOT 
     15        bool 
     16        default n 
     17 
    1318menu "Busybox Configuration" 
    1419        depends FWRT_PACKAGE_BUSYBOX 

  • trunk/freewrt/package/busybox/Makefile

    r2160 r2163  
    99PKG_NAME:=              busybox 
    1010PKG_VERSION:=           1.4.1 
    11 PKG_RELEASE:=           7 
     11PKG_RELEASE:=           8 
    1212PKG_MD5SUM:=            5728403bce309cdabcffa414e2e64052 
    1313PKG_INIT:=              60 
    …… 
    5454        $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/network/if-down.d 
    5555        $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/network/if-post-down.d 
     56ifneq ($(strip ${BUSYBOX_CONFIG_HALT}),) 
     57ifneq ($(strip ${BUSYBOX_CONFIG_FEATURE_FWCF_REBOOT}),) 
     58        cd ${IDIR_BUSYBOX}/sbin && rm -f halt poweroff reboot 
     59endif 
     60endif 
    5661 
    5762include ${TOPDIR}/mk/pkg-bottom.mk 

  • trunk/freewrt/package/fwcf/Config.in

    r944 r2163  
    33        tristate 
    44        default y if FWRT_TARGET_ROOTFS_JFFS2 
    5         default y if FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS 
    65        default y if FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY 
    76        default n 
     7        select BUSYBOX_CONFIG_CAT 
     8        select BUSYBOX_CONFIG_CHMOD 
     9        select BUSYBOX_CONFIG_CHOWN 
     10        select BUSYBOX_CONFIG_COMM 
     11        select BUSYBOX_CONFIG_DD 
     12        select BUSYBOX_CONFIG_FIND 
     13        select BUSYBOX_CONFIG_GREP 
     14        select BUSYBOX_CONFIG_LOGGER 
     15        select BUSYBOX_CONFIG_LS 
    816        select BUSYBOX_CONFIG_MD5SUM 
     17        select BUSYBOX_CONFIG_MKDIR 
    918        select BUSYBOX_CONFIG_MOUNT 
    10         select BUSYBOX_CONFIG_LOGGER 
     19        select BUSYBOX_CONFIG_PRINTF 
     20        select BUSYBOX_CONFIG_RM 
     21        select BUSYBOX_CONFIG_SED 
     22        select BUSYBOX_CONFIG_SORT 
     23        select BUSYBOX_CONFIG_TAR 
     24        select BUSYBOX_CONFIG_UMOUNT 
     25        select BUSYBOX_CONFIG_XARGS 
     26        select BUSYBOX_CONFIG_FEATURE_FIND_TYPE 
     27        select BUSYBOX_CONFIG_FEATURE_FWCF_REBOOT 
     28        select BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS 
     29        select BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS 
     30        select BUSYBOX_CONFIG_FEATURE_SORT_BIG 
    1131        select FWRT_PACKAGE_MTD 
    12         depends on FWRT_TARGET_ROOTFS_JFFS2 || \ 
    13                    FWRT_TARGET_ROOTFS_SQUASHFS_SYMLINKS || \ 
    14                    FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY 
    1532        help 
    1633          The FreeWRT compressed /etc filesystem management tools 

  • trunk/freewrt/package/fwcf/Makefile

    r1686 r2163  
    55# or at http://www.freewrt.org/licence for details. 
    66 
    7 include $(TOPDIR)/rules.mk 
     7include ${TOPDIR}/rules.mk 
     8include Makefile.inc 
     9include ${TOPDIR}/mk/package.mk 
    810 
    9 PKG_NAME=               fwcf 
    10 PKG_VERSION=            1.01 
    11 PKG_RELEASE=            1 
    12 PKG_MD5SUM=             4a9d6ef494c87c6858bea15338fa67a5 
    13 # this is mirrored at=  http://www.mirbsd.org/dist/hosted/fwcf/ 
    14 PKG_SOURCE_URL=         http://www.freewrt.org/distfiles/ 
    15 WRKDIST=                ${WRKDIR}/${PKG_NAME} 
     11$(eval $(call PKG_template,FWCF,fwcf,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    1612 
    17 include $(TOPDIR)/mk/package.mk 
     13BUILD_STYLE=            auto 
     14MAKE_FILE=              GNUmakefile 
    1815 
    19 $(eval $(call PKG_template,FWCF,fwcf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    20  
    21 CFLAGS=         ${TARGET_CFLAGS} ${TARGET_CPPFLAGS} -I${STAGING_DIR}/usr/include 
    22  
    23 do-build: 
    24         env \ 
    25             CC="${TARGET_CC}" \ 
    26             CFLAGS="${CFLAGS}" \ 
    27             LDFLAGS="${TARGET_LDFLAGS} -L${STAGING_DIR}/usr/lib" \ 
    28             $(MAKE) -C $(WRKBUILD) all 
     16post-build: 
     17        ${BASH} ${TOPDIR}/scripts/strip-script.sh hook >${WRKBUILD}/hook 
    2918 
    3019do-install: 
    31         $(INSTALL_DIR) $(IDIR_FWCF)/sbin 
    32         $(INSTALL_BIN) $(WRKBUILD)/fwcf.helper.out $(IDIR_FWCF)/sbin/fwcf.helper 
    33         $(INSTALL_BIN) $(WRKSRC)/fwcf.sh $(IDIR_FWCF)/sbin/fwcf 
     20        ${INSTALL_DIR} ${IDIR_FWCF}/sbin 
     21        ${INSTALL_BIN} ${WRKBUILD}/fwcf.helper.out ${IDIR_FWCF}/sbin/fwcf.helper 
     22        ${INSTALL_BIN} ${WRKSRC}/fwcf.sh ${IDIR_FWCF}/sbin/fwcf 
     23        ${INSTALL_SCRIPT} ${WRKBUILD}/hook ${IDIR_FWCF}/sbin/halt 
     24        cd ${IDIR_FWCF}/sbin && ln halt reboot && ln halt poweroff 
    3425 
    3526include ${TOPDIR}/mk/pkg-bottom.mk 

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

    r618 r2163  
    55        mtd erase data 
    66        jffs2root --clean 
    7         reboot 
     7        busybox reboot 
    88} 

  • trunk/freewrt/tools/Makefile

    r2151 r2163  
    1515TARGETS+=       brcm-utils 
    1616TARGETS+=       failsafe 
    17 #TARGETS+=    fwcf 
     17TARGETS+=     fwcf 
    1818TARGETS+=       ipkg-utils 
    1919TARGETS+=       jffs2 

  • trunk/freewrt/tools/fwcf/Makefile

    r2145 r2163  
    99include ../rules.mk 
    1010 
     11EXTRA_SRCS= 
     12ifeq (${OStype},Linux) 
     13EXTRA_SRCS+=    ${TOPDIR}/tools/paxmirabilis/strlfun.c 
     14endif 
     15 
    1116${WRKBUILD}/.configured: ${WRKBUILD}/.prepared 
    1217 
    1318${WRKBUILD}/fwcf.helper.out: ${WRKBUILD}/.configured 
    14         cd ${WRKBUILD} && SRCS=${TOPDIR}/tools/paxmirabilis/strlfun.c gmake 
     19        cd ${WRKBUILD} && SRCS='${EXTRA_SRCS}' gmake 
    1520 
    1621source: