[openwrt/openwrt] scripts: feeds: Don’t hardcode IS_TTY

LEDE Commits lede-commits at lists.infradead.org
Wed Nov 12 03:06:02 PST 2025


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/fd7e43d429a370665795fb14c859c046c761e4e9

commit fd7e43d429a370665795fb14c859c046c761e4e9
Author: Ernestas Kulik <ernestas.k at iconn-networks.com>
AuthorDate: Wed Nov 12 10:16:30 2025 +0200

    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 at iconn-networks.com>
    Link: https://github.com/openwrt/openwrt/pull/20743
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 scripts/feeds | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/feeds b/scripts/feeds
index 05169b2940..4b01c8b37f 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");
 




More information about the lede-commits mailing list