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 | f7606791e336896c5be4df1db9822798b352a050 (patch) | |
| tree | 9b6e5c4475b18a18c1c201376e027bd1f96d4176 | |
| parent | 9f07a903e8c781d00eaa913e642dc059812a2b32 (diff) | |
| download | master-187ad058-f7606791e336896c5be4df1db9822798b352a050.tar.gz master-187ad058-f7606791e336896c5be4df1db9822798b352a050.tar.bz2 master-187ad058-f7606791e336896c5be4df1db9822798b352a050.zip | |
scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets (based on patch from #10212)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28503 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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; |