aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2008-08-22 13:45:54 +0000
committerNicolas Thill <nico@openwrt.org>2008-08-22 13:45:54 +0000
commit54bcffc5e08f2cad6854dbdfaa05d597d1df0a8b (patch)
tree29bc6b76c7f1ad5b94431566f9f3663e0bf99d5c /target
parentd1126692b61daf1f9b882c62d706584a83756e73 (diff)
downloadupstream-54bcffc5e08f2cad6854dbdfaa05d597d1df0a8b.tar.gz
upstream-54bcffc5e08f2cad6854dbdfaa05d597d1df0a8b.tar.bz2
upstream-54bcffc5e08f2cad6854dbdfaa05d597d1df0a8b.zip
fix ImageBuilder (closes: #3863)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12370 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/imagebuilder/Config.in3
-rw-r--r--target/imagebuilder/Makefile3
-rw-r--r--target/imagebuilder/files/Makefile2
3 files changed, 5 insertions, 3 deletions
diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in
index 265ac76e37..64fc4051c9 100644
--- a/target/imagebuilder/Config.in
+++ b/target/imagebuilder/Config.in
@@ -1,8 +1,9 @@
config IB
bool "Build the OpenWrt Image Builder"
depends !TARGET_ROOTFS_INITRAMFS
+ depends !TARGET_uml
depends !PROFILE_KCONFIG
- depends !LINUX_2_6_UML
+ select ALL
help
This is essentially a stripped-down version of the buildroot
with precompiled packages, kernel image and image building tools.
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 8a3ac7fed9..12e391ef90 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -25,12 +25,13 @@ $(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) \
- $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
+ $(INCLUDE_DIR) $(SCRIPT_DIR) \
$(TOPDIR)/rules.mk $(TOPDIR)/.config \
./files/Makefile \
$(TMP_DIR)/.targetinfo \
$(TMP_DIR)/.packageinfo \
$(PKG_BUILD_DIR)/
+ $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages
$(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/
$(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/
$(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 27a6c94f9d..e8bd28f318 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -79,7 +79,7 @@ info: FORCE
$(TOPDIR)/tmp/ipkg.conf: FORCE
@mkdir -p $(TOPDIR)/tmp
@echo 'dest root /' > $@
- @echo 'src packages file:$(TOPDIR)/packages' >> $@
+ @echo 'src packages file:$(PACKAGE_DIR)' >> $@
BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel)
ifeq ($(KERNEL),2.4)