From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 21 Oct 2011 13:03:37 +0000 (+0000)
Subject: scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets... 
X-Git-Tag: reboot~15819
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e925dbf704f261fb67deaa8a4849d810e44c46c1;p=oweals%2Fopenwrt.git

scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets (based on patch from #10212)

SVN-Revision: 28503
---

diff --git a/scripts/feeds b/scripts/feeds
index 6121a6265f..a9b2eb980a 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -94,7 +94,7 @@ sub update_index($)
 	-d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
 	-d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1;
 
-	system("$mk -s prepare-mk TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+	system("$mk -s prepare-mk OPENWRT_BUILD= TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
 	system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
 	system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
 
@@ -185,7 +185,7 @@ sub get_feed($) {
 }
 
 sub get_installed() {
-	system("$mk -s prepare-tmpinfo");
+	system("$mk -s prepare-tmpinfo OPENWRT_BUILD=");
 	clear_packages();
 	parse_package_metadata("./tmp/.packageinfo");
 	%installed = %package;