diff options
| author | Ernestas Kulik | 2025-11-12 08:16:30 +0000 |
|---|---|---|
| committer | Christian Marangi | 2025-11-12 11:07:24 +0000 |
| commit | fd7b88447c4a001ae16b5ac4e7d0b595bbfb615e (patch) | |
| tree | f8b5b682c458512a26cb92f173e070f824ccea6f | |
| parent | 6cd22322986235b0b756f7e8646d48129b423f0a (diff) | |
| download | openwrt-fd7b88447c4a001ae16b5ac4e7d0b595bbfb615e.tar.gz | |
scripts: feeds: Don’t hardcode IS_TTY
When building in environments that set IS_TTY, the feeds script does not
honor it and passes a hardcoded value to scan.mk, causing unwanted
control characters to appear in stdout.
This commit addresses the issue by checking IS_TTY and MAKE_TERMOUT
variables and uses their values if defined.
Closes #8039
Signed-off-by: Ernestas Kulik <ernestas.k@iconn-networks.com>
Link: https://github.com/openwrt/openwrt/pull/20743
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit fd7e43d429a370665795fb14c859c046c761e4e9)
| -rwxr-xr-x | scripts/feeds | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/feeds b/scripts/feeds index f0dea6d040..8ce2db455e 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -128,8 +128,14 @@ sub update_index($) -d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1; 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_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); - system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"targetinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"target\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" SCAN_MAKEOPTS=\"TARGET_BUILD=1\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); + + my $is_tty = $ENV{IS_TTY}; + $is_tty = defined $is_tty ? $is_tty : $ENV{MAKE_TERMOUT}; + $is_tty = defined $is_tty ? $is_tty : 1; + + system("$mk -s -f include/scan.mk IS_TTY=$is_tty SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); + system("$mk -s -f include/scan.mk IS_TTY=$is_tty SCAN_TARGET=\"targetinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"target\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" SCAN_MAKEOPTS=\"TARGET_BUILD=1\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); + system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index"); system("ln -sf $name.tmp/.targetinfo ./feeds/$name.targetindex"); |