X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Frootfs.mk;h=f3ba33a2be03a5e7a09c0cee6b1f0bcf7b216dac;hb=4fd043b95b4f1817b00a431f7c1c0836c39d8559;hp=ac8f04da9cfa2500dff7f712c5f1acf3a3669638;hpb=7dffc32ffa11069bb5c5e38e6f891c5052a3d488;p=librecmc%2Flibrecmc.git

diff --git a/include/rootfs.mk b/include/rootfs.mk
index ac8f04da9c..f3ba33a2be 100644
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -34,14 +34,12 @@ ifdef CONFIG_USE_MKLIBS
 endif
 
 # where to build (and put) .ipk packages
-OPKG:= \
+opkg = \
   IPKG_NO_SCRIPT=1 \
-  IPKG_TMP=$(TMP_DIR)/ipkg \
-  IPKG_INSTROOT=$(TARGET_DIR) \
-  IPKG_CONF_DIR=$(STAGING_DIR)/etc \
-  IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
-  $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
-	--offline-root $(TARGET_DIR) \
+  IPKG_INSTROOT=$(1) \
+  TMPDIR=$(1)/tmp \
+  $(STAGING_DIR_HOST)/bin/opkg \
+	--offline-root $(1) \
 	--force-depends \
 	--force-overwrite \
 	--force-postinstall \
@@ -50,6 +48,9 @@ OPKG:= \
 	--add-arch all:100 \
 	--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
 
+opkg_package_files = $(wildcard \
+	$(foreach dir,$(PACKAGE_SUBDIRS), \
+	  $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
 
 define prepare_rootfs
 	@if [ -d $(TOPDIR)/files ]; then \