diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-01-14 10:49:00 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-01-14 10:49:00 +0000 |
| commit | f025f34c0daf190106635e7d5767f2b8c1eac402 (patch) | |
| tree | 530ae33d5387081d791ae4e075dddd562a0d58ec | |
| parent | d7b0d6669f916b2399aae0379e8ea83e6e37b460 (diff) | |
include .targetinfo in the image builder, and allow direct calls to the package_index target
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6093 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/imagebuilder/Makefile | 1 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index f09bdbd2c2..439a103428 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -25,6 +25,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: FORCE $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \ $(TOPDIR)/rules.mk $(TOPDIR)/.config \ $(TMP_DIR)/.target.mk \ + $(TMP_DIR)/.targetinfo \ ./files/Makefile \ $(IB_BUILD_DIR)/ $(CP) $(STAGING_DIR)/bin/* $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 720bcfa768..d4bcdf5fa9 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -88,7 +88,7 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel) BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES)) -image: $(TOPDIR)/tmp/ipkg.conf +image: if [ -z "$($(PROFILE)_NAME)" ]; then \ echo Profile $(PROFILE) not found.; \ echo 'Use "make info" to get a list of available target profiles'; \ @@ -107,7 +107,7 @@ endif $(MAKE) package_postinst $(MAKE) build_image -package_index: FORCE +package_index: $(TOPDIR)/tmp/ipkg.conf FORCE @echo @echo Building package index... (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) >/dev/null 2>/dev/null |