diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-27 22:16:40 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-27 22:16:40 +0000 |
| commit | a6a5ceb103c8d7ac7036729984a91e93195c4d0c (patch) | |
| tree | 7370962bcf1893f749781fa84e023ffabe058420 /target/imagebuilder/Makefile | |
| parent | bae26fa12128b602edd15a6d3942cb069d3305d6 (diff) | |
[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
Diffstat (limited to 'target/imagebuilder/Makefile')
| -rw-r--r-- | target/imagebuilder/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index e0b64ead4..42fb7bb69 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 \ |