mirror of https://github.com/hak5/openwrt-owl.git
scripts/feeds: override the OPENWRT_BUILD variable when calling internal targets (based on patch from #10212)
SVN-Revision: 28503owl
parent
0b893424ff
commit
e925dbf704
|
@ -94,7 +94,7 @@ sub update_index($)
|
||||||
-d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
|
-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;
|
-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("$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");
|
system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
|
||||||
|
|
||||||
|
@ -185,7 +185,7 @@ sub get_feed($) {
|
||||||
}
|
}
|
||||||
|
|
||||||
sub get_installed() {
|
sub get_installed() {
|
||||||
system("$mk -s prepare-tmpinfo");
|
system("$mk -s prepare-tmpinfo OPENWRT_BUILD=");
|
||||||
clear_packages();
|
clear_packages();
|
||||||
parse_package_metadata("./tmp/.packageinfo");
|
parse_package_metadata("./tmp/.packageinfo");
|
||||||
%installed = %package;
|
%installed = %package;
|
||||||
|
|
Loading…
Reference in New Issue