diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-06 16:01:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-06 16:01:06 +0000 |
| commit | 44cd20b8023f6f2fca50c32772229590b179756d (patch) | |
| tree | 814262a8291ca31c2261c2028238ecb44447ab75 /include/package.mk | |
| parent | 5c91b34ed732afddfcb15fdf857f6939c050dfb1 (diff) | |
| download | upstream-44cd20b8023f6f2fca50c32772229590b179756d.tar.gz upstream-44cd20b8023f6f2fca50c32772229590b179756d.tar.bz2 upstream-44cd20b8023f6f2fca50c32772229590b179756d.zip | |
build: rework the package/install step - collect package install lists during package/compile, then install all packages at once
SVN-Revision: 33631
Diffstat (limited to 'include/package.mk')
| -rw-r--r-- | include/package.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/package.mk b/include/package.mk index 3ec5ffdadd..8b8cb1aae9 100644 --- a/include/package.mk +++ b/include/package.mk @@ -13,7 +13,6 @@ PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install PKG_MD5SUM ?= unknown PKG_BUILD_PARALLEL ?= -PKG_INFO_DIR := $(STAGING_DIR)/pkginfo ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),) MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j) @@ -52,6 +51,8 @@ ifneq ($(if $(CONFIG_SRC_TREE_OVERRIDE),$(wildcard ./git-src)),) QUILT:=1 endif +PKG_DIR_NAME:=$(lastword $(subst /,$(space),$(CURDIR))) + include $(INCLUDE_DIR)/download.mk include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/package-defaults.mk @@ -250,6 +251,11 @@ Build/DistCheck=$(call Build/DistCheck/Default,) .NOTPARALLEL: +.PHONY: prepare-package-install +prepare-package-install: + @touch $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.clean + @echo "$(filter-out essential,$(PKG_FLAGS))" > $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.flags + $(PACKAGE_DIR): mkdir -p $@ @@ -257,8 +263,8 @@ dumpinfo: download: prepare: configure: -compile: -install: +compile: prepare-package-install +install: compile clean-staging: FORCE rm -f $(STAMP_INSTALLED) @-(\ |