diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-10-21 13:03:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-10-21 13:03:37 +0000 |
| commit | e925dbf704f261fb67deaa8a4849d810e44c46c1 (patch) | |
| tree | 3dad66c3432e75941edfd9036f0c6e313541dc41 /scripts/feeds | |
| parent | 0b893424ffc5c5c1562257b765e019c1c0e166bd (diff) | |
| download | master-31e0f0ae-e925dbf704f261fb67deaa8a4849d810e44c46c1.tar.gz master-31e0f0ae-e925dbf704f261fb67deaa8a4849d810e44c46c1.tar.bz2 master-31e0f0ae-e925dbf704f261fb67deaa8a4849d810e44c46c1.zip | |
scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets (based on patch from #10212)
SVN-Revision: 28503
Diffstat (limited to 'scripts/feeds')
| -rwxr-xr-x | scripts/feeds | 4 |
1 files changed, 2 insertions, 2 deletions
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; |