[imagebuilder]

- correctly copy .config when scripts/env is used in the buildroot
	- prevent user provides PACKAGES from overriding per-profile defaults


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21213 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Jo-Philipp Wich
2010-04-27 22:16:40 +00:00
parent 262cd87b5b
commit 0d25a79aa1
2 changed files with 20 additions and 9 deletions

View File

@@ -23,9 +23,10 @@ all: compile
$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
rm -rf $(PKG_BUILD_DIR)
mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host $(PKG_BUILD_DIR)/target
-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
$(CP) \
$(INCLUDE_DIR) $(SCRIPT_DIR) \
$(TOPDIR)/rules.mk $(TOPDIR)/.config \
$(TOPDIR)/rules.mk \
./files/Makefile \
$(TMP_DIR)/.targetinfo \
$(TMP_DIR)/.packageinfo \