scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets...
authorFelix Fietkau <nbd@openwrt.org>
Fri, 21 Oct 2011 13:03:37 +0000 (13:03 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Fri, 21 Oct 2011 13:03:37 +0000 (13:03 +0000)
SVN-Revision: 28503

scripts/feeds

index 6121a6265f7a7c4b2c1395b592f246f9be1df04f..a9b2eb980a517c9d052d6474324b3f42ffc68d7d 100755 (executable)
@@ -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;