diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-07-29 11:30:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-07-29 11:30:06 +0000 |
| commit | d030852b98b1913e024c4a57fbfc75ba9b7cbffe (patch) | |
| tree | 201dc84d4cf223dae33e04cc23a092b7fb9acf36 /package | |
| parent | 81d0309b9f38b4883816fa52845cd29e227c0efa (diff) | |
| download | upstream-d030852b98b1913e024c4a57fbfc75ba9b7cbffe.tar.gz upstream-d030852b98b1913e024c4a57fbfc75ba9b7cbffe.tar.bz2 upstream-d030852b98b1913e024c4a57fbfc75ba9b7cbffe.zip | |
add support for per-package prereq checks, run global prereq checks before (menu-)config
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4318 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/Makefile | 9 | ||||
| -rw-r--r-- | package/base-files/Makefile | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/package/Makefile b/package/Makefile index 7a3af2e6f7..629ce88109 100644 --- a/package/Makefile +++ b/package/Makefile @@ -10,13 +10,17 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/.config include $(TOPDIR)/.pkgdeps -SOURCE_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) +PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-y) $(package-m)) +DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) $(STAMP_DIR) $(TARGET_DIR): mkdir -p $@ +%-prereq: $(STAMP_DIR) $(TARGET_DIR) + $(MAKE) -C $(patsubst %-prereq,%,$@) prereq MAKEFLAGS="$(BUILD_MAKEFLAGS)" + %-download: $(STAMP_DIR) $(TARGET_DIR) $(MAKE) -C $(patsubst %-download,%,$@) download MAKEFLAGS="$(BUILD_MAKEFLAGS)" @@ -41,7 +45,8 @@ $(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo all: compile clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) -download: $(SOURCE_PACKAGES) +prereq: $(PREREQ_PACKAGES) +download: $(DOWNLOAD_PACKAGES) compile-targets: $(COMPILE_PACKAGES) compile: $(MAKE) -j$(CONFIG_JLEVEL) compile-targets diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 01ea9674c5..e41e1fd798 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -22,8 +22,8 @@ include $(INCLUDE_DIR)/package.mk ifneq ($(DUMP),1) TARGET:=-$(BOARD)-$(KERNEL) -UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version} -LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version} +UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null} +LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} else UCLIBC_VERSION:=<UCLIBC_VERSION> LIBGCC_VERSION:=<LIBGCC_VERSION> |