diff options
| author | Nicolas Thill <nico@openwrt.org> | 2008-08-22 13:45:54 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2008-08-22 13:45:54 +0000 |
| commit | be1a9ff41dfeed9e00f165e6a661e26ccaa5549c (patch) | |
| tree | 2a854d5bf3f286d15bfa8fd7af90a5993e29d076 | |
| parent | 7075c9f917a3535451371945c746d9be6b21140f (diff) | |
| download | upstream-be1a9ff41dfeed9e00f165e6a661e26ccaa5549c.tar.gz upstream-be1a9ff41dfeed9e00f165e6a661e26ccaa5549c.tar.bz2 upstream-be1a9ff41dfeed9e00f165e6a661e26ccaa5549c.zip | |
fix ImageBuilder (closes: #3863)
SVN-Revision: 12370
| -rw-r--r-- | target/imagebuilder/Config.in | 3 | ||||
| -rw-r--r-- | target/imagebuilder/Makefile | 3 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 2 |
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) |