diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-28 02:18:16 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-28 02:18:16 +0000 |
| commit | e47a8a001c37a32ac2ccd50bb9b6eae1c929fdfa (patch) | |
| tree | 2318d225f10c4b1389ac1b71afa1e19f0c92f173 /target | |
| parent | ceeb9a8013e4416953d7ced30893ff87375a85b9 (diff) | |
| download | upstream-e47a8a001c37a32ac2ccd50bb9b6eae1c929fdfa.tar.gz upstream-e47a8a001c37a32ac2ccd50bb9b6eae1c929fdfa.tar.bz2 upstream-e47a8a001c37a32ac2ccd50bb9b6eae1c929fdfa.zip | |
revert r22372 and r22405, dependency on host libtool causes problems
SVN-Revision: 22406
Diffstat (limited to 'target')
| -rw-r--r-- | target/imagebuilder/files/Makefile | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 2e1e82f866..b72e3f1724 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -52,15 +52,12 @@ help: FORCE # override variables from rules.mk PACKAGE_DIR:=$(TOPDIR)/packages -OPKG:= \ +IPKG:= \ IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \ IPKG_INSTROOT="$(TARGET_DIR)" \ IPKG_CONF_DIR="$(TOPDIR)/tmp" \ IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ - $(STAGING_DIR_HOST)/bin/opkg \ - -f $(TOPDIR)/tmp/opkg.conf \ - --force-depends \ - --force-overwrite + $(SCRIPT_DIR)/ipkg -force-defaults define Profile $(eval $(call Profile/Default)) @@ -82,18 +79,10 @@ _call_info: FORCE echo 'Available Profiles:' echo; $(PROFILE_LIST) -$(TOPDIR)/tmp/opkg.conf: FORCE +$(TOPDIR)/tmp/ipkg.conf: FORCE @mkdir -p $(TOPDIR)/tmp - @mkdir -p $(TARGET_DIR)/tmp @echo 'dest root /' > $@ @echo 'src packages file:$(PACKAGE_DIR)' >> $@ - @echo 'arch all 100' >> $@ - ifneq ($(CONFIG_TARGET_adm5120),y) - @echo 'arch $(BOARD) 200' >> $@ - else - @echo 'arch $(BOARD)_$(ARCH) 200' >> $@ - endif - @echo 'option offline_root $(TARGET_DIR)' >> $@ BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel) # "-pkgname" in the package list means remove "pkgname" from the package list @@ -113,18 +102,18 @@ endif $(MAKE) package_postinst $(MAKE) build_image -package_index: $(TOPDIR)/tmp/opkg.conf FORCE +package_index: $(TOPDIR)/tmp/ipkg.conf FORCE @echo @echo Building package index... (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ gzip -9c Packages > Packages.gz \ ) >/dev/null 2>/dev/null - $(OPKG) update + $(IPKG) update package_install: FORCE @echo @echo Installing packages... - $(OPKG) install $(BUILD_PACKAGES) + $(IPKG) install $(BUILD_PACKAGES) copy_files: FORCE @echo @@ -133,9 +122,6 @@ copy_files: FORCE package_postinst: FORCE @echo - @echo Cleaning up - @rm -f $(TARGET_DIR)/tmp/opkg.lock - @echo @echo Activating init scripts @( \ cd $(TARGET_DIR); \ |