Changeset 2596

Show
Ignore:
Timestamp:
05/22/07 13:51:19 (2 years ago)
Author:
tg
Message:

run some more scripts with ${MBSH}

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/build.mk

    r2591 r2596  
    3434 
    3535world: $(DL_DIR) $(BUILD_DIR) $(PACKAGE_DIR) ${TOPDIR}/.cfg/FWRT_HAVE_DOT_CONFIG 
    36         ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh 
     36        ${MBSH} BASH='${BASH}' ${TOPDIR}/scripts/scan-pkgs.sh 
    3737ifeq ($(strip ${FWRT_PACKAGE_BASE_FILES}),m) 
    3838        $(MAKE) -f mk/build.mk tools/install toolchain/install target/config-prepare target/compile package/compile 
    …… 
    138138allmodconfig: $(CONFIG)/conf 
    139139        $(CONFIG)/conf -m $(CONFIG_CONFIG_IN) 
    140         ${BASH} scripts/restore-defaultconf.sh $(RESTORE_PATTERNS) 
     140        ${MBSH} scripts/restore-defaultconf.sh $(RESTORE_PATTERNS) 
    141141        $(CONFIG)/conf -o $(CONFIG_CONFIG_IN) 
    142142 
    143143snapshotconfig: $(CONFIG)/conf 
    144144        $(CONFIG)/conf -m Config.in.snapshot 
    145         ${BASH} scripts/restore-defaultconf.sh $(RESTORE_PATTERNS) 
     145        ${MBSH} scripts/restore-defaultconf.sh $(RESTORE_PATTERNS) 
    146146        $(CONFIG)/conf -o $(CONFIG_CONFIG_IN) 
    147147 

  • trunk/freewrt/mk/buildhlp.mk

    r2221 r2596  
    9292        @toedit=$$(WRKDIST='${WRKDIST}' CURDIR=$$(pwd) \ 
    9393            PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \ 
    94             ${BASH} ${TOPDIR}/scripts/update-patches); \ 
     94            ${MBSH} ${TOPDIR}/scripts/update-patches); \ 
    9595            if [[ -n $$toedit && $$toedit != FAIL ]]; then \ 
    9696                echo -n 'edit patches: '; read i; \ 

  • trunk/freewrt/mk/kernel-build.mk

    r2585 r2596  
    7474        rm -rf $(KERNEL_IDIR) 
    7575        mkdir -p $(KERNEL_IDIR)/etc 
    76         ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_IDIR} \ 
     76        ${MBSH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_IDIR} \ 
    7777            ../kernel.control ${BOARD}-${KERNEL}-${LINUX_VERSION} ${ARCH} 
    7878        $(IPKG_BUILD) $(KERNEL_IDIR) $(PACKAGE_DIR) $(MAKE_TRACE) 

  • trunk/freewrt/mk/kernel.mk

    r2520 r2596  
    3131                IPKG_CONF_DIR=$(LINUX_BUILD_DIR) \ 
    3232                IPKG_OFFLINE_ROOT=$(LINUX_BUILD_DIR)/root \ 
    33                 ${BASH} ${SCRIPT_DIR}/ipkg -force-defaults -force-depends 
     33                ${MBSH} ${SCRIPT_DIR}/ipkg -force-defaults -force-depends 
    3434 
    3535LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ 
    …… 
    9393        echo "Section: sys" >> $(BUILD_DIR)/kmod-control/kmod-$(2).control 
    9494        echo "Description: kernel module $(2)" >> $(BUILD_DIR)/kmod-control/kmod-$(2).control 
    95         ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(I_$(1)) \ 
     95        ${MBSH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(I_$(1)) \ 
    9696            $(BUILD_DIR)/kmod-control/kmod-$(2).control \ 
    9797            $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) 

  • trunk/freewrt/mk/package.mk

    r2593 r2596  
    9797_ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control 
    9898$$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} 
    99         ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(IDIR_$(1)) \ 
     99        ${MBSH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(IDIR_$(1)) \ 
    100100            ./ipkg/$(2).control $(3) $(4) 
    101101        [ -z "$$(IDEPEND_$(1))" ] || echo "Depends: $$(IDEPEND_$(1))" >>$$(IDIR_$(1))/CONTROL/control 

  • trunk/freewrt/mk/pkg-bottom.mk

    r2591 r2596  
    2626        cd ${WRKBUILD}; rm -f config.{cache,status}; \ 
    2727            env ${CONFIGURE_ENV} \ 
    28             ${BASH} ${WRKSRC}/configure \ 
     28            ${MBSH} ${WRKSRC}/configure \ 
    2929            --build=${GNU_HOST_NAME} \ 
    3030            --host=${GNU_TARGET_NAME} \ 

  • trunk/freewrt/mk/vars.mk

    r2593 r2596  
    6262 
    6363# invoke ipkg-build with some default options 
    64 IPKG_BUILD:=            PATH='${TARGET_PATH}' ${BASH} \ 
     64IPKG_BUILD:=            PATH='${TARGET_PATH}' ${MBSH} \ 
    6565                            ${TOPDIR}/scripts/ipkg-build -c -o 0 -g 0 
    6666# where to build (and put) .ipk packages 
    …… 
    6969                        IPKG_CONF_DIR=$(STAGING_DIR)/etc \ 
    7070                        IPKG_OFFLINE_ROOT=$(BUILD_DIR)/root \ 
    71                         ${BASH} ${SCRIPT_DIR}/ipkg -force-defaults -force-depends 
     71                        ${MBSH} ${SCRIPT_DIR}/ipkg -force-defaults -force-depends 
    7272IPKG_STATE_DIR:=        $(TARGET_DIR)/usr/lib/ipkg 
    7373 
    74 RSTRIP:=                prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh 
     74RSTRIP:=                prefix='${TARGET_CROSS}' ${MBSH} ${SCRIPT_DIR}/rstrip.sh 
    7575 
    7676EXTRACT_CMD=            mkdir -p ${WRKDIR}; \ 

  • trunk/freewrt/scripts/rstrip.sh

    r1925 r2596  
    55# or at http://www.freewrt.org/licence for details. 
    66 
    7 shopt -s extglob 
     7[[ -n $BASH_VERSION ]] && shopt -s extglob 
    88 
    99SELF=${0##*/} 

  • trunk/freewrt/scripts/scan-pkgs.sh

    r2545 r2596  
    3131 
    3232if test -z "$BASH_VERSION"; then 
     33        BASH_VERSION=`$BASH -c 'echo $BASH_VERSION'` 
     34fi 
     35 
     36if test -z "$BASH_VERSION"; then 
    3337        echo FreeWRT requires GNU bash to be installed, sorry. 
    3438        exit 1 
    3539fi 
    3640 
    37 shopt -s extglob 
     41test -z "$BASH_VERSION$KSH_VERSION" && exec $BASH $0 "$@" 
     42 
     43[[ -n $BASH_VERSION ]] && shopt -s extglob 
    3844topdir=$(readlink -nf $(dirname $0)/..) 
    3945export PATH=$topdir/lbin:$PATH 

  • trunk/freewrt/scripts/update-patches

    r2020 r2596  
    2828# of said person's immediate fault when using the work as intended. 
    2929 
    30 shopt -s extglob 
     30[[ -n $BASH_VERSION ]] && shopt -s extglob 
    3131 
    3232do_diff()