From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: wangmy@fujitsu.com, openembedded-core@lists.openembedded.org
Cc: Wang Mingyu <wangmy@cn.fujitsu.com>
Subject: Re: [OE-core] [PATCH 21/21] tcl8: upgrade 8.6.15 -> 8.6.16
Date: Tue, 17 Dec 2024 23:11:11 +0000 [thread overview]
Message-ID: <183d6d19f6075d3bce1c0d1bd1705b35265e7e80.camel@linuxfoundation.org> (raw)
In-Reply-To: <1734425887-18069-21-git-send-email-wangmy@fujitsu.com>
On Tue, 2024-12-17 at 16:58 +0800, wangmy via lists.openembedded.org wrote:
> From: Wang Mingyu <wangmy@cn.fujitsu.com>
>
> alter-includedir.patch
> interp.patch
> tcl-add-soname.patch
> tcl-remove-hardcoded-install-path.patch
> refreshed for 8.6.16
>
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
> .../tcltk8/tcl8/alter-includedir.patch | 10 +++++-----
> meta/recipes-devtools/tcltk8/tcl8/interp.patch | 6 +++---
> meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch | 8 ++++----
> .../tcl8/tcl-remove-hardcoded-install-path.patch | 6 +++---
> .../tcltk8/{tcl8_8.6.15.bb => tcl8_8.6.16.bb} | 2 +-
> 5 files changed, 16 insertions(+), 16 deletions(-)
> rename meta/recipes-devtools/tcltk8/{tcl8_8.6.15.bb => tcl8_8.6.16.bb} (98%)
>
> diff --git a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
> index bfc718cfd3..c5005cb4a8 100644
> --- a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
> +++ b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
> @@ -1,4 +1,4 @@
> -From 3130dca60636dc12d0d12df75b002fd123349e21 Mon Sep 17 00:00:00 2001
> +From ca538ba69b808b4e68ddcbea89a22f68ef4e4b4f Mon Sep 17 00:00:00 2001
> From: Mingli Yu <mingli.yu@windriver.com>
> Date: Tue, 22 Nov 2022 18:48:27 +0800
> Subject: [PATCH] tcl: update the header location
> @@ -26,7 +26,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/unix/Makefile.in b/unix/Makefile.in
> -index a3b7d69..969ddb8 100644
> +index c3b75e3..60ed93e 100644
> --- a/unix/Makefile.in
> +++ b/unix/Makefile.in
> @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
> @@ -39,10 +39,10 @@ index a3b7d69..969ddb8 100644
> # Path to the private tcl header dir:
> PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
> diff --git a/unix/configure.in b/unix/configure.in
> -index 4974fb6..a72934f 100644
> +index 8e6726b..2345689 100644
> --- a/unix/configure.in
> +++ b/unix/configure.in
> -@@ -776,7 +776,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
> +@@ -775,7 +775,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
> eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
>
> test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
> @@ -51,7 +51,7 @@ index 4974fb6..a72934f 100644
> HTML_DIR='$(DISTDIR)/html'
>
> # Note: in the following variable, it's important to use the absolute
> -@@ -897,7 +897,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
> +@@ -898,7 +898,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
> TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
>
> # Install time header dir can be set via --includedir
> diff --git a/meta/recipes-devtools/tcltk8/tcl8/interp.patch b/meta/recipes-devtools/tcltk8/tcl8/interp.patch
> index 2e0dc94cff..d5d2b1821b 100644
> --- a/meta/recipes-devtools/tcltk8/tcl8/interp.patch
> +++ b/meta/recipes-devtools/tcltk8/tcl8/interp.patch
> @@ -1,4 +1,4 @@
> -From 426aa2ff62dda77fd011e8f630b9d4ea17984817 Mon Sep 17 00:00:00 2001
> +From d17505bf4630d9c432e897b5b3abb2a28f56f57a Mon Sep 17 00:00:00 2001
> From: Ross Burton <ross.burton@arm.com>
> Date: Mon, 12 Jul 2021 14:50:13 +0100
> Subject: [PATCH] tcl: fix race in interp.test
> @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tests/interp.test b/tests/interp.test
> -index d742484..fc90990 100644
> +index 24ffb1b..c6460ad 100644
> --- a/tests/interp.test
> +++ b/tests/interp.test
> -@@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
> +@@ -3614,17 +3614,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
> variable result
> set result [lindex $args 0]
> }
> diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
> index 1cd4d76283..057a08dee4 100644
> --- a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
> +++ b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
> @@ -1,4 +1,4 @@
> -From b89fd73daf9b3eb2f889f65baba5f90d8a930c82 Mon Sep 17 00:00:00 2001
> +From cbb5200cb2bb1d40a0535213630f689040ac7f76 Mon Sep 17 00:00:00 2001
> From: Richard Purdie <rpurdie@linux.intel.com>
> Date: Wed, 9 Dec 2009 23:59:44 +0000
> Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function
> @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/unix/Makefile.in b/unix/Makefile.in
> -index 7619afc..9dd053d 100644
> +index bc743b3..a2f9e21 100644
> --- a/unix/Makefile.in
> +++ b/unix/Makefile.in
> -@@ -904,7 +904,10 @@ install-binaries: binaries
> +@@ -812,7 +812,10 @@ install-binaries: binaries
> done
> @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
> @@INSTALL_LIB@
> @@ -27,7 +27,7 @@ index 7619afc..9dd053d 100644
> @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
> @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
> diff --git a/unix/tcl.m4 b/unix/tcl.m4
> -index 0307a06..37c4d67 100644
> +index 7f5464e..cd8d929 100644
> --- a/unix/tcl.m4
> +++ b/unix/tcl.m4
> @@ -1378,6 +1378,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
> diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
> index 93e7877256..c589612963 100644
> --- a/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
> +++ b/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
> @@ -1,4 +1,4 @@
> -From 050fc597fbfa4da2c31bd0df58c871892a490470 Mon Sep 17 00:00:00 2001
> +From 574bc39a9e900870a1311148abf87830a943894c Mon Sep 17 00:00:00 2001
> From: "Song.Li" <Song.Li@windriver.com>
> Date: Wed, 1 Aug 2012 19:05:51 +0800
> Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target
> @@ -17,10 +17,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/unix/configure.in b/unix/configure.in
> -index 4f62510..4974fb6 100644
> +index e88ec3c..8e6726b 100644
> --- a/unix/configure.in
> +++ b/unix/configure.in
> -@@ -775,7 +775,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
> +@@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
>
> eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
>
> diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb b/meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb
> similarity index 98%
> rename from meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb
> rename to meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb
> index 928124148c..2f2b0c7db9 100644
> --- a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb
> +++ b/meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb
> @@ -24,7 +24,7 @@ SRC_URI = "${BASE_SRC_URI} \
> file://interp.patch \
> file://run-ptest \
> "
> -SRC_URI[sha256sum] = "844775491e435e34d83d6ccfbadd1342f1855f1705253233a86152df0765e78d"
> +SRC_URI[sha256sum] = "3b371386a9a928eecdbf263bcab7d6a531e620ca3fbab4fdeeb3d6a9a56f38e9"
>
> SRC_URI:class-native = "${BASE_SRC_URI}"
This appears to cause ptest failures unfortunately:
https://valkyrie.yoctoproject.org/#/builders/61/builds/607/steps/12/logs/stdio
https://valkyrie.yoctoproject.org/#/builders/73/builds/608/steps/12/logs/stdio
Cheers,
Richard
prev parent reply other threads:[~2024-12-17 23:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-17 8:57 [OE-core] [PATCH 01/21] appstream: upgrade 1.0.3 -> 1.0.4 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 02/21] bind: upgrade 9.20.3 -> 9.20.4 wangmy
2024-12-17 17:00 ` Alexander Kanavin
2024-12-17 8:57 ` [OE-core] [PATCH 03/21] boost: upgrade 1.86.0 -> 1.87.0 wangmy
2024-12-17 21:54 ` Richard Purdie
2024-12-17 8:57 ` [OE-core] [PATCH 04/21] erofs-utils: upgrade 1.8.2 -> 1.8.3 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 05/21] igt-gpu-tools: upgrade 1.29 -> 1.30 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 06/21] json-glib: upgrade 1.10.0 -> 1.10.6 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 07/21] libice: upgrade 1.1.1 -> 1.1.2 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 08/21] libjitterentropy: upgrade 3.6.0 -> 3.6.1 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 09/21] libsm: upgrade 1.2.4 -> 1.2.5 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 10/21] libxau: upgrade 1.0.11 -> 1.0.12 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 11/21] libxcvt: upgrade 0.1.2 -> 0.1.3 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 12/21] libxrender: upgrade 0.9.11 -> 0.9.12 wangmy
2024-12-17 8:57 ` [OE-core] [PATCH 13/21] libxv: upgrade 1.0.12 -> 1.0.13 wangmy
2024-12-17 8:58 ` [OE-core] [PATCH 14/21] libxxf86vm: upgrade 1.1.5 -> 1.1.6 wangmy
2024-12-17 8:58 ` [OE-core] [PATCH 15/21] mpg123: upgrade 1.32.9 -> 1.32.10 wangmy
2024-12-17 8:58 ` [OE-core] [PATCH 16/21] nfs-utils: upgrade 2.8.1 -> 2.8.2 wangmy
2024-12-18 23:15 ` Khem Raj
2024-12-17 8:58 ` [OE-core] [PATCH 17/21] ofono: upgrade 2.13 -> 2.14 wangmy
2024-12-17 8:58 ` [OE-core] [PATCH 18/21] pango: upgrade 1.55.0 -> 1.55.5 wangmy
2024-12-17 8:58 ` [OE-core] [PATCH 19/21] re2c: upgrade 4.0.1 -> 4.0.2 wangmy
2024-12-17 8:58 ` [OE-core] [PATCH 20/21] socat: upgrade 1.8.0.1 -> 1.8.0.2 wangmy
2024-12-17 8:58 ` [OE-core] [PATCH 21/21] tcl8: upgrade 8.6.15 -> 8.6.16 wangmy
2024-12-17 23:11 ` Richard Purdie [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=183d6d19f6075d3bce1c0d1bd1705b35265e7e80.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
--cc=wangmy@cn.fujitsu.com \
--cc=wangmy@fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox