Skip to contentSkip to conversation

tcl: disable 'zipfs' feature

PATCH New Alexander Kanavin 1 participant 3 messages Jan 22, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 tcl: disable 'zipfs' feature

From: Alexander Kanavin <[email protected]>

zipfs is a new facility in tcl 9.x where various data files are bundled into a zip archive, rather being separately installed.

Then that zip is embedded into libtcl.so from Makefile, thusly:

cat ${TCL_ZIP_FILE} >> ${LIB_FILE}

This is a major case of face meeting palm: any binary object processing on the resulting .so file discards the extra data at the end, and that's exactly what happens in do_package(), resulting in a tcl installation without any language libraries. This is not caught by ptest because it runs against a private copy of the source tree.

Additionally, it helps to have data files on target systems as files that can be viewed and edited.

---
 meta/recipes-devtools/tcltk/tcl_9.0.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/tcltk/tcl_9.0.1.bb +1 -1
index 0ba7288a600..485b293768d 100644
@@ -37,7 +37,7 @@ inherit autotools ptest binconfig
 AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
 EXTRA_AUTORECONF = "--exclude=aclocal"
 
-EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9"
+EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9 --disable-zipfs"
 
 # Prevent installing copy of tzdata based on tzdata installation on the build host
 # It doesn't install tzdata if one of the following files exist on the host:
Signature · 1 line
2.39.5
#1 lore raw

PATCH 2/3 tcl8: add a patch to address Y2038 issues (tcl 9.x doesn't need it)

From: Alexander Kanavin <[email protected]>

---
 ...e-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch | 33 +++++++++++++++++++
 meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb   |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch
meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch new file +33 -0
new file mode 100644
index 00000000000..18599928385
@@ -0,0 +1,33 @@
+From ff508f2e6786df697876140f21855ecb92a3ed36 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 18 Aug 2023 12:25:11 +0200
+Subject: [PATCH] generic/tcl.h: use Tcl_WideInt for seconds in Tcl_Time
+
+This ensures the value will not overflow, particularly on 32 bit systems
+in 2038, where long will.
+
+This patch was proposed at https://core.tcl-lang.org/tcl/tktview/86dd172271
+Upstream was generally supportive of the fix, but they merged a much more
+elaborate version of it for tcl 9.x (released in 9.0.0), and declined
+to merge it into 8.x due to ABI breakage (sadly this change is in a public header).
+But we can carry the fix downstream.
+
+Upstream-Status: Inappropriate [see above]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ generic/tcl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generic/tcl.h b/generic/tcl.h
+index 3a4622e..6204c57 100644
+--- a/generic/tcl.h
++++ b/generic/tcl.h
+@@ -1418,7 +1418,7 @@ typedef enum {
+  */
+ 
+ typedef struct Tcl_Time {
+-    long sec;			/* Seconds. */
++    Tcl_WideInt sec;			/* Seconds. */
+     long usec;			/* Microseconds. */
+ } Tcl_Time;
+ 
meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb +1 -0
index c8f4b5df2aa..076bbc906c4 100644
@@ -23,6 +23,7 @@ SRC_URI = "${BASE_SRC_URI} \
            file://alter-includedir.patch \
            file://interp.patch \
            file://run-ptest \
+           file://0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch \
            "
 SRC_URI[sha256sum] = "3b371386a9a928eecdbf263bcab7d6a531e620ca3fbab4fdeeb3d6a9a56f38e9"
 
Signature · 1 line
2.39.5
#2 lore raw

PATCH 3/3 selftest/virgl: add a link to RHEL merge request to address the missing vgem module

In reply to Alexander Kanavin

From: Alexander Kanavin <[email protected]>

---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 2 ++
 1 file changed, 2 insertions(+)
meta/lib/oeqa/selftest/cases/runtime_test.py +2 -0
index 27090ae5cd9..4843d810a20 100644
@@ -273,6 +273,8 @@ TEST_RUNQEMUPARAMS += " slirp"
         import subprocess, os
 
         distro = oe.lsb.distro_identifier()
+        # Merge request to address the issue on centos/rhel/derivatives:
+        # https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3449
         if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'centos-9', 'ubuntu-16.04', 'ubuntu-18.04'] or
             distro.startswith('almalinux') or distro.startswith('rocky')):
             self.skipTest('virgl headless cannot be tested with %s' %(distro))
Signature · 1 line
2.39.5