Date:2010-08-19 14:49:37 (2 years 9 months ago)
Author:nbd
Commit:37b9bb7ce2cf4ba218bb726180ccba01adb2d88f
Message:speed up the build system by including include/shell.sh on shell commands only where necessary

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22720 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: include/depends.mk (1 diff)
include/kernel.mk (1 diff)
include/package-defaults.mk (1 diff)
include/package-ipkg.mk (2 diffs)
include/target.mk (2 diffs)
include/toplevel.mk (1 diff)
include/unpack.mk (1 diff)
rules.mk (2 diffs)

Change Details

include/depends.mk
1313
1414DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check"
1515
16find_md5=find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
16find_md5=$(SH_FUNC) find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
1717
1818define rdep
1919  .PRECIOUS: $(2)
include/kernel.mk
6464endef
6565
6666define ModuleAutoLoad
67    $(SH_FUNC) \
6768    export modules=; \
6869    add_module() { \
6970        mkdir -p $(2)/etc/modules.d; \
include/package-defaults.mk
4343Build/Patch:=$(Build/Patch/Default)
4444ifneq ($(strip $(PKG_UNPACK)),)
4545  define Build/Prepare/Default
46      $(PKG_UNPACK)
46    $(SH_FUNC) $(PKG_UNPACK)
4747    $(Build/Patch)
4848  endef
4949endif
include/package-ipkg.mk
2121
2222define BuildIPKGVariable
2323  $(call shexport,Package/$(1)/$(2))
24  $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
24  $(1)_COMMANDS += $(SH_FUNC) var2file "$(call shvar,Package/$(1)/$(2))" $(2);
2525endef
2626
2727PARENL :=(
...... 
9595        echo "Maintainer: $(MAINTAINER)"; \
9696        echo "Architecture: $(PKGARCH)"; \
9797        echo "Installed-Size: 1"; \
98        echo -n "Description: "; getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \
98        echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \
9999     ) >> $$(IDIR_$(1))/CONTROL/control
100100    chmod 644 $$(IDIR_$(1))/CONTROL/control
101101    (cd $$(IDIR_$(1))/CONTROL; \
include/target.mk
6767        echo "Target-Profile-Kconfig: yes"; \
6868    fi; \
6969    echo "Target-Profile-Config: "; \
70    getvar "$(call shvar,Profile/$(1)/Config)"; \
70    $(SH_FUNC) getvar "$(call shvar,Profile/$(1)/Config)"; \
7171    echo "@@"; \
7272    echo "Target-Profile-Description:"; \
73    getvar "$(call shvar,Profile/$(1)/Description)"; \
73    $(SH_FUNC) getvar "$(call shvar,Profile/$(1)/Description)"; \
7474    echo "@@"; \
7575    echo;
7676  ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_)$(1))),y)
...... 
185185     echo 'Linux-Release: $(LINUX_RELEASE)'; \
186186     echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
187187     echo 'Target-Description:'; \
188     getvar $(call shvar,Target/Description); \
188     $(SH_FUNC) getvar $(call shvar,Target/Description); \
189189     echo '@@'; \
190190     echo 'Default-Packages: $(DEFAULT_PACKAGES)'; \
191191     $(DUMPINFO)
include/toplevel.mk
77#
88
99RELEASE:=Kamikaze
10SHELL:=/usr/bin/env bash
10export SHELL:=/usr/bin/env bash
1111PREP_MK= OPENWRT_BUILD= QUIET=0
1212
1313include $(TOPDIR)/include/verbose.mk
include/unpack.mk
7171endif
7272
7373ifdef PKG_BUILD_DIR
74  PKG_UNPACK ?= $(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR))
74  PKG_UNPACK ?= $(SH_FUNC) $(call UNPACK_CMD,$(PKG_BUILD_DIR)) $(call CRLF_CMD,$(PKG_BUILD_DIR))
7575endif
7676ifdef HOST_BUILD_DIR
77  HOST_UNPACK ?= $(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR))
77  HOST_UNPACK ?= $(SH_FUNC) $(call UNPACK_CMD,$(HOST_BUILD_DIR)) $(call CRLF_CMD,$(HOST_BUILD_DIR))
7878endif
7979
8080endif # PKG_SOURCE
rules.mk
1616
1717TMP_DIR:=$(TOPDIR)/tmp
1818
19export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
20
2119GREP_OPTIONS=
2220export GREP_OPTIONS
2321
...... 
148146export PATH:=$(TARGET_PATH)
149147export STAGING_DIR
150148export GCC_HONOUR_COPTS:=0
149export SH_FUNC:=. $(INCLUDE_DIR)/shell.sh;
151150
152151PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config
153152

Archive Download the corresponding diff file

Branches:
backfire
history
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-10-11
uclibc_nptl



interactive