diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-27 22:16:40 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-04-27 22:16:40 +0000 |
| commit | cdd44e7984e86ef62b87229700533f571a1d9dff (patch) | |
| tree | a133c7f78d4c674409a51e05030a314bf82b05be /target/imagebuilder/Makefile | |
| parent | ea5b74da62083484cfa4bacfb6b478701217a3ec (diff) | |
| download | master-31e0f0ae-cdd44e7984e86ef62b87229700533f571a1d9dff.tar.gz master-31e0f0ae-cdd44e7984e86ef62b87229700533f571a1d9dff.tar.bz2 master-31e0f0ae-cdd44e7984e86ef62b87229700533f571a1d9dff.zip | |
- correctly copy .config when scripts/env is used in the buildroot - prevent user provides PACKAGES from overriding per-profile defaults
SVN-Revision: 21213
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 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 \ |