From 5d30bf83039aa1089e70d8c80b6ad03ba92bfc2a Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 22 Jul 2016 12:10:17 +0200
Subject: build: rework opkg command invocation

Drop included $(XARGS), add support for passing target dir via parameter

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 package/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/Makefile b/package/Makefile
index 857c2ebe38..87dfe68e06 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -48,11 +48,16 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install
 	- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
 	rm -rf $(TARGET_DIR)
 	[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
-	@echo $(wildcard $(foreach dir,$(PACKAGE_SUBDIRS),$(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(dir)/$(pkg)_*.ipk))) | $(OPKG) install
+	$(call opkg,$(TARGET_DIR)) install \
+		$(wildcard \
+		  $(foreach dir,$(PACKAGE_SUBDIRS), \
+		    $(foreach pkg, \
+		      $(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null), \
+		      $(dir)/$(pkg)_*.ipk)))
 	@for file in $(PACKAGE_INSTALL_FILES); do \
 		[ -s $$file.flags ] || continue; \
 		for flag in `cat $$file.flags`; do \
-			$(OPKG) flag $$flag < $$file; \
+			$(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \
 		done; \
 	done || true
 	@-$(MAKE) package/preconfig
-- 
cgit v1.2.3