summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/package-ipkg.mk20
-rw-r--r--target/imagebuilder/files/Makefile26
2 files changed, 33 insertions, 13 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 34e409182..ef0720de7 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -6,12 +6,15 @@
#
# where to build (and put) .ipk packages
-IPKG:= \
+OPKG:= \
IPKG_TMP=$(TMP_DIR)/ipkg \
IPKG_INSTROOT=$(TARGET_DIR) \
IPKG_CONF_DIR=$(STAGING_DIR)/etc \
IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
- $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+ $(STAGING_DIR_HOST)/bin/opkg \
+ -f $(STAGING_DIR)/etc/opkg.conf \
+ --force-depends \
+ --force-overwrite
# invoke ipkg-build with some default options
IPKG_BUILD:= \
@@ -76,7 +79,7 @@ ifeq ($(DUMP),)
rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
touch $$@
- $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)
+ $$(IPKG_$(1)): $(STAGING_DIR)/etc/opkg.conf $(STAMP_BUILT)
@rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1))
mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL
$(call Package/$(1)/install,$$(IDIR_$(1)))
@@ -108,7 +111,8 @@ ifeq ($(DUMP),)
@[ -f $$(IPKG_$(1)) ]
$$(INFO_$(1)): $$(IPKG_$(1))
- $(IPKG) install $$(IPKG_$(1))
+ @[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
+ $(OPKG) install $$(IPKG_$(1))
$(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_*
@@ -117,9 +121,11 @@ ifeq ($(DUMP),)
endef
- $(STAGING_DIR)/etc/ipkg.conf:
+ $(STAGING_DIR)/etc/opkg.conf:
mkdir -p $(STAGING_DIR)/etc
- echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
- echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
+ ( echo "dest root /" > $@; \
+ echo "arch all 100" >> $@; \
+ echo "arch $(PKGARCH) 200" >> $@; \
+ echo "option offline_root $(TARGET_DIR)" >> $@ )
endif
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index b72e3f172..bcdcf03de 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -52,12 +52,15 @@ help: FORCE
# override variables from rules.mk
PACKAGE_DIR:=$(TOPDIR)/packages
-IPKG:= \
+OPKG:= \
IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \
IPKG_INSTROOT="$(TARGET_DIR)" \
IPKG_CONF_DIR="$(TOPDIR)/tmp" \
IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \
- $(SCRIPT_DIR)/ipkg -force-defaults
+ $(STAGING_DIR_HOST)/bin/opkg \
+ -f $(TOPDIR)/tmp/opkg.conf \
+ --force-depends \
+ --force-overwrite
define Profile
$(eval $(call Profile/Default))
@@ -79,10 +82,18 @@ _call_info: FORCE
echo 'Available Profiles:'
echo; $(PROFILE_LIST)
-$(TOPDIR)/tmp/ipkg.conf: FORCE
+$(TOPDIR)/tmp/opkg.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
@@ -102,18 +113,18 @@ endif
$(MAKE) package_postinst
$(MAKE) build_image
-package_index: $(TOPDIR)/tmp/ipkg.conf FORCE
+package_index: $(TOPDIR)/tmp/opkg.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
- $(IPKG) update
+ $(OPKG) update
package_install: FORCE
@echo
@echo Installing packages...
- $(IPKG) install $(BUILD_PACKAGES)
+ $(OPKG) install $(BUILD_PACKAGES)
copy_files: FORCE
@echo
@@ -122,6 +133,9 @@ 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); \