From 0d25a79aa1c5cd44c01deddcdd16e8a2fd0dccb6 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 27 Apr 2010 22:16:40 +0000 Subject: [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 --- target/imagebuilder/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target/imagebuilder/Makefile') diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index e0b64ead47..42fb7bb69b 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -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 \ -- cgit v1.2.3