fix ImageBuilder (closes: #3863)

SVN-Revision: 12370
This commit is contained in:
Nicolas Thill 2008-08-22 13:45:54 +00:00
parent 7075c9f917
commit be1a9ff41d
3 changed files with 5 additions and 3 deletions

View File

@ -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.

View File

@ -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/

View File

@ -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)