From: Ross Burton Date: Thu, 6 Aug 2026 16:27:30 +0000 (+0100) Subject: glibc: remove redundant tzselect interpreter option patch X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99e39feb4b89bade0ea03c5163732c860b1f5c9f;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git glibc: remove redundant tzselect interpreter option patch Patch 18 adds an option to replace the interpreter in the tzselect script from /bin/bash to whatever KSHELL is set to. However, patch 19 directly changes the interpreter to /bin/sh so this functionality never works. This is further cleanup based on a previous commit removing the KSHELL assignment[1]. [1] oe-core a9ffb0db9e7 ("glibc: remove obsolete KSHELL assignment") Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/glibc/glibc/0018-timezone-Make-shell-interpreter-overridable-in-tzsel.patch b/meta/recipes-core/glibc/glibc/0018-timezone-Make-shell-interpreter-overridable-in-tzsel.patch deleted file mode 100644 index 46cca50100..0000000000 --- a/meta/recipes-core/glibc/glibc/0018-timezone-Make-shell-interpreter-overridable-in-tzsel.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cd372730f78fd39949b1a0c119f7b2450a6706a8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 9 Dec 2021 15:14:42 -0800 -Subject: [PATCH] timezone: Make shell interpreter overridable in tzselect.ksh - -define new macro called KSHELL which can be used to define default shell -use Bash by default - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - Makeconfig | 9 +++++++++ - timezone/Makefile | 1 + - 2 files changed, 10 insertions(+) - -diff --git a/Makeconfig b/Makeconfig -index e7dbd9fb9e..fd62fdf49b 100644 ---- a/Makeconfig -+++ b/Makeconfig -@@ -309,6 +309,15 @@ ifndef sysincludedir - sysincludedir = /usr/include - endif - -+# The full path name of a Posix-compliant shell, preferably one that supports -+# the Korn shell's 'select' statement as an extension. -+# These days, Bash is the most popular. -+# It should be OK to set this to /bin/sh, on platforms where /bin/sh -+# lacks 'select' or doesn't completely conform to Posix, but /bin/bash -+# is typically nicer if it works. -+ifndef KSHELL -+KSHELL = /bin/bash -+endif - - # Commands to install files. - ifndef INSTALL_DATA -diff --git a/timezone/Makefile b/timezone/Makefile -index ce9abe6cb2..721fb70be4 100644 ---- a/timezone/Makefile -+++ b/timezone/Makefile -@@ -140,6 +140,7 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make - -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ - -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ - -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ -+ -e 's|#!/bin/bash|#!$(KSHELL)|g' \ - < $< > $@.new - chmod 555 $@.new - mv -f $@.new $@ diff --git a/meta/recipes-core/glibc/glibc_2.44.bb b/meta/recipes-core/glibc/glibc_2.44.bb index 42ec8701e6..b4a5fbf8c3 100644 --- a/meta/recipes-core/glibc/glibc_2.44.bb +++ b/meta/recipes-core/glibc/glibc_2.44.bb @@ -53,7 +53,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0015-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ file://0016-Replace-echo-with-printf-builtin-in-nscd-init-script.patch \ file://0017-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch \ - file://0018-timezone-Make-shell-interpreter-overridable-in-tzsel.patch \ file://0019-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \ file://0020-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ file://0021-tests-Skip-2-qemu-tests-that-can-hang-in-oe-selftest.patch \