From patchwork Wed Jan 8 08:42:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55193 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98B7FE77199 for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web10.14214.1736325751935123699 for ; Wed, 08 Jan 2025 00:42:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HiOCGQmm; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-ab2b72fb3c9so51966466b.0 for ; Wed, 08 Jan 2025 00:42:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325750; x=1736930550; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rkeCj8uH+ODVV6U7z0Ub3ROhLCEfUihH+0Z6zzOW3KE=; b=HiOCGQmmyb3Jv51Z2z9udkScGgVr0uKkilnqes/GBwXxWOdrlCH45L+xhjxATD+sMc lHi4SQEwAE2zP6EodtDh8R3izzTxbGZ2dkMxSvcYOtlAC14xeL2NG8Q8NHy4JkWKw/GZ D89wwFOpp2oSZIwxZnJ9dBMZI82EzcdeeuYkp6IkWq6bP+RnsWqNH53KhHIELn0ySIQs 5MQ3LplQO39y5jwlD2GYnQy7ifKQSz4fG7nd88GB9KYGM8yNPjgzjeOa/j27IqC+IqWh cdFt2t1+GhPgcTpnW512bcV/9PKDXJWDaNpHnnNrXe4S6JHGUraZSlfDhcq9F5xv4wcz OvjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325750; x=1736930550; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rkeCj8uH+ODVV6U7z0Ub3ROhLCEfUihH+0Z6zzOW3KE=; b=pkqX2tqu56y/mPuF/4iAV0lyhSLbluc9RohdMGaILTqK/+2HdmucthhzF+eK+4wl4X WKp6JT+ihrRo6omDgvDy9RDW+EdotR752ACWtp9Fs44V0D3qy6aODM4dBnHQkCafBTPL FBtqjaIKk0Q/4qNcZPHuewYl9GaK/sD3k2KqmgRHPdkPAxPRLi1KY7YnrC0hpzUSwNAa wGLGgO1yoNV/27tUCh0V3Tg38vsdVt6ALO11yWOLyf4DQWjGw7PnwFYRIENJkwtcJS6O NFfMoFBd6Gl1NawS7ZUTrR09PD72nOvXlOCdergaP1Zk6H0VPnHz3OhskDTnNIDVt6rl xx+Q== X-Gm-Message-State: AOJu0YyBNJI7DaEMD1IOe0ClRVapFrasBdamOKirUyL8thD33VHPrXhF bSWRF7Jllu2Xw+gi/XpZFbWrJ8pVp1nVLYGcY/9ghP8kPqb9/gkuZ3vTow== X-Gm-Gg: ASbGnctATk2US76K27m5Nexnq/3c3UdfmlqG95PginwUQXVKcm+1gie8QbWMNnKKBa5 dbR/jljW4TiRducZpl+2mqp7mwbOQnnvoS5Mp0+FgKWC9mGNdD6HkvYgHg9HOZ+JGnOLG7VrwqB fbBxp+e9Y27temm/ifTjZMAYHKPsFp2EYKbBhXy8AAqXNri5HF9DAQOpXhBEna4ttUSKY1zo/y1 ios0kjLWFx5UOTqIdg2ttwiCB7AKrB1Y3w/Zo3hckcKl5TcDdapzsi5jRIe5X1YqvJHwgEgXjL8 vwJ0UiHQycq2h9pNGg== X-Google-Smtp-Source: AGHT+IH6d/+qTRLwHfplfmFIHiI1DlgaVRnprJmPGoF2yvWhzYyimZLWDOiMxA6oFlXgNpVFbHJYug== X-Received: by 2002:a17:907:97cf:b0:aa6:75f4:20df with SMTP id a640c23a62f3a-ab2905017b0mr455256666b.9.1736325749997; Wed, 08 Jan 2025 00:42:29 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:29 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/20] ppp: update 2.5.1 -> 2.5.2 Date: Wed, 8 Jan 2025 09:42:07 +0100 Message-Id: <20250108084226.117178-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209523 From: Alexander Kanavin License-Update: BSD items clarified to be 2-clause: https://github.com/ppp-project/ppp/commit/d4ec06ec5839350bd728da0e92a8cb2e1c37d880 passprompt plugin removed upstream. Add an enable a multilink option, as the build breaks without it at the linking step (upstream presumably didn't test that it works): https://github.com/ppp-project/ppp/issues/541 Signed-off-by: Alexander Kanavin --- .../ppp/{ppp_2.5.1.bb => ppp_2.5.2.bb} | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) rename meta/recipes-connectivity/ppp/{ppp_2.5.1.bb => ppp_2.5.2.bb} (88%) diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.1.bb b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb similarity index 88% rename from meta/recipes-connectivity/ppp/ppp_2.5.1.bb rename to meta/recipes-connectivity/ppp/ppp_2.5.2.bb index 89c9789b870..9ea99cc15a3 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.1.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb @@ -5,11 +5,11 @@ SECTION = "console/network" HOMEPAGE = "http://samba.org/ppp/" BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" DEPENDS = "libpcap virtual/crypt" -LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD & MIT" -LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=1bea10e81fc6f2df105b1f8b733cb149 \ - file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ +LICENSE = "BSD-2-Clause & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD & MIT" +LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=25;md5=f0463bd67ae70535c709fca554089bd8 \ file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ - file://chat/chat.c;beginline=1;endline=1;md5=234d7d4edd08962c0144e4604050e0b6" + file://chat/chat.c;beginline=1;endline=1;md5=234d7d4edd08962c0144e4604050e0b6 \ + " SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://pon \ @@ -25,13 +25,14 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://ppp@.service \ " -SRC_URI[sha256sum] = "733b7f5840b613da4eab0429a5081293275f06ba8b528e1b8eea6964faf0243a" +SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" inherit autotools pkgconfig systemd -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl" +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl multilink" PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam" PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl" +PACKAGECONFIG[multilink] = "--enable-multilink,--disable-multilink" do_install:append () { mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d From patchwork Wed Jan 8 08:42:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55200 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1C29C02181 for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web11.14676.1736325752650772356 for ; Wed, 08 Jan 2025 00:42:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GJ+C9vDA; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5d437235769so9570812a12.2 for ; Wed, 08 Jan 2025 00:42:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325751; x=1736930551; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ed8aY29KxnSvadn9u2HIINO+vTItfQ1qfJ65aHFX6rg=; b=GJ+C9vDA248CB7z3HvZi5GM+IQwynX2VxtwCck25HnxQIKRZAG4XiUdly5mPiIl4EQ 1zZR3cTQwrRYOIA5cha3jHQYx9b8cC27ZFee8EgoZi4j/rMRWpzdSBz4JTgoKUtjT8ru nFD37MUOv7hVeed88tNIAFIe/YhMIN200XjF1lubfWOQ+MYX1gRrU8OSBroCEPa0ELG3 vYtHj7eff9zEb5ot6EUo7LdaAvKuSgr8CktLWutZ0u1M7tOIXUTSsGkuB1gw6GN6BFzT W24ekRXzpe4i0bRV3tVfuF3z0Y5naCcIG1ZrLADcUniFitOy5+0QcOxWnTKyP9uLLzIV vG7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325751; x=1736930551; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ed8aY29KxnSvadn9u2HIINO+vTItfQ1qfJ65aHFX6rg=; b=Z68ZENdAkLaOg6S4L0gdHpaotfRxIy4vUWlb0yYs7hgAFDbpI/+4Rv5BJHrGzBm1So CaekfbibDRvnbq8OUhOqMifiUc8/xr03C0NPG5SX7O+SzaXQ2mJ1JCMxmjWom3klHtTH AOU47+65nd2v/7s/xG6gbmk754XqlpKsj4E6+4kSXVN6hH7U9gqUj3r9q+Pyjz/r3BZZ qzeK6WSZvZw2rBiYzXVp4KU6X3TTm4jXV2BAM0fs4aKpIsoKlPHf3k79IsrKMNFQjtCa YeZEigUHJA5LoWAfKNJ1wLEheywJ5Og1WasqJj1AespOZdjH7/zlK15ckCr6bks3+eRb 6h7Q== X-Gm-Message-State: AOJu0Yy8rKTeh2eUzdsu1nw9uZ3liVkGCODbteu8X7lMH0SqmxMxLpDW D5C/g1THzgw7XpwDP/+KrgU9n1CXqcjkmJtyjf24KL8aBU/JFnz7zHZY+g== X-Gm-Gg: ASbGncuCMIkWhQZzIxkuswfgf9t0W3b7UO3M3TUTGZdcfNsmAXVTkV1OLlBkc1QDARG xrbotGRa5NLEE/6w9T8sUr+tXwoaANq/9s9uPrKKDvKWprr9RoZ6yBA/skh044/WegG9HZUIX6Y qthE7OGIHCL30K9r3vmhwywTTpjDgR8deLTBwPx6PtqHwUTlTeOwvZAVrMSMRhlQ3gsxq320jM9 7Dy7Qr6Il8qWo1ltNSdljwj+iZgQR8lb2f+7U3AcTXgtBKdQwuN1UmvNHarIcyss4R9Z2TZp0vB Ar0fP1uOwvGGLco2Mg== X-Google-Smtp-Source: AGHT+IFb71or/rK4e/G0A+ULA3myXIKB99YJrNyGlU+Ud8WM/IKIpb4pCoL3jj/0c3w47UJ7TMVWnw== X-Received: by 2002:a17:907:60cf:b0:aa6:8b38:52a3 with SMTP id a640c23a62f3a-ab2abcb07e9mr124477066b.50.1736325750694; Wed, 08 Jan 2025 00:42:30 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:30 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/20] dbus: update 1.14.10 -> 1.16.0 Date: Wed, 8 Jan 2025 09:42:08 +0100 Message-Id: <20250108084226.117178-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209524 From: Alexander Kanavin Convert from autotools to meson. Drop tmpdir.patch (replaced by -Dtest_socket_dir=/tmp --Dsession_socket_dir=/tmp). License-Update: license texts split into separate files, SPDX ids added. Signed-off-by: Alexander Kanavin --- meta/recipes-core/dbus/dbus/tmpdir.patch | 44 -------------- .../dbus/{dbus_1.14.10.bb => dbus_1.16.0.bb} | 59 +++++++++---------- 2 files changed, 27 insertions(+), 76 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus/tmpdir.patch rename meta/recipes-core/dbus/{dbus_1.14.10.bb => dbus_1.16.0.bb} (77%) diff --git a/meta/recipes-core/dbus/dbus/tmpdir.patch b/meta/recipes-core/dbus/dbus/tmpdir.patch deleted file mode 100644 index bf086e17887..00000000000 --- a/meta/recipes-core/dbus/dbus/tmpdir.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Thu, 23 Jun 2011 13:52:09 +0200 -Subject: [PATCH] buildsys: hardcode socketdir to /tmp - -the TMPDIR env var isn't always pointing to the right target path - -Upstream-Status: Inappropriate [embedded] - -Signed-off-by: Koen Kooi - -Original comment: - - avoid to check tmp dir at build time. instead uses hard coded /tmp here - comment added by Kevin Tian ---- - configure.ac | 11 +---------- - 1 files changed, 1 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 408054b..6d26180 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY) - AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY", - [Full path to the launch helper test program in the builddir]) - --#### Find socket directories --if ! test -z "$TMPDIR" ; then -- DEFAULT_SOCKET_DIR=$TMPDIR --elif ! test -z "$TEMP" ; then -- DEFAULT_SOCKET_DIR=$TEMP --elif ! test -z "$TMP" ; then -- DEFAULT_SOCKET_DIR=$TMP --else -- DEFAULT_SOCKET_DIR=/tmp --fi -+DEFAULT_SOCKET_DIR=/tmp - - DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'` - --- -1.6.6.1 - diff --git a/meta/recipes-core/dbus/dbus_1.14.10.bb b/meta/recipes-core/dbus/dbus_1.16.0.bb similarity index 77% rename from meta/recipes-core/dbus/dbus_1.14.10.bb rename to meta/recipes-core/dbus/dbus_1.16.0.bb index 6a08f6984e2..f516273cc77 100644 --- a/meta/recipes-core/dbus/dbus_1.14.10.bb +++ b/meta/recipes-core/dbus/dbus_1.16.0.bb @@ -3,43 +3,44 @@ DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to t HOMEPAGE = "https://dbus.freedesktop.org" SECTION = "base" -inherit autotools pkgconfig gettext upstream-version-is-even ptest-gnome +inherit meson pkgconfig gettext upstream-version-is-even ptest-gnome LICENSE = "AFL-2.1 | GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=6423dcd74d7be9715b0db247fd889da3 \ - file://dbus/dbus.h;beginline=6;endline=20;md5=866739837ccd835350af94dccd6457d8 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=eb0ffc69a965797a3d6686baa153ef05 \ + file://dbus/dbus.h;beginline=6;endline=22;md5=df4251a6c6e15e6a9e3c77b2ac30065d \ " SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://run-ptest \ - file://tmpdir.patch \ file://dbus-1.init \ " -SRC_URI[sha256sum] = "ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f" +SRC_URI[sha256sum] = "9f8ca5eb51cbe09951aec8624b86c292990ae2428b41b856e2bed17ec65c8849" -EXTRA_OECONF = "--disable-xml-docs \ - --disable-doxygen-docs \ - --enable-largefile \ - --with-system-socket=/run/dbus/system_bus_socket \ - --enable-modular-tests \ - --enable-checks \ - --runstatedir=/run \ +EXTRA_OEMESON = "-Dxml_docs=disabled \ + -Ddoxygen_docs=disabled \ + -Dsystem_socket=/run/dbus/system_bus_socket \ + -Dmodular_tests=enabled \ + -Dchecks=true \ + -Druntime_dir=${runtimedir} \ + -Dtest_socket_dir=/tmp \ + -Dsession_socket_dir=/tmp \ " -EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ user-session \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ " PACKAGECONFIG:class-native = "" PACKAGECONFIG:class-nativesdk = "" -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" -PACKAGECONFIG[x11] = "--enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" -PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" -PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," -PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit" -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd_system_unitdir=${systemd_system_unitdir},-Dsystemd=disabled,systemd" +PACKAGECONFIG[x11] = "-Dx11_autolaunch=enabled,-Dx11_autolaunch=disabled, virtual/libx11 libsm" +PACKAGECONFIG[user-session] = "-Duser_session=true -Dsystemd_user_unitdir=${systemd_user_unitdir},-Duser_session=false" +PACKAGECONFIG[verbose-mode] = "-Dverbose_mode=true,-Dverbose_mode=false,," +PACKAGECONFIG[audit] = "-Dlibaudit=enabled,-Dlibaudit=disabled,audit" +PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" +PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" DEPENDS = "expat virtual/libintl autoconf-archive-native glib-2.0" RDEPENDS:${PN} += "${PN}-common ${PN}-tools" @@ -124,9 +125,7 @@ pkg_postinst:dbus() { } -do_install() { - autotools_do_install - +do_install:append:class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d sed 's:@bindir@:${bindir}:' < ${UNPACKDIR}/dbus-1.init > ${S}/dbus-1.init.sh @@ -159,27 +158,23 @@ do_install() { # Remove empty testexec directory as we don't build tests rm -rf ${D}${libdir}/dbus-1.0/test - # Remove /var/run as it is created on startup - rm -rf ${D}${localstatedir}/run + # Remove /run as it is created on startup + rm -rf ${D}${runtimedir} } -do_install:class-native() { - autotools_do_install - +do_install:append:class-native() { # dbus-launch has no X support so lets not install it in case the host # has a more featured and useful version rm -f ${D}${bindir}/dbus-launch } -do_install:class-nativesdk() { - autotools_do_install - +do_install:append:class-nativesdk() { # dbus-launch has no X support so lets not install it in case the host # has a more featured and useful version rm -f ${D}${bindir}/dbus-launch - # Remove /var/run to avoid QA error - rm -rf ${D}${localstatedir}/run + # Remove /run to avoid QA error + rm -rf ${D}${runtimedir} } BBCLASSEXTEND = "native nativesdk" From patchwork Wed Jan 8 08:42:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D40D5E7719F for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web11.14677.1736325754167788598 for ; Wed, 08 Jan 2025 00:42:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hThyhsIF; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-aa69107179cso2742304066b.0 for ; Wed, 08 Jan 2025 00:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325752; x=1736930552; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wbF3j3hVSgiB9kSGfLL1+//t7Y4vDl9BzIEN/hN2aUs=; b=hThyhsIF69vkRkw/AD22pELJ57iuGUqv3kIaW9+siqBmRLdCAuQ5+wm/P4AUK2qc8R TbiTMpOUY3GxWhDRlDLFnzEA8Piil5UmVLVJSjuCGtfPJKHSa9/ksgCjM/2IcGEkChhH 2JLC138ZYC4G4g4IqWgUAzjhfuuTLrN82WMTl3gXTT0/M5yyapDdA0zzydRygDGvEBZ1 Qt+Fi8A2Mzgu9yy/hqNRZuA0iETgpZHefzZbEoWr1gVENM8uCUXaFmaTYT4vwrDJAkog ckAo/2nV9bwPIe2Bno2uj5nUQNCCWeSiQcM3MZCKjeHn39HhiJEKzTY+M11dQEhFyMrB 3P+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325752; x=1736930552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wbF3j3hVSgiB9kSGfLL1+//t7Y4vDl9BzIEN/hN2aUs=; b=rMepRKgIqhirBuhmQfDiJgDvK8tRR7hkjmGWCX4we4BpJX7xIoniRHPIgrcBHmaXmf QWZ+agtr/sL9CnCne+zs3SGxe98MCkN/hKAO+lDOGURkekbV8omXioE+EYGovIL1FNGj e7NZ9P1HI8yRyYCwK7Prilus+KXDl2Xji1G4x9wrUdvEmGM+ccjQeto2racpL4QdQnB8 FqhOR/ohwHrZtIHBnTbGAZ7KHfoy0qrBFLPFNOSHo70Kj5C4rlGv3sL4UL8Wlyt2FPpv olVw0eo9FWFI7vyemSNaVfSBn/ps/6RzYZ1NPvmPctOoGoFWI3ErgXIIsPHKoqLWH4U/ IhIA== X-Gm-Message-State: AOJu0YwIrgxjKFIiYaXpCrr5OtW7eeeyxII1YUWleomzsdxeJOWeDqkH 6CPaNppbBOq8anc9rjgz6q7/Apzk2iigR2en6geE3LDK0ZXNZLvA7KO4Kg== X-Gm-Gg: ASbGnctotLscAp4bCE1ASFuOxgOu3sUajuKWs4I1IOCJ0ESqth6CTF30XiW3UdE3pZA 5FbdqwN+3fcHL7fMfFDQnCxIqPX/dCTWtV5VrMeFLuGtujPUX3r8d3IJtUkpZQAODPxu0Oecf85 eKPJEm+YcrfqQ3y0jqwwgCOKZ+eW72Rv5f0W+Hiq/rKkN8PRmRiFcj3otigjB4RTBWwAHqubMKK 5fDU3UNSkKbP2hIFdzfMpKPr7ldnM7BHUXuotKu9HdO56UM8VX9FQuc6wdP8nwUl9M+Y4Oq9Pk1 5ulQ7fzWIyZ1Zuq4Tg== X-Google-Smtp-Source: AGHT+IGFcN+nOYTqxVn79UPZKwJGah2MuDivNxXkJb+BrjqSPt8a5vQ5EqWHJ2stvTXU0VYV1J+zCA== X-Received: by 2002:a17:907:2d08:b0:aac:278:98fd with SMTP id a640c23a62f3a-ab2ab6a3f9dmr139670166b.17.1736325751529; Wed, 08 Jan 2025 00:42:31 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:31 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/20] sysvinit: update 3.11 -> 3.13 Date: Wed, 8 Jan 2025 09:42:09 +0100 Message-Id: <20250108084226.117178-3-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209526 From: Alexander Kanavin Remove patches: install.patch (merged upstream) realpath.patch 0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch (musl fixes, no longer needed) pidof-add-m-option.patch (not a backport, not used in core, and isn't carried by either debian or fedora) Signed-off-by: Alexander Kanavin --- ...acros.h-for-major-minor-defines-in-g.patch | 50 ----- .../sysvinit/sysvinit/crypt-lib.patch | 27 ++- .../sysvinit/sysvinit/install.patch | 79 ------- .../sysvinit/pidof-add-m-option.patch | 193 ------------------ .../sysvinit/sysvinit/realpath.patch | 61 ------ .../{sysvinit_3.11.bb => sysvinit_3.13.bb} | 6 +- 6 files changed, 13 insertions(+), 403 deletions(-) delete mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch delete mode 100644 meta/recipes-core/sysvinit/sysvinit/install.patch delete mode 100644 meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch delete mode 100644 meta/recipes-core/sysvinit/sysvinit/realpath.patch rename meta/recipes-core/sysvinit/{sysvinit_3.11.bb => sysvinit_3.13.bb} (93%) diff --git a/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch b/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch deleted file mode 100644 index 60fbd87534b..00000000000 --- a/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c710a3accd1fabdb671274e1a458405282d51e0c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 6 Aug 2018 15:38:58 -0700 -Subject: [PATCH] include sys/sysmacros.h for major/minor definitions - -Signed-off-by: Khem Raj -Upstream-Status: Pending - ---- - src/bootlogd.c | 1 + - src/mountpoint.c | 1 + - src/shutdown.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/bootlogd.c b/src/bootlogd.c -index 787db87..8b07903 100644 ---- a/src/bootlogd.c -+++ b/src/bootlogd.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/mountpoint.c b/src/mountpoint.c -index 5f20522..94df7a1 100644 ---- a/src/mountpoint.c -+++ b/src/mountpoint.c -@@ -25,6 +25,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/src/shutdown.c b/src/shutdown.c -index b744a2c..40b7faf 100644 ---- a/src/shutdown.c -+++ b/src/shutdown.c -@@ -40,6 +40,7 @@ - #endif - #include - #include -+#include - #include - #ifdef __linux__ - #include /* brought in my LFS patch */ diff --git a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch index 24c81822187..ece870c2693 100644 --- a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +++ b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch @@ -1,33 +1,33 @@ -From 49250c8e0ef563aafd5bbea62612f3d15fdee3af Mon Sep 17 00:00:00 2001 +From 19a8777c81bc451d65a4071528e4715e19941e0a Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Wed, 14 Jul 2010 14:35:52 -0400 Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a -Upstream-Status: Inappropriate [configuration] +The src Makefile was checking for libcrypt.a on the host, not in the +build environment. This patch checks for $LCRYPT in the environment +and uses it if it's there. +jdike@linux.intel.com -# The src Makefile was checking for libcrypt.a on the host, not in the -# build environment. This patch checks for $LCRYPT in the environment -# and uses it if it's there. -# - jdike@linux.intel.com +Upstream-Status: Inappropriate [configuration] --- src/Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 0210171..f696247 100644 +index 4ce4889..1611c1c 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -101,16 +101,8 @@ endif - - ROOT ?= $(DESTDIR) +@@ -97,16 +97,8 @@ else + SULOGINLIBS = + endif -# Additional libs for GNU libc. --ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),) +-ifneq ($(wildcard $(ROOT)/$(usrdir)/lib*/libcrypt.*),) - SULOGINLIBS += -lcrypt -endif - -# Additional libs for GNU libc / multiarch on Debian based systems. --ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),) +-ifneq ($(wildcard $(ROOT)/$(usrdir)/lib/*/libcrypt.*),) -ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt) - SULOGINLIBS += -lcrypt -endif @@ -36,6 +36,3 @@ index 0210171..f696247 100644 endif all: $(BIN) $(SBIN) $(USRBIN) --- -2.25.1 - diff --git a/meta/recipes-core/sysvinit/sysvinit/install.patch b/meta/recipes-core/sysvinit/sysvinit/install.patch deleted file mode 100644 index 4289c4eddc7..00000000000 --- a/meta/recipes-core/sysvinit/sysvinit/install.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f73a2c768687f3fed0ab570f47fa2157e5d4e586 Mon Sep 17 00:00:00 2001 -From: Qing He -Date: Fri, 18 Jun 2010 09:40:30 +0800 -Subject: [PATCH] sysvinit: upgrade to version 2.88dsf - -Upstream-Status: Submitted [https://github.com/slicer69/sysvinit/pull/13] ---- - src/Makefile | 37 ++++++++++++++++++++++--------------- - 1 file changed, 22 insertions(+), 15 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 21cbb2e..0210171 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -80,7 +80,14 @@ else - INSTALL_DATA = install -m 644 - endif - INSTALL_DIR = install -m 755 -d --MANDIR = /usr/share/man -+ -+ROOT ?= -+base_bindir ?= /bin -+base_sbindir ?= /sbin -+bindir ?= /usr/bin -+sysconfdir ?= /etc -+includedir ?= /usr/include -+mandir ?= /usr/share/man - - ifeq ($(WITH_SELINUX),yes) - SELINUX_DEF = -DWITH_SELINUX -@@ -196,31 +203,31 @@ clobber: cleanobjs - distclean: clobber - - install: all -- $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/ -- $(INSTALL_DIR) $(ROOT)/usr/bin/ -+ $(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/ -+ $(INSTALL_DIR) $(ROOT)$(bindir)/ - for i in $(BIN); do \ -- $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \ -+ $(INSTALL_EXEC) $$i $(ROOT)$(base_bindir)/ ; \ - done - for i in $(SBIN); do \ -- $(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \ -+ $(INSTALL_EXEC) $$i $(ROOT)$(base_sbindir)/ ; \ - done - for i in $(USRBIN); do \ -- $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \ -+ $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \ - done - # $(INSTALL_DIR) $(ROOT)/etc/ - $(INSTALL_DIR) $(ROOT)/etc/inittab.d - # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/ -- ln -sf halt $(ROOT)/sbin/reboot -- ln -sf halt $(ROOT)/sbin/poweroff -- ln -sf init $(ROOT)/sbin/telinit -- ln -sf ../sbin/killall5 $(ROOT)/bin/pidof -- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \ -- ln -sf last $(ROOT)/usr/bin/lastb; \ -+ ln -sf halt $(ROOT)$(base_sbindir)/reboot -+ ln -sf halt $(ROOT)$(base_sbindir)/poweroff -+ ln -sf init $(ROOT)$(base_sbindir)/telinit -+ ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof -+ if [ ! -f $(ROOT)$(bindir)/lastb ]; then \ -+ ln -sf last $(ROOT)$(bindir)/lastb; \ - fi -- $(INSTALL_DIR) $(ROOT)/usr/include/ -- $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/ -+ $(INSTALL_DIR) $(ROOT)$(includedir)/ -+ $(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/ - for man in $(MANPAGES) ; do \ -- targetdir=$(ROOT)$(MANDIR)/$$(dirname $$man)/man$${man##*.}; \ -+ targetdir=$(ROOT)$(mandir)/$$(dirname $$man)/man$${man##*.}; \ - $(INSTALL_DIR) $$targetdir; \ - $(INSTALL_DATA) ../man/$$man $$targetdir/$$(basename $$man); \ - sed -i "1{ $(MANDB); }" $$targetdir/$$(basename $$man); \ --- -2.25.1 - diff --git a/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch b/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch deleted file mode 100644 index 66da6fb4032..00000000000 --- a/meta/recipes-core/sysvinit/sysvinit/pidof-add-m-option.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 2b19b36409b8de0621b9aeb0d13748e947a5bbfb Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 24 Jul 2013 17:07:22 +0800 -Subject: [PATCH] pidof: add -m option - -When used with -o, will also omit any processes that have the same -argv[0] and argv[1] as any explicitly omitted process ids. This can be -used to avoid multiple shell scripts concurrently calling pidof returning -each other's pids. - -https://bugzilla.redhat.com/show_bug.cgi?id=883856 - -Upstream-Status: Backport -Imported patch from: https://bugzilla.redhat.com/attachment.cgi?id=658166 - -Signed-off-by: Hongxu Jia ---- - man/pidof.8 | 6 +++++ - src/killall5.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 65 insertions(+), 3 deletions(-) - -diff --git a/man/pidof.8 b/man/pidof.8 -index 6866cb3..a87d878 100644 ---- a/man/pidof.8 -+++ b/man/pidof.8 -@@ -25,6 +25,7 @@ pidof - find the process ID of a running program - .RB [ \-n ] - .RB [ \-x ] - .RB [ \-z ] -+.RB [ \-m ] - .RB [ \-o - .IR omitpid[,omitpid...] ] - .RB [ \-o -@@ -77,6 +78,11 @@ is shown. The default separator is a space. - Tells \fIpidof\fP to omit processes with that process id. The special - pid \fB%PPID\fP can be used to name the parent process of the \fBpidof\fP - program, in other words the calling shell or shell script. -+.IP -m -+When used with -o, will also omit any processes that have the same -+argv[0] and argv[1] as any explicitly omitted process ids. This can be -+used to avoid multiple shell scripts concurrently calling pidof returning -+each other's pids. - .SH "EXIT STATUS" - .TP - .B 0 -diff --git a/src/killall5.c b/src/killall5.c -index 6f7528a..34d656b 100644 ---- a/src/killall5.c -+++ b/src/killall5.c -@@ -121,6 +121,7 @@ typedef struct _s_nfs - - /* List of processes. */ - PROC *plist = NULL; -+PROC *olist = NULL; - - /* List of processes to omit. */ - OMIT *omit = NULL; -@@ -356,6 +357,20 @@ static void clear_mnt(void) - } - } - -+static void clear_omit(void) -+{ -+ OMIT *o; -+ PROC *p; -+ for (o = omit; o; o = omit) { -+ omit = omit->next; -+ free(o); -+ } -+ for (p = olist; p; p = olist) { -+ olist = olist->next; -+ free(p); -+ } -+} -+ - /* - * Check if path is a shadow off a NFS partition. - */ -@@ -481,6 +496,7 @@ int readproc() - DIR *dir; - FILE *fp; - PROC *p, *n; -+ OMIT *o, *m; - struct dirent *d; - char path[PATH_MAX+1]; - char buf[PATH_MAX+1]; -@@ -671,6 +687,17 @@ int readproc() - p->next = plist; - plist = p; - p->pid = pid; -+ /* Could be smarter, but it's a small list. */ -+ m = omit; -+ for (o = omit; m; o = m) { -+ m = o->next; -+ if (o->pid == p->pid) { -+ n = (PROC*)xmalloc(sizeof(PROC)); -+ *n = *p; -+ n->next = olist; -+ olist = n; -+ } -+ } - } - closedir(dir); - -@@ -877,6 +904,26 @@ PIDQ_HEAD *pidof(char *prog) - return q; - } - -+int matches(PROC *o, PROC *p) -+{ -+ int ret = 0; -+ char *oargv1, *pargv1; -+ if ((o->argv0 && p->argv0 && !strcmp(o->argv0,p->argv0))) { -+ if (o->argv1 && p->argv1) { -+ if ((oargv1 = canonicalize_file_name(o->argv1)) == NULL) -+ oargv1 = strdup(o->argv1); -+ if ((pargv1 = canonicalize_file_name(p->argv1)) == NULL) -+ pargv1 = strdup(p->argv1); -+ if (! strcmp(oargv1, pargv1)) { -+ ret = 1; -+ } -+ free(oargv1); -+ free(pargv1); -+ } -+ } -+ return ret; -+} -+ - /* Give usage message and exit. */ - void usage(void) - { -@@ -927,6 +974,7 @@ void nsyslog(int pri, char *fmt, ...) - #define PIDOF_OMIT 0x02 - #define PIDOF_NETFS 0x04 - #define PIDOF_QUIET 0x08 -+#define PIDOF_OMIT_OMIT_MATCHES 0x08 - - /* - * Pidof functionality. -@@ -944,6 +992,7 @@ int main_pidof(int argc, char **argv) - char tmp[512]; - char sep = ' '; - -+ olist = (PROC*)0; - omit = (OMIT*)0; - nlist = (NFS*)0; - opterr = 0; -@@ -951,7 +1000,7 @@ int main_pidof(int argc, char **argv) - if ((token = getenv("PIDOF_NETFS")) && (strcmp(token,"no") != 0)) - flags |= PIDOF_NETFS; - -- while ((opt = getopt(argc,argv,"qhco:d:sxzn")) != EOF) switch (opt) { -+ while ((opt = getopt(argc,argv,"qhcmo:d:sxzn")) != EOF) switch (opt) { - case '?': - nsyslog(LOG_ERR,"invalid options on command line!\n"); - closelog(); -@@ -1002,6 +1051,9 @@ int main_pidof(int argc, char **argv) - case 'z': - list_dz_processes = TRUE; - break; -+ case 'm': -+ flags |= PIDOF_OMIT_OMIT_MATCHES; -+ break; - case 'n': - flags |= PIDOF_NETFS; - break; -@@ -1033,10 +1085,13 @@ int main_pidof(int argc, char **argv) - pid_t spid = 0; - while ((p = get_next_from_pid_q(q))) { - if ((flags & PIDOF_OMIT) && omit) { -- OMIT * optr; -- for (optr = omit; optr; optr = optr->next) { -+ PROC * optr; -+ for (optr = olist; optr; optr = optr->next) { - if (optr->pid == p->pid) - break; -+ if (flags & PIDOF_OMIT_OMIT_MATCHES) -+ if (matches(optr, p)) -+ break; - } - - /* -@@ -1078,6 +1133,7 @@ int main_pidof(int argc, char **argv) - printf("\n"); - } - -+ clear_omit(); - clear_mnt(); - - closelog(); --- -2.25.1 - diff --git a/meta/recipes-core/sysvinit/sysvinit/realpath.patch b/meta/recipes-core/sysvinit/sysvinit/realpath.patch deleted file mode 100644 index 7a669d01111..00000000000 --- a/meta/recipes-core/sysvinit/sysvinit/realpath.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 50e6b3a0fc7c083e6514a55ac93e5591aaeb787d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 19 Nov 2015 00:10:03 +0000 -Subject: [PATCH] Fix build on musl use realpath() API its available on all - libcs - -realpath() API doesnt work on systems with PATH_MAX set to be unlimited e.g. GNU/Hurd -However for Linux it should always work - -Upstream-Status: Inappropriate [Linux specific] - -Signed-off-by: Khem Raj ---- - src/killall5.c | 4 ++-- - src/mountpoint.c | 1 + - src/wall.c | 1 + - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/killall5.c b/src/killall5.c -index 34d656b..bc19d7f 100644 ---- a/src/killall5.c -+++ b/src/killall5.c -@@ -910,9 +910,9 @@ int matches(PROC *o, PROC *p) - char *oargv1, *pargv1; - if ((o->argv0 && p->argv0 && !strcmp(o->argv0,p->argv0))) { - if (o->argv1 && p->argv1) { -- if ((oargv1 = canonicalize_file_name(o->argv1)) == NULL) -+ if ((oargv1 = realpath(o->argv1, NULL)) == NULL) - oargv1 = strdup(o->argv1); -- if ((pargv1 = canonicalize_file_name(p->argv1)) == NULL) -+ if ((pargv1 = realpath(p->argv1, NULL)) == NULL) - pargv1 = strdup(p->argv1); - if (! strcmp(oargv1, pargv1)) { - ret = 1; -diff --git a/src/mountpoint.c b/src/mountpoint.c -index 184b1f6..c55b0df 100644 ---- a/src/mountpoint.c -+++ b/src/mountpoint.c -@@ -23,6 +23,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include - #include - #include - #include -diff --git a/src/wall.c b/src/wall.c -index e527613..1d363ca 100644 ---- a/src/wall.c -+++ b/src/wall.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include "init.h" - - --- -2.25.1 - diff --git a/meta/recipes-core/sysvinit/sysvinit_3.11.bb b/meta/recipes-core/sysvinit/sysvinit_3.13.bb similarity index 93% rename from meta/recipes-core/sysvinit/sysvinit_3.11.bb rename to meta/recipes-core/sysvinit/sysvinit_3.13.bb index e8eab275644..d935b0edfd4 100644 --- a/meta/recipes-core/sysvinit/sysvinit_3.11.bb +++ b/meta/recipes-core/sysvinit/sysvinit_3.13.bb @@ -11,18 +11,14 @@ RDEPENDS:${PN} = "${PN}-inittab" GITHUB_BASE_URI = "https://github.com/slicer69/${BPN}/releases/" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \ - file://install.patch \ file://crypt-lib.patch \ - file://pidof-add-m-option.patch \ - file://realpath.patch \ - file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ file://rcS-default \ file://rc \ file://rcS \ file://bootlogd.init \ file://01_bootlogd \ " -SRC_URI[sha256sum] = "04f1b7d67413af1c09c41acc1e3ce946f2d0f7a1e47c9978744bc542864e13d4" +SRC_URI[sha256sum] = "cbaeabddc35a6511b87c87452ee5e87c678a26329c7d7d17fb69a2b42a314d86" S = "${WORKDIR}/sysvinit-${PV}" From patchwork Wed Jan 8 08:42:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E00BDC02183 for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web10.14215.1736325754158089402 for ; Wed, 08 Jan 2025 00:42:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Agna0gmc; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aaeef97ff02so2112323366b.1 for ; Wed, 08 Jan 2025 00:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325752; x=1736930552; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dcXQonvPsydneXliEJ/SjEClMXShffNJI0MIx0a+oBM=; b=Agna0gmc613uZUP2u/MygAvUVmTHxhOhP01Wdp/W/FlNzlOryynXXoKBO3PWhu73r9 nO+tuSnOjD3vXBO4PP0TMe9NgzS5Mqy2H0bmCi5Ibj2spYssj3eYvcwR/HdIq/AU52wP OoUi1++dIUOIm5DcZ1eKlAer1JftF7FenZIV7+ruZBfPrBVj7Juksd22IOvOu0yBkBh4 RQVAoaO0HNhovE9Ap2ba29E6QAdpL2SHPDVQNO3Lrv+UMNA17mKgby42/RauwCsVpy83 hbHtmJCU/uR3MtQsflb8TNT23TrsimaTpSm4i+0eOKPMHDupddmVyJ8ALiz6cNCJ8PjF 6iFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325752; x=1736930552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dcXQonvPsydneXliEJ/SjEClMXShffNJI0MIx0a+oBM=; b=XZOg5qjktsoWfqIQJN5Uz+rkNkZY4Lf25sxdBEoarkEOXrQzmAN2lJmMmTZrui/MRO MpUZHTMS9YB6+EG33WYdPDUOVWHNmVn2GN0E0airJ8NGtVbA2YCRNXXrTJEd/KFQEVLf hbonkhU71ka2+HMYw4byACvUEgjWTd4mlVZnoT+UN0AMEF1gFp1KLtFAeNxrvO+/8l99 hDoCkbrGbtB9eJAHaoIa4C40iL8YKrhQhqM1uoFjN8vucJuVb/Z+IBMEmpTiP7ADJuQA uDGASaYPzQgre8yZUmZdgsSZX42d9WHScsMYXLOW5tpUqifW9BPV2Rw3UoJsRFbUYYrQ UQuQ== X-Gm-Message-State: AOJu0Yzezn9WZgMx8wWdwTz644ICvX/o/9asURM+mIriK+Gy9oyZgVsl beFwSW5a0dQiV9/lA3xL2goGQGv00JFm5GeEK9w+zHi+BsDIUXK7smhBXg== X-Gm-Gg: ASbGncslJct07ujUoWGJbBk1p9X6aVxwWk7szX8dRGhgrpOydGMrRwZUBXRpfNYKz6S XUCbRgRTd9yM1b9dSl34ju5eROjWX8xQtqci2e8HzPljnFWa9qRm7u/Xjhn95B5zGaAM2BQu7r+ GIB6d0p8KeTTIswZWf+kvPiuFiqTlDvj+uQDzG+aosdEBUcYOwj+G8jLkAXqMCiqla2LdWMtFxP Qayt9CuDKIDPXmGvtRB/uWKdaYLTfZIzCrOqrEheOugCHeZJha5qd3a6MRlCTs3Ayh/29fIfEsE EdrQg8LU2xCSpom/Kw== X-Google-Smtp-Source: AGHT+IGerNQdy8I3GvqiJxLs+JplmQ3vN8Lz/kbLhur7ppjQvxcDAX5EzxX9aUQPlPVdtWyJKlXPOQ== X-Received: by 2002:a17:907:7faa:b0:aa6:832b:8d76 with SMTP id a640c23a62f3a-ab2ab6766c4mr149995466b.12.1736325752372; Wed, 08 Jan 2025 00:42:32 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:32 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/20] python3-click: update 8.1.7 -> 8.1.8 Date: Wed, 8 Jan 2025 09:42:10 +0100 Message-Id: <20250108084226.117178-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209525 From: Alexander Kanavin License-update: renamed file Convert from setuptools to flit. Signed-off-by: Alexander Kanavin --- .../{python3-click_8.1.7.bb => python3-click_8.1.8.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/python/{python3-click_8.1.7.bb => python3-click_8.1.8.bb} (77%) diff --git a/meta/recipes-devtools/python/python3-click_8.1.7.bb b/meta/recipes-devtools/python/python3-click_8.1.8.bb similarity index 77% rename from meta/recipes-devtools/python/python3-click_8.1.7.bb rename to meta/recipes-devtools/python/python3-click_8.1.8.bb index baff4cbd45c..31b9e43a942 100644 --- a/meta/recipes-devtools/python/python3-click_8.1.7.bb +++ b/meta/recipes-devtools/python/python3-click_8.1.8.bb @@ -6,11 +6,11 @@ Line Interface Creation Kit". It's highly configurable but comes with \ sensible defaults out of the box." HOMEPAGE = "http://click.pocoo.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1fa98232fd645608937a0fdc82e999b8" -SRC_URI[sha256sum] = "ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" +SRC_URI[sha256sum] = "ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a" -inherit pypi setuptools3 ptest +inherit pypi python_flit_core ptest SRC_URI += "file://run-ptest" @@ -23,7 +23,7 @@ RDEPENDS:${PN}-ptest += " \ do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/setup.cfg ${D}${PTEST_PATH}/ + cp -rf ${S}/pyproject.toml ${D}${PTEST_PATH}/ cp -rf ${S}/docs ${D}${PTEST_PATH}/ } From patchwork Wed Jan 8 08:42:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55197 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACFAFE7719D for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web11.14678.1736325755177956302 for ; Wed, 08 Jan 2025 00:42:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FR2lt5VH; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5d3f65844deso27961313a12.0 for ; Wed, 08 Jan 2025 00:42:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325753; x=1736930553; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sju3WWOp+S7J+Pdv65i+Apfd9yHMCRYv/cv5TOAysZk=; b=FR2lt5VH8QsVAVcPfAWs5ThR8M/jCxqHTPvNIP+Xx+TBxuK0J9KrKR+drb4m4bcAWC DrOeJngYNHPVhi8B+ek9mTJvmq+JIX+322Xh0WA9gsNG+UH6Lj2z6mm6FiW+oxalarmj 6gDMao62EBmDNvAKJ4AzGIyaXL4eJDDPPgB2m8RC3c7nlrLRZbIKqQC608A+DsUCGtKK Au6BOZO0hVVqCeMJWNeCoC27s0E8mabyeHz7PJajrbYUuxqzOh3k1ZAnsHqn5vYQAa3t SGF9q/suAjmK9XTK5PkjIYszad/zYxXh/YjiJCOj1+Xir+ujtBfhIC3JUtwMFL/J1mnS GMIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325753; x=1736930553; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sju3WWOp+S7J+Pdv65i+Apfd9yHMCRYv/cv5TOAysZk=; b=SfRTXMbXCO1bK5zOa2sdX9jGK58PNcVJWtpi1tr+5SvDwI9OOa7aPb90dQ9tJt7/JS ppDeDDiDKglguiRHwS0DfW1ffGOOUdDJMJT4fDiFbnJQnabnbJpIj+67ZnAC7HHvxhsd 15kUxhbLxG1ZWK8DoKO8oALkjDr9h1xPGCFnYVWZ+P+nGC9ZaMr957Qs0ptTzDq/znT4 k4jSIKBZ6UVjSHhti/JORYt9D6bE2+tTINVunZtqNWhuK9TrfZ4eD1KlbrOgo9ViCvgX 12ffJY48OOhrQ2FY53snSrGdE7dluhbUHTwIEXdJ8PBHTkzRFvK1ognj6/HSxGeR1NOu +jMQ== X-Gm-Message-State: AOJu0Ywkw9WnvZpOcC+1zp6CDufB6Iy2vx97pcSy2ljIrON9+sM5d0UY m2/ur3o50w4Rn41o/0tplIZsVN7I++8jlDYJysR5W2SK1WdzkcLgH1SZiw== X-Gm-Gg: ASbGncui/fZZ20F+9I4PW20mj3NN0DmuAtoGqWYRPLwlCCtY1TGvD1ToZLDf2+e/NKs B1CcjGI8UBdw00lderkrRL/SBgERplreTf0vP6Ht0lJB2CpR3N/0iCppPkxJCqaokOrVw8gBQ7a KMGLNEfGPNg6+JcNuF3amP1RbiSogfErcuA0cbtZUYxm2AqIw5o2uly3PQ/ELas1GIHaZy6Lzk1 9HHVGGgmPQrDbhYTTXIhbStSQ6qDFnrxB7kI3H0vmvSEqv8eRRTz4m95gWInzmdCyk0UsrfsC1b cRa01Ln9UlALUpGs5A== X-Google-Smtp-Source: AGHT+IEbd0Anl41xJ+DWdL/MpRiop3K3120xg8+q+txOm4xZXVn7PiuDgA8+/n0CiorbWE4ikp0dVg== X-Received: by 2002:a17:907:9490:b0:aa6:6885:e2f0 with SMTP id a640c23a62f3a-ab2abc78dd7mr171222366b.46.1736325753174; Wed, 08 Jan 2025 00:42:33 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:32 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/20] tcl: update 9.0.0 -> 9.0.1 Date: Wed, 8 Jan 2025 09:42:11 +0100 Message-Id: <20250108084226.117178-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209527 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- ...om-OE.dev-but-with-legacy-staging-fu.patch | 14 +++++-------- .../tcl/0002-tcl-fix-a-build-issue.patch | 17 +++++++-------- ...to-lib64-instead-of-lib-on-64bit-tar.patch | 11 ++++------ .../0004-tcl-update-the-header-location.patch | 15 ++++++------- .../0005-tcl-fix-race-in-interp.test.patch | 21 ++++++++----------- .../tcltk/{tcl_9.0.0.bb => tcl_9.0.1.bb} | 2 +- 6 files changed, 32 insertions(+), 48 deletions(-) rename meta/recipes-devtools/tcltk/{tcl_9.0.0.bb => tcl_9.0.1.bb} (97%) diff --git a/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch b/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch index 9472591a55f..343209ececc 100644 --- a/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch +++ b/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch @@ -1,8 +1,7 @@ -From f69a01c5932af2d5ece6141e4424b14a2d645fd7 Mon Sep 17 00:00:00 2001 +From 822a73a5dec13549cb20e6c7338b059ece2ea95a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 9 Dec 2009 23:59:44 +0000 -Subject: [PATCH 1/5] tcl: Add tcltk from OE.dev but with legacy staging - function +Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function Upstream-Status: Pending --- @@ -11,10 +10,10 @@ Upstream-Status: Pending 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index 0ff1258..6e74458 100644 +index b72b0da..2de7b2f 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in -@@ -1027,7 +1027,10 @@ install-binaries: binaries +@@ -1021,7 +1021,10 @@ install-binaries: binaries done @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @@ -27,7 +26,7 @@ index 0ff1258..6e74458 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 99bc8bf..7e6e0da 100644 +index 4265832..49ad5ab 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1269,6 +1269,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ @@ -40,6 +39,3 @@ index 99bc8bf..7e6e0da 100644 SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" --- -2.39.5 - diff --git a/meta/recipes-devtools/tcltk/tcl/0002-tcl-fix-a-build-issue.patch b/meta/recipes-devtools/tcltk/tcl/0002-tcl-fix-a-build-issue.patch index 53cfd8927db..a2d56225285 100644 --- a/meta/recipes-devtools/tcltk/tcl/0002-tcl-fix-a-build-issue.patch +++ b/meta/recipes-devtools/tcltk/tcl/0002-tcl-fix-a-build-issue.patch @@ -1,7 +1,7 @@ -From 61ef40f2bc418ce072828ad1939eaa40f981e76e Mon Sep 17 00:00:00 2001 +From 363d9d8fb329b26d1e59ece7f269a7a28e6722c5 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 13 Aug 2010 12:24:00 -0700 -Subject: [PATCH 2/5] tcl: fix a build issue +Subject: [PATCH] tcl: fix a build issue Upstream-Status: Inappropriate [upstream does not support installed tests] --- @@ -9,10 +9,10 @@ Upstream-Status: Inappropriate [upstream does not support installed tests] 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index 6e74458..bd0b818 100644 +index 2de7b2f..b5f9ab7 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in -@@ -918,7 +918,7 @@ tcltest-real: +@@ -912,7 +912,7 @@ tcltest-real: test: test-tcl test-packages test-tcl: ${TCLTEST_EXE} @@ -21,7 +21,7 @@ index 6e74458..bd0b818 100644 gdb-test: ${TCLTEST_EXE} $(SHELL_ENV) $(GDB) --args ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl \ -@@ -928,15 +928,14 @@ lldb-test: ${TCLTEST_EXE} +@@ -922,15 +922,14 @@ lldb-test: ${TCLTEST_EXE} $(SHELL_ENV) $(LLDB) -- ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl \ $(TESTFLAGS) -singleproc 1 @@ -39,7 +39,7 @@ index 6e74458..bd0b818 100644 # The following target generates the shared libraries in dltest/ that are used # for testing; they are included as part of the "tcltest" target (via the -@@ -954,17 +953,17 @@ dltest.marker: ${STUB_LIB_FILE} +@@ -948,17 +947,17 @@ dltest.marker: ${STUB_LIB_FILE} # This target can be used to run tclsh from the build directory # via `make shell SCRIPT=/tmp/foo.tcl` shell: ${TCL_EXE} @@ -60,7 +60,7 @@ index 6e74458..bd0b818 100644 $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \ $(TESTFLAGS) -@@ -990,13 +989,13 @@ valgrind_each: $(addprefix testresults/valgrind/,$(addsuffix .success,$(notdir\ +@@ -984,13 +983,13 @@ valgrind_each: $(addprefix testresults/valgrind/,$(addsuffix .success,$(notdir\ valgrindshell: ${TCL_EXE} @@ -77,6 +77,3 @@ index 6e74458..bd0b818 100644 #-------------------------------------------------------------------------- # Installation rules --- -2.39.5 - diff --git a/meta/recipes-devtools/tcltk/tcl/0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch b/meta/recipes-devtools/tcltk/tcl/0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch index fb534044988..8a425637c6e 100644 --- a/meta/recipes-devtools/tcltk/tcl/0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch +++ b/meta/recipes-devtools/tcltk/tcl/0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch @@ -1,7 +1,7 @@ -From 8af08b6f1e566af239e36864823a96c2c283e4ea Mon Sep 17 00:00:00 2001 +From 964b9649f8d044d38fdc8c4201075692e5f537a0 Mon Sep 17 00:00:00 2001 From: "Song.Li" Date: Wed, 1 Aug 2012 19:05:51 +0800 -Subject: [PATCH 3/5] tcl:install tcl to lib64 instead of lib on 64bit target +Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}. @@ -17,10 +17,10 @@ Signed-off-by: Yi Zhao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/configure.ac b/unix/configure.ac -index 461b394..b6d2506 100644 +index 7f012d4..43ec7e4 100644 --- a/unix/configure.ac +++ b/unix/configure.ac -@@ -753,7 +753,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -725,7 +725,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" @@ -29,6 +29,3 @@ index 461b394..b6d2506 100644 PRIVATE_INCLUDE_DIR='$(includedir)' HTML_DIR='$(DISTDIR)/html' --- -2.39.5 - diff --git a/meta/recipes-devtools/tcltk/tcl/0004-tcl-update-the-header-location.patch b/meta/recipes-devtools/tcltk/tcl/0004-tcl-update-the-header-location.patch index 7953dcecff1..50a4a272564 100644 --- a/meta/recipes-devtools/tcltk/tcl/0004-tcl-update-the-header-location.patch +++ b/meta/recipes-devtools/tcltk/tcl/0004-tcl-update-the-header-location.patch @@ -1,7 +1,7 @@ -From 20870e9cd4f5a211fe94f484f707269ee1abd947 Mon Sep 17 00:00:00 2001 +From d2fa5a1efa5e4f07b294660c2513766c168137ce Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 22 Nov 2022 18:48:27 +0800 -Subject: [PATCH 4/5] tcl: update the header location +Subject: [PATCH] tcl: update the header location Lets install the include header and private header files into usr/include/tcl8.6 when version of tcl is 8.6.x @@ -26,7 +26,7 @@ Signed-off-by: Mingli Yu 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index bd0b818..ddf2b67 100644 +index b5f9ab7..fbc87a2 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 bd0b818..ddf2b67 100644 # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ diff --git a/unix/configure.ac b/unix/configure.ac -index b6d2506..72a8b0d 100644 +index 43ec7e4..19524d1 100644 --- a/unix/configure.ac +++ b/unix/configure.ac -@@ -754,7 +754,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -726,7 +726,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 b6d2506..72a8b0d 100644 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -921,7 +921,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -893,7 +893,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 @@ -73,6 +73,3 @@ index 9c6da82..8aa5ae8 100644 libfile=@TCL_LIB_FILE@ Name: Tool Command Language --- -2.39.5 - diff --git a/meta/recipes-devtools/tcltk/tcl/0005-tcl-fix-race-in-interp.test.patch b/meta/recipes-devtools/tcltk/tcl/0005-tcl-fix-race-in-interp.test.patch index dfb0b63a0e0..07912da5b38 100644 --- a/meta/recipes-devtools/tcltk/tcl/0005-tcl-fix-race-in-interp.test.patch +++ b/meta/recipes-devtools/tcltk/tcl/0005-tcl-fix-race-in-interp.test.patch @@ -1,7 +1,7 @@ -From 8a96171a33c886d1d9aab40e40f8aae2f621ca08 Mon Sep 17 00:00:00 2001 +From fd75e3613613726786c54a25ee611c5176b33510 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 12 Jul 2021 14:50:13 +0100 -Subject: [PATCH 5/5] tcl: fix race in interp.test +Subject: [PATCH] tcl: fix race in interp.test The interp-36.7 patch has race conditions and is missing cleanup. This patch by a Tcl maintainer should improve matters. @@ -13,20 +13,20 @@ Signed-off-by: Ross Burton 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/interp.test b/tests/interp.test -index 30dc659..e7cd0ee 100644 +index 0092a03..eecfd3b 100644 --- a/tests/interp.test +++ b/tests/interp.test @@ -3614,17 +3614,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { - variable result - set result [lindex $args 0] + variable result + set result [lindex $args 0] } + set tout [after 5000 {set result timeout}] } -body { child eval { - variable done {} - after 0 error foo -- after 10 [list ::set [namespace which -variable done] {}] -- vwait [namespace which -variable done] + variable done {} + after 0 error foo +- after 10 [list ::set [namespace which -variable done] {}] +- vwait [namespace which -variable done] } + vwait result set result @@ -38,6 +38,3 @@ index 30dc659..e7cd0ee 100644 interp delete child } -result foo --- -2.39.5 - diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.0.bb b/meta/recipes-devtools/tcltk/tcl_9.0.1.bb similarity index 97% rename from meta/recipes-devtools/tcltk/tcl_9.0.0.bb rename to meta/recipes-devtools/tcltk/tcl_9.0.1.bb index 0d2efa44aab..0ba7288a600 100644 --- a/meta/recipes-devtools/tcltk/tcl_9.0.0.bb +++ b/meta/recipes-devtools/tcltk/tcl_9.0.1.bb @@ -23,7 +23,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \ file://0004-tcl-update-the-header-location.patch \ file://0005-tcl-fix-race-in-interp.test.patch \ " -SRC_URI[sha256sum] = "3186e23c7417359d90e3c46f531d442c76d3c05a2dba1081c02b75e32908b2b7" +SRC_URI[sha256sum] = "488fcb6c875a1762e9e8478319b20fbad9a31de475f056aeed94cc54b44cf221" UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html" UPSTREAM_CHECK_REGEX = "tcl(?P\d+(\.\d+)+)-src" From patchwork Wed Jan 8 08:42:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55198 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1BE8E7719E for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web11.14679.1736325755686880627 for ; Wed, 08 Jan 2025 00:42:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DA4qiZBG; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-aaec111762bso2713674266b.2 for ; Wed, 08 Jan 2025 00:42:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325754; x=1736930554; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zEbEfiVSLDw3pr72xuSd8Ob6fjHmzX7kwKMipuw0Yak=; b=DA4qiZBGlfbpLLIYzDFxjVDk+qjKn8LcQ8X3UMdM/Q6s/9WyF467NiaxeWqRwXIBsj kGDDF4xOUwr3KwAFgDTRrPvrY3yMaU+uJCQDBpFW13twWR/AOpmofnFiN1ZQCuR7QPco PYPZoCDNVRHPkrnbT+926snKGrgutVnr/Ja9t5W7j0tsXe3/bcLbdZ8T5kHzKOyTq2hb XgQ4Z27qDPFTqr3MFsaOH9d6UjkZ8jLiLnJTT7I+p+Afb2M/i5z7rAu8pbNjcqPxGpqO z+HMO+OtnHQUg65IwctP5SmGVTQuKqE9W6VhtJMumO+JokF0F8kiDZt6p4DwPb077VB1 3qYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325754; x=1736930554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zEbEfiVSLDw3pr72xuSd8Ob6fjHmzX7kwKMipuw0Yak=; b=AAl6+OuzcSZzBwoTnaW8rIqBKCEiIgSaucT7kcy6vI8lswDdJmsGd/cLmenWIZGlQV LRwGZe+0/M8PtHnBmpqLQYzF4DBhJnreSLnLtL4/gUB436R4mLq4dNR41OMJxtt+mftb XFTHZalWKbY723j6h+6Z9PICq/5kN9eEFG736I7bgfsuS65hIlpa/7y7a/bechhWGdjp nx5NZebCTahkeZiG4AqSt7X6aD6RJGHAdjAj5yJK/7M8nmQXOByzFJB4fpVUpaIaTgOo CvqqdOCl85FqstJrXJwFvZAKmEWGUMmSwckQ56pIyNZSRNNW9wcFB7taTFSbL02yTecr O2Ew== X-Gm-Message-State: AOJu0Yy57vOnzCt5GOagu6GNXmqQ9u0u0YQ2TM6+ipKwd2mElGSTiYM4 M+wdoxNFnEhOW/a8IX4GYgWuG+1JvCn0h5tQ9sNOP3NGc132N3EtfIF3hQ== X-Gm-Gg: ASbGncsP5wFGTL6z7QdXa8GtHPFsVlv2n1/To78R7XcsVINCqmszjEImLI0YKk3cLWl b+hTgWNDZ0rn6+QcbyHO5X3/jQZJwBpZsVD9FLnBU4QrTk21caUQtMtWmhbcDYuNZSyOqYInz4q XylSaHCFDwFGr9Vr3ktcFmFRwadg9/wk0eUulpe7erdzdKi6fBmUwqhCbHeTbiCz7/OGhGpF1Ej Y8r2ujAQMZ4SEn6BooqQa8KwkDZjD4QTeLvT8TxiOy3WbG4xsFYK1O8zZ6b+seWtBMtnBSyW5Af ksi2RVchv0jc8IxGYw== X-Google-Smtp-Source: AGHT+IE7M52OSCY/5NVReCyc6MhxECoVs9+MRj91opRr834Lib9qdTZ/XuSabLHFESyji0ZqwsomBA== X-Received: by 2002:a17:907:9612:b0:aa6:32f9:d1a7 with SMTP id a640c23a62f3a-ab2abca7713mr155067566b.38.1736325753873; Wed, 08 Jan 2025 00:42:33 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:33 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/20] bc: update 1.07.1 -> 1.08.1 Date: Wed, 8 Jan 2025 09:42:12 +0100 Message-Id: <20250108084226.117178-6-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209528 From: Alexander Kanavin Upstream now ships pre-generated libmath.h, so we don't need to do so. Drop 0001-dc-fix-exit-code-of-q-command.patch (merged upstream). License-update: copyright years. Signed-off-by: Alexander Kanavin --- .../0001-dc-fix-exit-code-of-q-command.patch | 44 ------------------ meta/recipes-extended/bc/bc/libmath.h | 46 ------------------- .../bc/bc/no-gen-libmath.patch | 24 ---------- .../bc/{bc_1.07.1.bb => bc_1.08.1.bb} | 12 +---- 4 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch delete mode 100644 meta/recipes-extended/bc/bc/libmath.h delete mode 100644 meta/recipes-extended/bc/bc/no-gen-libmath.patch rename meta/recipes-extended/bc/{bc_1.07.1.bb => bc_1.08.1.bb} (72%) diff --git a/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch b/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch deleted file mode 100644 index 1ef797dd66a..00000000000 --- a/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e174b6e7d195d5a7465575641b7f68581f162574 Mon Sep 17 00:00:00 2001 -From: Li Zhou -Date: Thu, 27 Jun 2019 13:10:47 +0800 -Subject: [PATCH] dc: fix exit code of q command - -The exit code for "echo q | dc" is 1 for dc-1.4.1; -while the exit code for "echo q | dc" is 0 for dc-1.4. - -Here is the answer from ken@gnu.org: -dc-1.4 was right. There was a rewrite of a chunk of code for 1.4.1 to -fix a corner case in the Q command, and somehow the placement of the -clean-up label for the 'q' command got misplaced on the error-handling -branch instead of the clean-exit branch. The patch below fixes this -(it is committed for whenever the next bc/dc release gets made). - -Thanks for the report, - --Ken Pizzini - -Upstream-Status: Backport [Got the solution from maintainer] - -Signed-off-by: Li Zhou ---- - dc/eval.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dc/eval.c b/dc/eval.c -index 05a3d9e..bcab8db 100644 ---- a/dc/eval.c -+++ b/dc/eval.c -@@ -814,10 +814,10 @@ error_fail: - fprintf(stderr, "%s: ", progname); - perror("error reading input"); - return DC_FAIL; --reset_and_exit_quit: - reset_and_exit_fail: - signal(SIGINT, sigint_default); - return DC_FAIL; -+reset_and_exit_quit: - reset_and_exit_success: - signal(SIGINT, sigint_default); - return DC_SUCCESS; --- -1.9.1 - diff --git a/meta/recipes-extended/bc/bc/libmath.h b/meta/recipes-extended/bc/bc/libmath.h deleted file mode 100644 index 63e1acb9ef5..00000000000 --- a/meta/recipes-extended/bc/bc/libmath.h +++ /dev/null @@ -1,46 +0,0 @@ -{"@iK20:s2:p@r", -"@iF1,5.6,7,8,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C1,0:", -"s14:pl7:s0:pl14:RN1:l5:0Z4:l10:1+s10:pl5:K2:/s5:pl2:", -"1+s2:pJ3:N4:l13:s2:p1l5:+s14:pl5:s6:p1s8:pK2:s11:pN6:1B7:J5:N8:", -"l11:i11:pJ6:N7:l6:l5:*s6:l8:l11:*s8:/s9:pl9:0=Z9:l10:0>Z10:N11:", -"l10:d10:Z12:l14:l14:*s14:pJ11:N12:N10:l15:s2:pl12:Z13:1l14:/R", -"N13:l14:1/RN9:l14:l9:+s14:pJ8:N5:0R]@r", -"@iF2,5.7,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C2,0:", -"s14:pl7:s0:pl14:RN1:l5:0{Z2:1K10:l2:^-1/RN2:l2:s15:pK6:l2:+s2:", -"pK2:s10:p0s11:pN3:l5:K2:}Z4:l10:K2:*s10:pl5:cRs5:pJ3:N4:N5:l5:", -"K.5:{Z6:l10:K2:*s10:pl5:cRs5:pJ5:N6:l5:1-l5:1+/s13:s14:pl13:l13:", -"*s12:pK3:s11:pN8:1B9:J7:N10:l11:K2:+s11:pJ8:N9:l13:l12:*s13:l11:", -"/s9:pl9:0=Z11:l10:l14:*s14:pl15:s2:pl14:1/RN11:l14:l9:+s14:pJ10:N7:", -"0R]@r", -"@iF3,5.7,9,11,12,13,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C3,0:", -"s14:pl7:s0:pl14:RN1:l2:s15:pK1.1:l15:*K2:+s2:p1C4,0:s14:pl5:0", -"Z11:l15:K5:+s2:pK.2:C4,0:s6:pN11:", -"l15:K3:+s2:pN12:l5:K.2:>Z13:l10:1+s10:pl5:K.2:-1l5:K.2:*+/s5:", -"pJ12:N13:l5:s13:s14:pl5:nl5:*s16:pK3:s11:pN15:1B16:J14:N17:l11:", -"K2:+s11:pJ15:N16:l13:l16:*s13:l11:/s9:pl9:0=Z18:l15:s2:pl10:l6:", -"*l14:+l12:/RN18:l14:l9:+s14:pJ17:N14:0R]@r", -"@iF6,13,5.6,7,8,9,10,11,12,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl13:", -"l5:C6,00:s14:pl7:s0:pl14:RN1:l2:s15:p0s2:pl13:1/s13:pl13:0 - -diff --git a/bc/Makefile.am b/bc/Makefile.am -index d9d412e..f244241 100644 ---- a/bc/Makefile.am -+++ b/bc/Makefile.am -@@ -31,14 +31,6 @@ global.o: libmath.h - - fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o - --libmath.h: libmath.b $(fbcOBJ) $(LIBBC) -- echo '{0}' > libmath.h -- $(MAKE) global.o -- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS) -- ./fbc -c $(srcdir)/libmath.b libmath.h -- $(srcdir)/fix-libmath_h -- rm -f ./fbc ./global.o -- - sbcOBJ = main.o sbc.o scan.o execute.o global.o load.o storage.o util.o \ - warranty.o - sbc.o: sbc.c diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.08.1.bb similarity index 72% rename from meta/recipes-extended/bc/bc_1.07.1.bb rename to meta/recipes-extended/bc/bc_1.08.1.bb index 74387c50abe..473d78d8a77 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.08.1.bb @@ -6,19 +6,15 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://bc/bcdefs.h;endline=17;md5=4295c06df9e833519a342f7b5d43db06 \ - file://dc/dc.h;endline=18;md5=36b8c600b63ee8c3aeade2764f6b2a4b \ + file://dc/dc.h;endline=18;md5=bad31533d57fe5948c996f9ef6643206 \ file://lib/number.c;endline=20;md5=cf43068cc88f837731dc53240456cfaf" SECTION = "base" DEPENDS = "flex-native" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - file://no-gen-libmath.patch \ - file://libmath.h \ - file://0001-dc-fix-exit-code-of-q-command.patch \ file://run-ptest" -SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc" -SRC_URI[sha256sum] = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a" +SRC_URI[sha256sum] = "b71457ffeb210d7ea61825ff72b3e49dc8f2c1a04102bbe23591d783d1bfe996" inherit autotools texinfo update-alternatives ptest @@ -26,10 +22,6 @@ PACKAGECONFIG ??= "readline" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" -do_compile:prepend() { - cp -f ${UNPACKDIR}/libmath.h ${B}/bc/libmath.h -} - do_install_ptest() { install ${S}/Test/*.b ${D}${PTEST_PATH} } From patchwork Wed Jan 8 08:42:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55195 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2D56E7719C for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web11.14680.1736325756425456495 for ; Wed, 08 Jan 2025 00:42:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JLXZwH8S; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-aa67333f7d2so2409816666b.0 for ; Wed, 08 Jan 2025 00:42:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325755; x=1736930555; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z/eGnWSob+DrOnQPGYp9DMxyhbX1YSeYwlAN6iV5A4Q=; b=JLXZwH8SERdUw4GS8Bo+Tf1NRfkT3iX7O+HhIImD4SDOvUWX4GsTfYXaZKdXigC5XP Pj7pW3Veg45DY++oUiTrFRzCPngrJ5PE8Jxt3X2nfuCWTJ0qgj+DOrd6gXhgwFPfYk6u ZZ6yGnYkk0V8BQlJ3YP6IsRTVNxjVNAA5YxYXJfaPw75pMXqzy1S1ZA55HWkW7AA0arW H4QwlC0KwAaOdoaQ/WIWl2U0ICmYwDdgIwpl5BhS/kMf2EschHKtwZMUx75xJ0021faw R8GRyKwkEc6t83V5e+TJSmvSnVPa8BX9TBAp1j7LEELVIYUeCicfL/w5tIgq8LOnX3zI 05HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325755; x=1736930555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z/eGnWSob+DrOnQPGYp9DMxyhbX1YSeYwlAN6iV5A4Q=; b=lOK5XTohWuy2TT8wTrutyk12rofyF4BEhhkX0hrHFD9VIgWudD9/lTvO9kfK3L8lsS 8h0se/afsVJGFeV7T3OQaUdtMPBD2yJVsiOrMdUtWfr/jDzNeXxE7t3lr6nKng2gM1yD OXrNzVT0orfr0ehXZWu/uLFqSrtNVXqm2j6NXhyEqI7gjPYTw3ndh3XOIxt//GsO6N82 ju0o8shhsVGKVVciPfEhyNpFct3kZhoS90LvmmM/DRFeXKViqKOvyC7mxL2jS36Dxo8g DwrI7KDiQ/C+j3QVAs11oRe4SCfIvBRDZY97hDc7pybxIW/6sGxfJCtGCk1WS9V1l46y mhnA== X-Gm-Message-State: AOJu0YxwsLHJQUIpVN/pJ0I1lFACyCTVg6MkcHX0buT34Xd43o9LXT7Q V1QeG1vpRNIYWqorM/o2SCGub73+WrBJ7bpobTqbUolW1TMrVvMhskl6vw== X-Gm-Gg: ASbGncvLGnzXI57lLcmvxSFYAACuwJmQ3DJXAQV9aYuRv2G/IKfp3v44AxSjNMzxjQH 5lqWI7oeNehKB4Pq4KM35eemJvzsUBSBQDhK06oA4XOplM2jS7IoxY38rppcT6lHdlE2J5pXRd2 2QxPkOoQzwUbfyL0MTjAT+RR2ySwAeKt+vYKnH76J/zbvEag96zxjU9aqJ7Gu1hT5K67ZYWj//u /R6cXrMPCC9QDM5c3dkXbmaD63Ra301MEy0et5QO6x59U2CB4LIhMtnYxMLaWcbDee0TP6aVrX4 BVgOqx0GiftTgR2Myw== X-Google-Smtp-Source: AGHT+IE7gSMpmOdwkhEc9Hx8fbDHdm6ZmLe5p71y4vphR4wi0BhyJyvXFf8ifZcUB0Vv30BQ5BIwnQ== X-Received: by 2002:a17:907:d92:b0:aa6:19c9:ad08 with SMTP id a640c23a62f3a-ab2abdc108amr146794266b.48.1736325754572; Wed, 08 Jan 2025 00:42:34 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:34 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/20] go-helloworld: update to latest revision Date: Wed, 8 Jan 2025 09:42:13 +0100 Message-Id: <20250108084226.117178-7-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209529 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index 1e911e16940..4d2b5b63bc9 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" -SRCREV = "d7b0ac1278591aea848a99258ccfdee8e4d454c1" +SRCREV = "40afcb705d05179afce97d51b6677e46b5b48bf5" UPSTREAM_CHECK_COMMITS = "1" GO_IMPORT = "golang.org/x/example" From patchwork Wed Jan 8 08:42:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55196 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB50EE7719A for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web10.14216.1736325757029981839 for ; Wed, 08 Jan 2025 00:42:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WBZzUr10; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aa67ac42819so2387823166b.0 for ; Wed, 08 Jan 2025 00:42:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325755; x=1736930555; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=869i1WlyxR2N1ykWJHr1SaIc1BK8cPdIUXzwzkLSm5o=; b=WBZzUr10i55QSKmUVK+QaZS8hxvlA2b12SmssgwfhrbAWVZinlUiUCT05kk2z4+gs+ 3jHwhjfcR5HPgjbqcH59M0rhGLdxyLpp7W/Bo4Fb8X9TNCuXNh4kOBGWzL+GEM78Mg46 jGzgEAhZxvDfs4CdfhgEi6iGeAVErkcmEtmepE/zGlXzgcy3o2G1yDsBSCk+a86Yo4ih DJBew7TqMYZZgK7PiL0937XNKi59nQdeBsjoI43UPk57IwPyPgL6pmT72OFuIM/76/HM crRQ0HV20934nzTvxrEs5GN6TMiRJuN3s8NOpp7vKmCP4HUMmaVQ5WHg68SwyAwoES7r Rg/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325755; x=1736930555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=869i1WlyxR2N1ykWJHr1SaIc1BK8cPdIUXzwzkLSm5o=; b=TnpkD/r1IUmB6CzBkubuoUyc+PwjYcGQTlafduk8g5RgrLlE9uyaK6p+BGAsCGhq87 s5yrsyzkM/TqRHD21NWrIFW+kkUsmFL8jHzgy+9QN5+cJwuAPAAgSQIGdiwR7VjuoGYb 5Znc5kC+Qlt/oVkJUg1V6dmqrygZmZa+0ncvm+2fLockWs2RUeaBmB6vBVTDEviQ2mZ9 RPZvDMnCy9v+HC9IIoawbDTm2xFzr32jr1jq/7JtoRcQvq8xsHy8MKQ7F8QHSQTNDdGi DirpWOt7z4VcSx7bFDSabJMHaWFryrWW3DUQDtQ/ziePbLx8X0sfe9o+9ffW53RFf8XZ gegQ== X-Gm-Message-State: AOJu0Yy0JVVA0To0WF183sEDg92A+cKU+r4cs2jY8qEfyH99LlxQe55a eVqY10lhp78YKng0X2KY9TWwLVTHjaar2prvXLOHgVzjA+6om+2I8rGGPg== X-Gm-Gg: ASbGncvOMAOZobDk2xwg1l/iDLsmPbGxFDJuS2ZMo0QNZUBVxQodxTcw/AWQ3z41AFE hLKFy0MHb8svBd5ulbvgfacLNx2W6n8wEQrkiFxApmUTh6AUFZl1vnmgAATuyKBrbBwfGikiqFH NCV2EHKrZm2izHlXMYHK9G5Tz6h/t16HrtmCEwrCjo2eaNN3tGXA1Xjx+STSD7QzpIQsTP53UXA 5dcr8RLJ63mtwAlRfspemBIXcxoFdbXxMAzyTJWEGhJH66CpzipXSrcukclKY6/aeqrCzE+NVbK Z8AIBENX4sWiysodcw== X-Google-Smtp-Source: AGHT+IEqLSJbXmAuPnPMmptOlTKa76PpKWRqL9KD/ELEAEyM3mSCcvH3rqFr8v+Ad2P7Dd8RG8VIeg== X-Received: by 2002:a17:907:3d9f:b0:aae:ef24:888d with SMTP id a640c23a62f3a-ab2abc92349mr142210366b.55.1736325755214; Wed, 08 Jan 2025 00:42:35 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:34 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/20] procps: update 4.0.4 -> 4.0.5 Date: Wed, 8 Jan 2025 09:42:14 +0100 Message-Id: <20250108084226.117178-8-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209530 From: Alexander Kanavin Drop pidfd.patch (upstream significantly refactored the code; the patch can be tested only with very old kernels; upstream submission has not been followed up since initial MR creation). Add a patch to igt-gpu-tools to address a build failure with the new procps. Signed-off-by: Alexander Kanavin --- .../procps/procps/pidfd.patch | 42 ------------------- .../{procps_4.0.4.bb => procps_4.0.5.bb} | 3 +- ...c-address-procps-4.0.5-compatibility.patch | 30 +++++++++++++ .../igt-gpu-tools/igt-gpu-tools_1.30.bb | 4 +- 4 files changed, 34 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-extended/procps/procps/pidfd.patch rename meta/recipes-extended/procps/{procps_4.0.4.bb => procps_4.0.5.bb} (97%) create mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch diff --git a/meta/recipes-extended/procps/procps/pidfd.patch b/meta/recipes-extended/procps/procps/pidfd.patch deleted file mode 100644 index 23d1a3cd3ea..00000000000 --- a/meta/recipes-extended/procps/procps/pidfd.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Thu, 25 Apr 2024 13:33:15 +0000 -Subject: [PATCH] Fix pidfd_open detection - -This check for pidfd_open uses AC_CHECK_FUNC which just runs the specified code, but -src/pgrep.c checks HAVE_PIDFD_OPEN which will only be defined by AC_CHECK_FUNCS. - -Also pidfd_open is defined in sys/pidfd.h so that needs including. - -Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/229] -Signed-off-by: Ross Burton ---- - -diff --git a/configure.ac b/configure.ac -index fec27e3f..024731c7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -170,7 +170,7 @@ AC_TRY_COMPILE([#include ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - --AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [ -+AC_CHECK_FUNCS([pidfd_open], [enable_pidwait=yes], [ - AC_MSG_CHECKING([for __NR_pidfd_open]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include -diff --git a/src/pgrep.c b/src/pgrep.c -index d8e57dff..c5211aec 100644 ---- a/src/pgrep.c -+++ b/src/pgrep.c -@@ -44,7 +44,9 @@ - - #ifdef ENABLE_PIDWAIT - #include --#ifndef HAVE_PIDFD_OPEN -+#ifdef HAVE_PIDFD_OPEN -+#include -+#else - #include - #endif /* !HAVE_PIDFD_OPEN */ - #endif diff --git a/meta/recipes-extended/procps/procps_4.0.4.bb b/meta/recipes-extended/procps/procps_4.0.5.bb similarity index 97% rename from meta/recipes-extended/procps/procps_4.0.4.bb rename to meta/recipes-extended/procps/procps_4.0.5.bb index b02f74bd6bb..3be40c38a4e 100644 --- a/meta/recipes-extended/procps/procps_4.0.4.bb +++ b/meta/recipes-extended/procps/procps_4.0.5.bb @@ -14,9 +14,8 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ file://sysctl.conf \ - file://pidfd.patch \ " -SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" +SRCREV = "f46b2f7929cdfe2913ed0a7f585b09d6adbf994e" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch new file mode 100644 index 00000000000..7db773fe0db --- /dev/null +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch @@ -0,0 +1,30 @@ +From 173cdf607bf39c13eb4d4b0dadcb9dc6add76014 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 7 Jan 2025 09:54:07 +0100 +Subject: [PATCH] lib/igt_aux.c: address procps 4.0.5 compatibility + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/164] +Signed-off-by: Alexander Kanavin +--- + lib/igt_aux.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lib/igt_aux.c b/lib/igt_aux.c +index 3407cc4f2..7028d3f57 100644 +--- a/lib/igt_aux.c ++++ b/lib/igt_aux.c +@@ -1358,10 +1358,10 @@ static bool get_process_ids(struct igt_process *prcs) + prcs->comm = NULL; + prcs->stack = procps_pids_get(prcs->info, PIDS_FETCH_TASKS_ONLY); + if (prcs->stack) { +- prcs->tid = PIDS_VAL(EU_PID, s_int, prcs->stack, prcs->info); +- prcs->euid = PIDS_VAL(EU_EUID, s_int, prcs->stack, prcs->info); +- prcs->egid = PIDS_VAL(EU_EGID, s_int, prcs->stack, prcs->info); +- prcs->comm = PIDS_VAL(EU_CMD, str, prcs->stack, prcs->info); ++ prcs->tid = PIDS_VAL(EU_PID, s_int, prcs->stack); ++ prcs->euid = PIDS_VAL(EU_EUID, s_int, prcs->stack); ++ prcs->egid = PIDS_VAL(EU_EGID, s_int, prcs->stack); ++ prcs->comm = PIDS_VAL(EU_CMD, str, prcs->stack); + } + #endif + return prcs->tid != 0; diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb index a302e1877fc..dad752cb199 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb @@ -11,7 +11,9 @@ inherit meson pkgconfig SRCREV = "edf352a96646c8d793f0c1eb11795112f9bde725" -SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master" +SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master \ + file://0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch \ + " S = "${WORKDIR}/git" From patchwork Wed Jan 8 08:42:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55192 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96475E77188 for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web11.14681.1736325757853425564 for ; Wed, 08 Jan 2025 00:42:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YeXl5N2d; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-aae81f4fdc4so2836860766b.0 for ; Wed, 08 Jan 2025 00:42:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325756; x=1736930556; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/9obYTSJumEyFROGRrD9sPVvNHgneUg22xFMjQjFK9c=; b=YeXl5N2dRENpMs6RvsyQl6ahD93rJT08IO/4ObhGlanEc/qTI2XwXjLPeWMroJjiOY ygvfRr4BVw/V1GuOWkr+9RLPvfNVXtueLwzlH8R0qnc5Pnup46fulZCb91D3SKaRI84p eVkp8jjEyNE2MesgO8ISPE3CDPbwv0rKp5VY8+PFR8ulMMTAaTkyBRR4lFyx5ApIwfcS 2xid+mG27GvPJDtMApHp27V0lFTxcSEcNOHZ0qiT5Flj3EEVG9fJCDUOsY8MeT0RhpIV UJH9LUV2Si9MxJer510SxlYbW6qLDbBmzhuvp4jZgr8GaRc5ISr9nKLaElUtRJVkxJxK kElg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325756; x=1736930556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/9obYTSJumEyFROGRrD9sPVvNHgneUg22xFMjQjFK9c=; b=hFgS+JG3lgOJhLE2oynYLDNnQ6kK7gSog74G1epQ4okokISlK7rJbHOFQIAo+m4d2V 7paH4mzTLS/Iek9TpSx/tYqx5hEdPSA5Ex+VXGLl/3V08mLCOqmEfQBSWOvQq/Nn3G4r ydaodvi4z3FjvOjYhO8MlncZHf4JMvaDgdQ4gIhq3gwgqldXQptaCLUbik8Sn6lZ4dKS MfVbMZutGzgkIv2EtjNLZipG6BrNNK+GmC5sT7hbt28G4MT9b52RpM7QrQeOaIeU0SQI 8pI5cc7JOAmkI+ww6m1OAI+bu5NtGd1eBErf8ysXeGdWQieeAS1midWsJ2ZA4TQFObpN fK2A== X-Gm-Message-State: AOJu0Yzat17rPnSNY6uD2H0iXfAJHTaXs5Fi4LFa6FHKa55lumtk+5bi bFUSl32lmNLgE6EGmxiYEwBCHDn2iRjM0ucc2jgz++p15w8JS4zef2zbQw== X-Gm-Gg: ASbGncsHtn3KYDKJtPBKrvMt5/zm5Uf8NMvsIHSsJw9+x70GOynTIdkKX771uiDPynJ jDW2fuu5AFLzME6/SXyFeszn79O4amwaC/JWfwlA1bFAb61IT4ngAuE7wBIsuqSTfWZvXOaE1Hg ccZ8Ap6sjXZuPosO2x23pH/JNdRgHUUEliZxXud2lGeYXY4pFD6HqDO+SQR5lKgLmVJ+K6R7X+7 J/1GzuvDlsY+1Dqxpl5+ZAp15we9e7ftAyiuQ1wvt8rkUUvgYqcTk4POkYY3zQGp+24bL5E1iCh drqgsi5B6e5meW/zuw== X-Google-Smtp-Source: AGHT+IEsMeXwO9t0IseTurjkNrAt08Gyvh4iGV/2vvLO3mJrswIneoLBuAz7CnQ+6M5kXWkU2YYEuw== X-Received: by 2002:a17:907:d1b:b0:aa6:ac9b:681f with SMTP id a640c23a62f3a-ab2abcab4c1mr205960966b.43.1736325755920; Wed, 08 Jan 2025 00:42:35 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:35 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/20] texinfo: update 7.1.1 -> 7.2 Date: Wed, 8 Jan 2025 09:42:15 +0100 Message-Id: <20250108084226.117178-9-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209531 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../texinfo/0001-Makefile.am-do-not-build-manpages.patch | 8 ++++---- .../texinfo/{texinfo_7.1.1.bb => texinfo_7.2.bb} | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-extended/texinfo/{texinfo_7.1.1.bb => texinfo_7.2.bb} (95%) diff --git a/meta/recipes-extended/texinfo/texinfo/0001-Makefile.am-do-not-build-manpages.patch b/meta/recipes-extended/texinfo/texinfo/0001-Makefile.am-do-not-build-manpages.patch index e3e8f30b5e7..cf0529db980 100644 --- a/meta/recipes-extended/texinfo/texinfo/0001-Makefile.am-do-not-build-manpages.patch +++ b/meta/recipes-extended/texinfo/texinfo/0001-Makefile.am-do-not-build-manpages.patch @@ -15,12 +15,12 @@ diff --git a/Makefile.am b/Makefile.am index f733797..1013fcf 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -66,7 +66,7 @@ if HOST_IS_WINDOWS +@@ -76,7 +76,7 @@ endif endif - SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo texindex util \ -- doc man -+ doc + SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo \ +- texindex util doc man ++ texindex util doc SUBDIRS += js endif diff --git a/meta/recipes-extended/texinfo/texinfo_7.1.1.bb b/meta/recipes-extended/texinfo/texinfo_7.2.bb similarity index 95% rename from meta/recipes-extended/texinfo/texinfo_7.1.1.bb rename to meta/recipes-extended/texinfo/texinfo_7.2.bb index cc8683f085b..784f67f65b5 100644 --- a/meta/recipes-extended/texinfo/texinfo_7.1.1.bb +++ b/meta/recipes-extended/texinfo/texinfo_7.2.bb @@ -34,7 +34,7 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ ${TARGET_PATCH} \ " -SRC_URI[sha256sum] = "a46b46b54fd79641a8af5be4ad525788956ccf9798d3113396abeafa9020ef63" +SRC_URI[sha256sum] = "e86de7dfef6b352aa1bf647de3a6213d1567c70129eccbf8977706d9c91919c8" tex_texinfo = "texmf/tex/texinfo" @@ -75,7 +75,7 @@ FILES:info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \ ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" -FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" +FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo ${datadir}/texi2any" RDEPENDS:${PN} = "perl" FILES:${PN}-doc = "${infodir}/texi* \ ${datadir}/${tex_texinfo} \ From patchwork Wed Jan 8 08:42:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55194 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E47DE7719B for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mx.groups.io with SMTP id smtpd.web10.14217.1736325758448991191 for ; Wed, 08 Jan 2025 00:42:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fi7pWQSx; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5d3e829ff44so1222224a12.0 for ; Wed, 08 Jan 2025 00:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325757; x=1736930557; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c8yIz/WETDDUvKTqavqmQz5xvSjSwmSGXOdawiCx/40=; b=fi7pWQSxKCxOCElSlGRi1nFYHyfkpKofyqo/tBWFbdCZvKTYipCvE0xM3vKklLMZrz ymRl9vWCv2f6eDEz1EcMU1iU/xfP27wx9DaZgIuhbNnan43r01uBBXVhyhUcRaBOEJuW ddue0d2AT1+PsAI0g52dXM2aVeCwzMJZHn3Lvn/1X7PKsMcb043AI2GSKRdFwgbhq+vn XRI85905AP1npPvUtLpmVOt3Penazc1/AmDmeCb+GX6oaTYLAmRIjx3wU5o+2KVIbh4X C0MgAeqagcKmTTRziw19cD+0sCLUpfZzQpwfURrefZvhzQrVCaAdY44xZWpF40+oqnsJ g/bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325757; x=1736930557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c8yIz/WETDDUvKTqavqmQz5xvSjSwmSGXOdawiCx/40=; b=KCaLzodYpZg40/iZAP4YeRk8akF+QukUi1slEVffIS1sizKJYhgIiUklD8/flnuQ0z yqEQpa5vMlI/JX84ixs3ZT6xFlK52LfvctPSR2lLMBjoEK6ue3cnqe+V7LIdbiA+A1TV xUOa8EEe9f6fNtBRpGaYmyTNhPeOTYNaioRHW9o48QFqnRF0xiGw+G61fSs3fQiwfq5N afEaYMPJPjiNcoisefWB1fKC8WsFS/kN0N24TSbnSTLFV//CQaHo8HbAS8wfIbkIc6l+ rpHBOKnz6uAQ+lIJ4/2iQti/5FRrvqt1NUwhwPqJFe0TtC2LcFpUZ8WYmghw/J5YWgu8 0dRg== X-Gm-Message-State: AOJu0Yxyw5sTCIuJLCbl94kgVOVRA2S3/tcI1aXdyyXQr+a62fy7TLT0 7JrA5IEYekHnDwf1GoOyeWWnqOUoVfyafnR8GGAGdUT97c2nex3/fuw/wg== X-Gm-Gg: ASbGncuv7V3tts6kRZyQc39TBsvPl/6UB9OE/9sHp3c31OT5flsg8oCJPOfIBvMi2Ya YdJQHQcursJBJPn+/qVhXH98GqO8rDIuVKLc2vw5E9NeFwhxtCNkD+YJ9P7lCPJP5OjBu4zg3YS t5yqKYUQoFWMlLwyFUlbA9y0fWgsLW7AJ8sFI37BgdIuncrSBTyEqf3XgYTH696penZPpSTT1mz iA+6voQpgl3A+1EAxcmwbB8RK7MR2pFsFtOEwAc3bXwnoUX+reffUP+Ly0LCxjUcvD5emq9fD+6 6L1Wn1NXLWWc3Ko/QQ== X-Google-Smtp-Source: AGHT+IEwDVZWLm682PkLgUv6syS8ep0Dd0GFUrH0XoZrlENlhT4RyUV3joe5pyMSxi7o6UKPBqbFsA== X-Received: by 2002:a17:907:72cf:b0:aac:333:a0a1 with SMTP id a640c23a62f3a-ab2a7ed9741mr152157366b.32.1736325756689; Wed, 08 Jan 2025 00:42:36 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:36 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/20] vulkan-samples: update to latest revision Date: Wed, 8 Jan 2025 09:42:16 +0100 Message-Id: <20250108084226.117178-10-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209532 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 2dd4bba5230..7cd6b9c27ea 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -10,7 +10,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protoc " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "4838e02a4b08236931bec0532fc26ee3871b466a" +SRCREV = "04f03b32b860ab25ab2731433597d9a23929c386" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" From patchwork Wed Jan 8 08:42:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55202 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9949C02184 for ; Wed, 8 Jan 2025 08:42:39 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web11.14682.1736325759286748662 for ; Wed, 08 Jan 2025 00:42:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RO+O1yUd; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-aafc9d75f8bso402729766b.2 for ; Wed, 08 Jan 2025 00:42:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325758; x=1736930558; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QxLae0VSZUcGWjtrB/07j5hGq2j+8k/WFCEuWCqlLGo=; b=RO+O1yUdhp2esDdJwRWZle/7acKmitgwUU2eN1NCN0wF8ArwJc+qMk0f+VilxjczAk ra/ZTf4QSKPCnqbBWjohfMXPPTJcrkSQXdod6QwqTXYId3IDfzOUqE4AagjWVgsUHy4o C52fHhtGO/Rpe9X2t2WhHeCGCeMr0whSrVoOKtG3IyYtdZl2pA3Ehc+7Oy4YhGjpvqiC 5RPAtdoNDhCTJxSrTAZ469dU/qJ/A7O8nIE+Q3RvovpSHIEQnKx+RwDCb7o0qVvS4qks Z7lbCgYBWcRJwVh6RAyvE+sNV0k5kMrZD8wJoGtWjcz72GAJo1ULOWNTYSkzQ+6JiySf iXqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325758; x=1736930558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QxLae0VSZUcGWjtrB/07j5hGq2j+8k/WFCEuWCqlLGo=; b=dZ4QvUi1QBEIsGmSDkY7C1He5ufDV5wyoFQSWHrP1AiqW8y+dUwuKBwbpVozCBmJlx DV+hpj975L099etjvUmQ6f5I46N8UgQdQ8+jBIynZfJHuUxhJgJNCht6lGH53WPe7oG0 +Ys76YsBstRfE/g62FWl4yyN6W6ynvKbyPMTR2o31Y1syws0jzjMUA4EMWuEnR37BECW zOyPmi3xra0Xcx2Iywaexz4b4awrZGi7mPvk3ZmNCEFuJKHc9RpC736ze9/1pwOXB7zR xu3mrlsT9Yk8TaHz0NVfXM+wawkeeUNwzC7bcOk69hSZGWk9gYfCHhHF5rkf1G6IBdqG pX8Q== X-Gm-Message-State: AOJu0YwP5nFYoQZ4usXqAMeU9yU0zojTyZdbXVuc5ELj7gF8lL5mx+3R a0ugyiqxNHjqbAbRF30X41wbb2soYiolcOhOwu00bzq+f3EI7TgC0lyKmA== X-Gm-Gg: ASbGnct3G1JTvmsd5hQYOvf/hiEjf1POoVIVtSDbwsz9tZN+WVyTse4bmNQrIKBMoRw AFIEqmWBHvTtEnzOBpSaAh1ujguqIQTAZTXx+Xv+LUp/rF31kWHwKzTzCp1B0XfSPYR1b4hHbCo AVmU/tsIhsa03utaqUnTe11UDk3N1KU/r78zVSlvHw2PBT4UEKXJP2TUNxH2/F4sdTReeR81Qwg 0uxFLQtgoBl2EcGXjzDfgx6iK6hTg9TtYzeXKFrMlfyoOO6fxqglbNzh89AV2H7AgmcPZPDM3tc urVQD+SgfAu6x5pw0w== X-Google-Smtp-Source: AGHT+IGIMFoEw3uaJKWlWie/mQNl6cQDV3NJjZetl0lQqbIfz72P5LOOBZPm3ciNFLr0u1iDvadbxw== X-Received: by 2002:a17:907:9449:b0:aa6:668b:2733 with SMTP id a640c23a62f3a-ab2ab74100amr132420466b.33.1736325757385; Wed, 08 Jan 2025 00:42:37 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:37 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/20] boost: update 1.86.0 -> 1.87.0 Date: Wed, 8 Jan 2025 09:42:17 +0100 Message-Id: <20250108084226.117178-11-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209533 From: Alexander Kanavin Backport a kea patch to address 1.87.0 compatibility. Signed-off-by: Alexander Kanavin --- .../0001-Update-asiolink-for-boost-1.87.patch | 190 ++++++++++++++++++ meta/recipes-connectivity/kea/kea_2.6.1.bb | 1 + .../{boost-1.86.0.inc => boost-1.87.0.inc} | 2 +- ...1.86.0.bb => boost-build-native_1.87.0.bb} | 0 ...h-instruction-set-flags-we-do-that-o.patch | 2 +- ...01-dont-setup-compiler-flags-m32-m64.patch | 2 +- .../boost-math-disable-pch-for-gcc.patch | 8 +- .../{boost_1.86.0.bb => boost_1.87.0.bb} | 0 8 files changed, 198 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch rename meta/recipes-support/boost/{boost-1.86.0.inc => boost-1.87.0.inc} (90%) rename meta/recipes-support/boost/{boost-build-native_1.86.0.bb => boost-build-native_1.87.0.bb} (100%) rename meta/recipes-support/boost/{boost_1.86.0.bb => boost_1.87.0.bb} (100%) diff --git a/meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch b/meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch new file mode 100644 index 00000000000..794726f1f10 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch @@ -0,0 +1,190 @@ +From dab0f3daafb760ace0d4091f74ff90edb225ca02 Mon Sep 17 00:00:00 2001 +From: q66 +Date: Sun, 15 Dec 2024 03:04:53 +0100 +Subject: [PATCH] Update asiolink for boost 1.87 + +Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2523] +Signed-off-by: Alexander Kanavin +--- + src/lib/asiolink/io_address.cc | 4 ++-- + src/lib/asiolink/io_service.cc | 8 ++++---- + src/lib/asiolink/tcp_endpoint.h | 2 +- + src/lib/asiolink/udp_endpoint.h | 2 +- + src/lib/asiolink/unix_domain_socket.cc | 16 ++++++++-------- + src/lib/dhcp/iface_mgr.cc | 2 +- + 6 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/src/lib/asiolink/io_address.cc b/src/lib/asiolink/io_address.cc +index 43459bf..06b7d3d 100644 +--- a/src/lib/asiolink/io_address.cc ++++ b/src/lib/asiolink/io_address.cc +@@ -37,7 +37,7 @@ IOAddress::Hash::operator()(const IOAddress &io_address) const { + // because we'd like to throw our own exception on failure. + IOAddress::IOAddress(const std::string& address_str) { + boost::system::error_code err; +- asio_address_ = ip::address::from_string(address_str, err); ++ asio_address_ = ip::make_address(address_str, err); + if (err) { + isc_throw(IOError, "Failed to convert string to address '" + << address_str << "': " << err.message()); +@@ -116,7 +116,7 @@ IOAddress::isV6Multicast() const { + uint32_t + IOAddress::toUint32() const { + if (asio_address_.is_v4()) { +- return (asio_address_.to_v4().to_ulong()); ++ return (asio_address_.to_v4().to_uint()); + } else { + isc_throw(BadValue, "Can't convert " << toText() + << " address to IPv4."); +diff --git a/src/lib/asiolink/io_service.cc b/src/lib/asiolink/io_service.cc +index 411de64..cc28d24 100644 +--- a/src/lib/asiolink/io_service.cc ++++ b/src/lib/asiolink/io_service.cc +@@ -30,7 +30,7 @@ public: + /// @brief The constructor. + IOServiceImpl() : + io_service_(), +- work_(new boost::asio::io_service::work(io_service_)) { ++ work_(boost::asio::make_work_guard(io_service_)) { + }; + + /// @brief The destructor. +@@ -92,7 +92,7 @@ public: + + /// @brief Restarts the IOService in preparation for a subsequent @ref run() invocation. + void restart() { +- io_service_.reset(); ++ io_service_.restart(); + } + + /// @brief Removes IO service work object to let it finish running +@@ -115,12 +115,12 @@ public: + /// + /// @param callback The callback to be run on the IO service. + void post(const std::function& callback) { +- io_service_.post(callback); ++ boost::asio::post(io_service_, callback); + } + + private: + boost::asio::io_service io_service_; +- boost::shared_ptr work_; ++ boost::asio::executor_work_guard work_; + }; + + IOService::IOService() : io_impl_(new IOServiceImpl()) { +diff --git a/src/lib/asiolink/tcp_endpoint.h b/src/lib/asiolink/tcp_endpoint.h +index 8ebd575..7c8cb35 100644 +--- a/src/lib/asiolink/tcp_endpoint.h ++++ b/src/lib/asiolink/tcp_endpoint.h +@@ -42,7 +42,7 @@ public: + /// \param port The TCP port number of the endpoint. + TCPEndpoint(const IOAddress& address, const unsigned short port) : + asio_endpoint_placeholder_( +- new boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address.toText()), ++ new boost::asio::ip::tcp::endpoint(boost::asio::ip::make_address(address.toText()), + port)), + asio_endpoint_(*asio_endpoint_placeholder_) + {} +diff --git a/src/lib/asiolink/udp_endpoint.h b/src/lib/asiolink/udp_endpoint.h +index f960bf3..2a3da9f 100644 +--- a/src/lib/asiolink/udp_endpoint.h ++++ b/src/lib/asiolink/udp_endpoint.h +@@ -42,7 +42,7 @@ public: + /// \param port The UDP port number of the endpoint. + UDPEndpoint(const IOAddress& address, const unsigned short port) : + asio_endpoint_placeholder_( +- new boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(address.toText()), ++ new boost::asio::ip::udp::endpoint(boost::asio::ip::make_address(address.toText()), + port)), + asio_endpoint_(*asio_endpoint_placeholder_) + {} +diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc +index f43e1c9..43ff3c8 100644 +--- a/src/lib/asiolink/unix_domain_socket.cc ++++ b/src/lib/asiolink/unix_domain_socket.cc +@@ -83,7 +83,7 @@ public: + /// @param buffer Buffers holding the data to be sent. + /// @param handler User supplied callback to be invoked when data have + /// been sent or sending error is signalled. +- void doSend(const boost::asio::const_buffers_1& buffer, ++ void doSend(const boost::asio::const_buffer& buffer, + const UnixDomainSocket::Handler& handler); + + +@@ -103,7 +103,7 @@ public: + /// @param ec Error code returned as a result of sending the data. + /// @param length Length of the data sent. + void sendHandler(const UnixDomainSocket::Handler& remote_handler, +- const boost::asio::const_buffers_1& buffer, ++ const boost::asio::const_buffer& buffer, + const boost::system::error_code& ec, + size_t length); + +@@ -127,7 +127,7 @@ public: + /// @param buffer A buffer into which the data should be received. + /// @param handler User supplied callback invoked when data have been + /// received on an error is signalled. +- void doReceive(const boost::asio::mutable_buffers_1& buffer, ++ void doReceive(const boost::asio::mutable_buffer& buffer, + const UnixDomainSocket::Handler& handler); + + /// @brief Local handler invoked as a result of asynchronous receive. +@@ -146,7 +146,7 @@ public: + /// @param ec Error code returned as a result of asynchronous receive. + /// @param length Size of the received data. + void receiveHandler(const UnixDomainSocket::Handler& remote_handler, +- const boost::asio::mutable_buffers_1& buffer, ++ const boost::asio::mutable_buffer& buffer, + const boost::system::error_code& ec, + size_t length); + +@@ -197,7 +197,7 @@ UnixDomainSocketImpl::asyncSend(const void* data, const size_t length, + } + + void +-UnixDomainSocketImpl::doSend(const boost::asio::const_buffers_1& buffer, ++UnixDomainSocketImpl::doSend(const boost::asio::const_buffer& buffer, + const UnixDomainSocket::Handler& handler) { + auto local_handler = std::bind(&UnixDomainSocketImpl::sendHandler, + shared_from_this(), +@@ -207,7 +207,7 @@ UnixDomainSocketImpl::doSend(const boost::asio::const_buffers_1& buffer, + + void + UnixDomainSocketImpl::sendHandler(const UnixDomainSocket::Handler& remote_handler, +- const boost::asio::const_buffers_1& buffer, ++ const boost::asio::const_buffer& buffer, + const boost::system::error_code& ec, + size_t length) { + // The asynchronous send may return EWOULDBLOCK or EAGAIN on some +@@ -230,7 +230,7 @@ UnixDomainSocketImpl::asyncReceive(void* data, const size_t length, + } + + void +-UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffers_1& buffer, ++UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffer& buffer, + const UnixDomainSocket::Handler& handler) { + auto local_handler = std::bind(&UnixDomainSocketImpl::receiveHandler, + shared_from_this(), +@@ -240,7 +240,7 @@ UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffers_1& buffer, + + void + UnixDomainSocketImpl::receiveHandler(const UnixDomainSocket::Handler& remote_handler, +- const boost::asio::mutable_buffers_1& buffer, ++ const boost::asio::mutable_buffer& buffer, + const boost::system::error_code& ec, + size_t length) { + // The asynchronous receive may return EWOULDBLOCK or EAGAIN on some +diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc +index 01a1d63..419268b 100644 +--- a/src/lib/dhcp/iface_mgr.cc ++++ b/src/lib/dhcp/iface_mgr.cc +@@ -1034,7 +1034,7 @@ IfaceMgr::getLocalAddress(const IOAddress& remote_addr, const uint16_t port) { + } + + // Create socket that will be used to connect to remote endpoint. +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + boost::asio::ip::udp::socket sock(io_service); + + boost::system::error_code err_code; diff --git a/meta/recipes-connectivity/kea/kea_2.6.1.bb b/meta/recipes-connectivity/kea/kea_2.6.1.bb index 4f8c4124cb4..19e07f5da39 100644 --- a/meta/recipes-connectivity/kea/kea_2.6.1.bb +++ b/meta/recipes-connectivity/kea/kea_2.6.1.bb @@ -19,6 +19,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ file://0001-Replace-Name-NameString-with-vector-of-uint8_t.patch \ file://0002-Fix-unittests-Typo-in-Name-Name-append-to-ndata_-not.patch \ + file://0001-Update-asiolink-for-boost-1.87.patch \ " SRC_URI[sha256sum] = "d2ce14a91c2e248ad2876e29152d647bcc5e433bc68dafad0ee96ec166fcfad1" diff --git a/meta/recipes-support/boost/boost-1.86.0.inc b/meta/recipes-support/boost/boost-1.87.0.inc similarity index 90% rename from meta/recipes-support/boost/boost-1.86.0.inc rename to meta/recipes-support/boost/boost-1.87.0.inc index 7113a500491..c6e55b239eb 100644 --- a/meta/recipes-support/boost/boost-1.86.0.inc +++ b/meta/recipes-support/boost/boost-1.87.0.inc @@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "https://archives.boost.io/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b" +SRC_URI[sha256sum] = "af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "release/(?P.*)/source/" diff --git a/meta/recipes-support/boost/boost-build-native_1.86.0.bb b/meta/recipes-support/boost/boost-build-native_1.87.0.bb similarity index 100% rename from meta/recipes-support/boost/boost-build-native_1.86.0.bb rename to meta/recipes-support/boost/boost-build-native_1.87.0.bb diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 78f652f619c..04bede45787 100644 --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -1,4 +1,4 @@ -From f88354966fe3af33fd6d9ec889a8e3926b886a8a Mon Sep 17 00:00:00 2001 +From e2cc24d6d8b7b24a6d0a30c52c7ad69a001a0ad5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 18 Dec 2018 15:42:57 +0100 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that diff --git a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch index 8f130348b0a..db1ee038987 100644 --- a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +++ b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch @@ -1,4 +1,4 @@ -From 7130850d74863d1e9a0ae3e85462f1466bdf6d88 Mon Sep 17 00:00:00 2001 +From b0728812241c048907e6f1ba168292cd9948347d Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 14 Nov 2019 10:13:53 +0800 Subject: [PATCH] dont setup compiler flags -m32/-m64 diff --git a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch index dde21fa0763..ad90d96dddf 100644 --- a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch +++ b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch @@ -1,4 +1,4 @@ -From c6009cdc1fe76db0092443593396e4d5f0eaa86b Mon Sep 17 00:00:00 2001 +From e7491f9874411fd9855957812ba9bac948a61356 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 23 Sep 2016 01:04:50 -0700 Subject: [PATCH] boost-math: disable pch for gcc @@ -14,11 +14,11 @@ Signed-off-by: Jackie Huang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 -index 6549e06b7..342cbf0b1 100644 +index 500c77363..504d7d8c6 100644 --- a/libs/math/build/Jamfile.v2 +++ b/libs/math/build/Jamfile.v2 -@@ -13,7 +13,7 @@ project - intel-win:-nologo +@@ -15,7 +15,7 @@ project + intel-win:-nologo #intel-linux:off intel-darwin:off - gcc,windows:off diff --git a/meta/recipes-support/boost/boost_1.86.0.bb b/meta/recipes-support/boost/boost_1.87.0.bb similarity index 100% rename from meta/recipes-support/boost/boost_1.86.0.bb rename to meta/recipes-support/boost/boost_1.87.0.bb From patchwork Wed Jan 8 08:42:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5A8EE77199 for ; Wed, 8 Jan 2025 08:42:49 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web11.14683.1736325759959130121 for ; Wed, 08 Jan 2025 00:42:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=cgqhFmbQ; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-aa689a37dd4so498377066b.3 for ; Wed, 08 Jan 2025 00:42:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325758; x=1736930558; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=erSZY4mgV8Ro1OSMbDGB6bSKAfjixguW9yaQrWFm7rs=; b=cgqhFmbQliHcAW+KDKFhOnirwl5D5yGclvX9QF7EJDhxXJzOjQqfy13l39jqvmc6kM JK5e/RQI2g+LQGuI5Hhus6a1+14TuwXezZDe57XZengokXjY5ui1en3UHQzwl87XdMLA p0x4Rjnz0XXMFOWc5okvFlJ4Aplf9suWB/ibw8v9Uz+Sq5ee6AEDFfWZ54SyHJ5mykC3 RuvwYuCTR7EJkXOHBEhkD/ybouJMMfUKc1MuTbiyG/rI0Grid3ll8JBJIF3fYNNM38yP lTdeYjCyG4iJgd5apcaTvb1bTXZ3md5RtuuCluN83aFu3xsffsu615lYyZ5/II1iJcWM 1arg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325758; x=1736930558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=erSZY4mgV8Ro1OSMbDGB6bSKAfjixguW9yaQrWFm7rs=; b=QE+Pih3EUj8E15dkx9HG8K/PjNdkc7Aq3tTbI1C+SbX3XupyVQ4GCdMqe2Km069Quf rWe2trpqIqBe6UAR9JL3gmPLLLAUtnliEV47wDKqny2cD4lw32o6nBfkVkUmr0vgJIIz DLPhFJEuFnwHz0crXO0OM7GRpNXl0ybpge+FQTMSzREmKlrakCYPJEtoOQjNKzwOD9LT knJd/MdyfqV37Y8DwekwRgsYRVL4syMa7jw3ya6inoL70hWu5V2/UBElUsArctP5GuSC UJ6AU87z1UuphTtUKa0+eznbHYvw6y/HvJYI7FWI+Bg70o/CBPVVy0eBIpMMg8Y3cMY9 fS1A== X-Gm-Message-State: AOJu0Yw9c3T/DDFgwj+8K0WbLW/LXu+GTfeSiuUbpNZXiMkDk9S1/R35 p42nTioBWV9lyvV9x5bpDE2Htpn2xKHrYPlhPz46DiUkxUe8YXrunDXf8g== X-Gm-Gg: ASbGncuiktNuYgD2+KPRfqVALJxOvhoen2toYN560P6E2/sKdMWQL8Ga3IFxAnc3Y6i yVSUJB/ZJtsCC7RM9TVZh+2QRBKiiX9Mk74iq047fjDbSTLCXYnkf52ftAF7Yuh3bw9SeLJeMJq twCPTs7yu0slIFA2jx8s5r1tA01c0+un94u8bcrOPGsQ+GCafnF+AHdxlx9yOCeuooUTO1RxG3j ACnLdXbes8VyrVNaNvC5xoPSM8BaSUHd6EaFrFJL/IyWpa8Nng2TSU0MfVKUbN/GHpOSbEJHFbE lRUDPSPBj6oSLE5BLw== X-Google-Smtp-Source: AGHT+IFo2ngjujFUCiOjsPH3Etbl/VHuVdKSbra4dysdAmnOWdAGbVw0gpSYCsL86O8AK3z3uBF8iw== X-Received: by 2002:a17:907:948b:b0:aa6:6f92:74b1 with SMTP id a640c23a62f3a-ab2ab6fd565mr148916966b.13.1736325758140; Wed, 08 Jan 2025 00:42:38 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:37 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/20] libgit2: update 1.8.4 -> 1.9.0 Date: Wed, 8 Jan 2025 09:42:18 +0100 Message-Id: <20250108084226.117178-12-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209534 From: Alexander Kanavin Do not install cmake files; if someone wants them, please make them reproducible and not hardcode-installed into /usr/lib. Signed-off-by: Alexander Kanavin --- ...eLists.txt-install-cmake-files-into-.patch | 32 +++++++++++++++++++ .../{libgit2_1.8.4.bb => libgit2_1.9.0.bb} | 10 ++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch rename meta/recipes-support/libgit2/{libgit2_1.8.4.bb => libgit2_1.9.0.bb} (60%) diff --git a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch b/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch new file mode 100644 index 00000000000..ae48524e0d4 --- /dev/null +++ b/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch @@ -0,0 +1,32 @@ +From 8ca35649c33d0d2fcdcd573ce6a9edd91c77e4da Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 7 Jan 2025 18:56:19 +0100 +Subject: [PATCH] src/libgit2/CMakeLists.txt: install cmake files into + configured libdir + +libdir can be something else than /usr/lib, e.g. /usr/lib64 or similar. + +Upstream-Status: Submitted [https://github.com/libgit2/libgit2/pull/7004] +Signed-off-by: Alexander Kanavin +--- + src/libgit2/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt +index a7d3c7ca4..16b3a23d9 100644 +--- a/src/libgit2/CMakeLists.txt ++++ b/src/libgit2/CMakeLists.txt +@@ -119,11 +119,11 @@ configure_file(config.cmake.in + install(FILES + "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake" + "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake" +- DESTINATION "lib/cmake/${PROJECT_NAME}") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + install( + EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME} + NAMESPACE "${PROJECT_NAME}::" +- DESTINATION "lib/cmake/${PROJECT_NAME}") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + # Install + diff --git a/meta/recipes-support/libgit2/libgit2_1.8.4.bb b/meta/recipes-support/libgit2/libgit2_1.9.0.bb similarity index 60% rename from meta/recipes-support/libgit2/libgit2_1.8.4.bb rename to meta/recipes-support/libgit2/libgit2_1.9.0.bb index 63986fcd130..47a63ca2862 100644 --- a/meta/recipes-support/libgit2/libgit2_1.8.4.bb +++ b/meta/recipes-support/libgit2/libgit2_1.9.0.bb @@ -5,8 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.8;protocol=https" -SRCREV = "3f4182d15eab74a302718f2de454ffadb1995626" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https \ + file://0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch \ + " +SRCREV = "338e6fb681369ff0537719095e22ce9dc602dbf0" S = "${WORKDIR}/git" @@ -19,3 +21,7 @@ EXTRA_OECMAKE = "\ " BBCLASSEXTEND = "native" + +do_install:append() { + sed -i -e 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/cmake/libgit2/libgit2Targets.cmake +} From patchwork Wed Jan 8 08:42:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55211 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15FBFE7719F for ; Wed, 8 Jan 2025 08:42:50 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web11.14684.1736325760626945364 for ; Wed, 08 Jan 2025 00:42:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DJgbnalL; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-aab925654d9so2897720466b.2 for ; Wed, 08 Jan 2025 00:42:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325759; x=1736930559; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t32YYmdND63KQlb3EfkKKbPdXOTRoF4yhISxtDFCDfY=; b=DJgbnalLXjgaLLusMlHWFMd+YXV4roeM1GcJgy12Q6m4x2hwIabwgoXfeU0tvDYFyK lfaFGCrVg2aP13z8nDZvMIEpTS6xoF6nEoMI6v2StJMly/7th41QzjEUZCbOC1n8ADWI HyKGHzkKuztTN+BEFl67xlKhVY5issfzXTFVuu/r1LuzwhUuVYWmiERzJB5/+hQXlISy HHnyyRVBK4LqYBt8XQVyTdT7TnngTyxKv7A0GBgQ0bQ0ISNrAjzkeNAP/kdjIRhSv1P0 ED2t5MeOU5EcE3TxeV3yeG0pVzJpu9eQJtJGf6aSd3fem0wPtzDyAnj+OWxhmeUrESQS qoXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325759; x=1736930559; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t32YYmdND63KQlb3EfkKKbPdXOTRoF4yhISxtDFCDfY=; b=v5UcVpUbQx9W92B90PHbPNFblZ9XLNU1Q68yycMMB4wwjD3X5S9t5OodjZwi6dk1wp QpbWkHxhmaE9Aw0FxfSwqylJUT/hdJAi3cyEctjFhGVoXjXEQ0pcczPe4r1QY/Qo/P1y rIt9fiTWB12jbBThBaBwt0GjCr3EOKQLKrnWoAA9PzAMcyoZPQUctJn/WKMObu6qqx1u Jem9R1rLvXUd3rBVQiuDjYrQSZa0K1BDAAfDgF26Nh49b7BttWcHm3v3jdQ9uza/kN3X TYGiAlEn0+3/VRy2+Z5HOE1vmErBll1GmDPmx7CGPzZp2jr5ne87REzq3N3aoNg6YA7r Zhfg== X-Gm-Message-State: AOJu0YwVmIi16EVEKeK2LHIMExsBHimwOMcTDbV7ZQ4FT5ouE+4Hhoko Mclfo4chTJCHJlDqi2dONNDVxiWBBqZuI3gnf61J5iYLvy/JgzE2zjXTZw== X-Gm-Gg: ASbGnctSH+2sIylDWpqTqML93bmMgrLqLq6R7qBgdAvSYXRZCH9nyUHpYYhUMLQJrm0 SImOYCwcC/I+ZFrMjLy6EQUIYsv4hfpcgXXvC9m+M5Z2WHGh5sHsd7YZJHT+uAZTBhVfy7axdCF oIjGMnSzEmIWb/2QQZwtpAP8LfXziV/rNvQPx/vMDuDf9SyavEYXBX32jbOD6wyFbX2khFFz5FX u90RQXBOec6DFiP51MR/1+KCboMyt2bml9n2fk5GgHk28NKCnH0a4+rHVDPmMH3RgUa0NMWnEPT MrJxYme4qUe/9Tqh+A== X-Google-Smtp-Source: AGHT+IFX1WGIokxaqcnjeGnCDxrytqFzWgX+GFSe+LeRCYN9jFDGfthjQQ0rKVQlEaQ46k8vd3dERQ== X-Received: by 2002:a17:906:c142:b0:aab:e07c:78b7 with SMTP id a640c23a62f3a-ab2ab70a36dmr151214766b.23.1736325758861; Wed, 08 Jan 2025 00:42:38 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:38 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/20] liburcu: update 0.14.1 -> 0.15.0 Date: Wed, 8 Jan 2025 09:42:19 +0100 Message-Id: <20250108084226.117178-13-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209535 From: Alexander Kanavin License-update: formatting, file rename, spdx tags. Signed-off-by: Alexander Kanavin --- .../liburcu/{liburcu_0.14.1.bb => liburcu_0.15.0.bb} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename meta/recipes-support/liburcu/{liburcu_0.14.1.bb => liburcu_0.15.0.bb} (65%) diff --git a/meta/recipes-support/liburcu/liburcu_0.14.1.bb b/meta/recipes-support/liburcu/liburcu_0.15.0.bb similarity index 65% rename from meta/recipes-support/liburcu/liburcu_0.14.1.bb rename to meta/recipes-support/liburcu/liburcu_0.15.0.bb index 3b083b25140..95d9ba17e19 100644 --- a/meta/recipes-support/liburcu/liburcu_0.14.1.bb +++ b/meta/recipes-support/liburcu/liburcu_0.15.0.bb @@ -6,13 +6,15 @@ HOMEPAGE = "http://lttng.org/urcu" BUGTRACKER = "http://lttng.org/project/issues" LICENSE = "LGPL-2.1-or-later & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ - file://include/urcu/urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ - file://include/urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c2a92498b6e88e276f986877995425b8 \ + file://include/urcu/urcu.h;beginline=1;endline=18;md5=d35fe8cc2613ca70e0a624ed8bf6fef9 \ + file://include/urcu/uatomic/x86.h;beginline=1;endline=6;md5=358d69272ba7b5f85e29e342430d440c \ + " + SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" -SRC_URI[sha256sum] = "231acb13dc6ec023e836a0f0666f6aab47dc621ecb1d2cd9d9c22f922678abc0" +SRC_URI[sha256sum] = "4f2d839af67905ad396d6d53ba5649b66113d90840dcbc89941e0da64bccd38c" S = "${WORKDIR}/userspace-rcu-${PV}" inherit autotools multilib_header From patchwork Wed Jan 8 08:42:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55210 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28CD6E7719E for ; Wed, 8 Jan 2025 08:42:50 +0000 (UTC) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mx.groups.io with SMTP id smtpd.web10.14220.1736325761475542183 for ; Wed, 08 Jan 2025 00:42:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VKkKoM9M; spf=pass (domain: gmail.com, ip: 209.85.208.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5d3f57582a2so1166388a12.1 for ; Wed, 08 Jan 2025 00:42:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325760; x=1736930560; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rP2cm6jNs/N33gLlaw19eZzj1sbUwIzUwOzTgW0plUI=; b=VKkKoM9Mcq5eRkcYdz84dzot4ig/8JT/dVsGo9SEkQ7iUYVH6Kh+eWZ+fNHop3hSQ8 mUmNnnqXTI7psn9BmYXLMowCEiOqIWWLJ/WvymklMRx/EDCiseHC2CF44AiqW+q8Z525 h/t4H8bcqs6f53aV97Hi3hFxBXI0Hc0XHT66zeNjDcVb2Enfj8ZW7FZ+adUZZQn5yvJF dUm79WY6l6s1UzVXSXH5bZCEEoavFQ1xPSwNtrD/iE+Aaw4cTdfE8I2p8KhQHQNp6Its l6GQ5P3Krxwz2X54sb9TUHDfX+pYK2XqcWnOAcP85qT6EbChn4PPa3//hLxg6RtU4Yz1 2NMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325760; x=1736930560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rP2cm6jNs/N33gLlaw19eZzj1sbUwIzUwOzTgW0plUI=; b=dgiF5y73HpKkvzwUFSIYXUQ6lUf0nV669VuaW0PPpmT7ArXPVjpUyOmSLJvbDDIQGT nW7ruY8uL6YyFfLl2eRzg36SrLWXrFXO4xWnE2iVw1E9GKELJA7t9qBliRv8gnQ6SP1u +/Kky2QXBp7sMwWrn7wBAeo68hmB8hpGtv1Sk9QPOU8gl8NznIk4H0WvosXNj+IbGIyO 6kJzsuzfP9OKBwxHnOxduoh5SOG2gchML8/FWUaF3VtnCXTkGvekMIb6EEipAoXPsrCW qXqY5RpS/owmoE+EW8NyO/qL1jPpSCMz7cnpoHa166qmlShpSM+6gB1WswamB3gACAI4 OFDw== X-Gm-Message-State: AOJu0YwAe+baTpsBD+oBm9hh2KrJVylp+o8HeIBg3p6EjOIVpy2OPtyk Rk2d9qxH+VPwAxCt1yLtt7dR4wxRF0QHoNUAt9wdyrGu1cjZGl40SGigNg== X-Gm-Gg: ASbGncuYAq54UI4XXqBdDh2byfc2QDjXI6WqMshRil915WX19qm4c7is2P/VsOOJz9t togM29qnpaEL6HD2BtazK0ZaqADzusQq2x7CsDmwhFQHa6tpZNodIXJFqg4XvuqVc68xy2U2eP5 LKWao54RrxVUoQZCfW0qUqSdsJdx53K8VACnVQPyZp5JeMzLs7IwRjGAOC/x5MO6Dz/1weRzPrC stimZW9e+BwhnVT4x0WHndwGT/g+TTTKRax1lsbkbXdv4pP/GC5LP53LZam54BjRERoLiBhXjEy +EpnnVHfaBg7rNqjiQ== X-Google-Smtp-Source: AGHT+IGUCAfLGuOCDGlOFtlRtybBFRZyt7dYHKzDneOMN7d/uZQmDlUxt16d+1RHVC/CerJAii904g== X-Received: by 2002:a17:907:7253:b0:aa6:68bc:160d with SMTP id a640c23a62f3a-ab29109bfc4mr511226666b.16.1736325759590; Wed, 08 Jan 2025 00:42:39 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:39 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/20] libxcrypt: update 4.4.36 -> 4.4.37 Date: Wed, 8 Jan 2025 09:42:20 +0100 Message-Id: <20250108084226.117178-14-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209536 From: Alexander Kanavin Drop patch merged upstream. Signed-off-by: Alexander Kanavin --- .../libxcrypt/files/configure-c99.patch | 39 ------------------- .../libxcrypt/files/fix_cflags_handling.patch | 3 +- ...t_4.4.36.bb => libxcrypt-compat_4.4.37.bb} | 1 + meta/recipes-core/libxcrypt/libxcrypt.inc | 9 ++--- ...ibxcrypt_4.4.36.bb => libxcrypt_4.4.37.bb} | 0 5 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-core/libxcrypt/files/configure-c99.patch rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.36.bb => libxcrypt-compat_4.4.37.bb} (99%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.36.bb => libxcrypt_4.4.37.bb} (100%) diff --git a/meta/recipes-core/libxcrypt/files/configure-c99.patch b/meta/recipes-core/libxcrypt/files/configure-c99.patch deleted file mode 100644 index b77ea7af077..00000000000 --- a/meta/recipes-core/libxcrypt/files/configure-c99.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cfe9f4d6b0a5d10a15e10e987d528c5c513a42f1 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Tue, 19 Dec 2023 11:00:11 +0100 -Subject: [PATCH] configure: Only text the makecontext signature we need - -The test/explicit-bzero.c test uses a start routine without any -arguments. There is no need for the multi-argument version. - -This avoids a build failure with glibc and future compilers. -The GNU C library declares the makecontext callback of -type void (*) (void), so no cast is needed. On other systems, -the type may be the (currently distinct) type void (*) (), -but given that this only affects the ability to execute a test, -no further machinery is added here to detect that different type. - -Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/178/] -Signed-off-by: Ross Burton ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 016997c..4b8afd8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -303,13 +303,11 @@ AS_IF([test $ac_cv_header_ucontext_h = yes], - #include - static int x; - static void fn1(void) {} --static void fn2(int a, int b) { x = a - b; } - ]], [[ - ucontext_t uc1, uc2; - if (getcontext(&uc1)) return 1; - if (setcontext(&uc1)) return 1; - makecontext(&uc1, fn1, 0); -- makecontext(&uc2, fn2, 2, 1, 1); - if (swapcontext(&uc1, &uc2)) return 1; - return x; - ]])], diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch index 94aa3fed49c..879950bbe37 100644 --- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch @@ -1,4 +1,4 @@ -From 7b2a0cdc281d94a5782c37ef87040c341447b4b4 Mon Sep 17 00:00:00 2001 +From 1e94a03541e35718dc1eaa8023e0ec3cf2de369b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Apr 2021 10:35:02 +0100 Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version @@ -13,7 +13,6 @@ Avoid this by stripping empty elements out of CFLAGS. Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] Signed-off-by: Richard Purdie - --- build-aux/scripts/compute-symver-floor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb similarity index 99% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb index 30ec6a4674e..bb4e2032dd6 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb @@ -16,3 +16,4 @@ do_install:append () { rm -rf ${D}${libdir}/libcrypt.so rm -rf ${D}${datadir} } + diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index ee6875aa05d..9ecb333fb96 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig -SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf" +SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https \ + file://fix_cflags_handling.patch \ + " +SRCREV = "e5714d1f0a477f91ce3986fa63651c7710f0e183" SRCBRANCH ?= "master" -SRC_URI += "file://fix_cflags_handling.patch \ - file://configure-c99.patch" - PROVIDES = "virtual/crypt" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb From patchwork Wed Jan 8 08:42:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55209 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15DDDE7719A for ; Wed, 8 Jan 2025 08:42:50 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web10.14221.1736325762251254877 for ; Wed, 08 Jan 2025 00:42:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DZNQFfO9; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aa6c0dbce1fso2300109966b.2 for ; Wed, 08 Jan 2025 00:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325761; x=1736930561; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d5HvMQcbYk5bemzVov40uiGKWnjCsCkHpy+nD0Uagbg=; b=DZNQFfO9tK17mIoUUbcX+QEPtx3xQ5ExKO+7Bc0VR0TVW3zFYLbHgRoaHwjiNcOK3B QDJ+lZbwb0/Ofg1Q9UIeZpX+wP92PulfzPP2lSWiithswoOZBAAjb/je8q96WmDrzpsH xhxju8IDIhGcAg0Q38eTW3X4Sd2opH61A8iTVtJomuZgZFZgxyz1FUUNUhIj1dM99mdI lwk8kZOesbnF6eIwzJAfp9M8ApqSuDgeQozwaiDUBdUiRlIW6WlPHRF8AYADNPJDnsTF s94Ne1E64bYt+7OaMd1A1+grcKwGfXabQGMiWDMgWMeE6FfgFNbM21Cmey0qeNup1jA6 C/Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325761; x=1736930561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d5HvMQcbYk5bemzVov40uiGKWnjCsCkHpy+nD0Uagbg=; b=Z6Z2gGfN7dnHhDaQc62jhirFs1Mpc80ChB7hac5m6R9CX+QQek3gFmWndf6Ua1w7Tx DvVJ+VGlcanoaUxV+Qi4gx15G9BGY8R0kyYUmLm/GzYyrK4svvKyagx5IUn77USwhWRD 89A4PDg67dw3S+d9DCV8JQ5gCM9Bc1Lu8zWV1K43v5YBD9xCBekK2EpB0ZrAGlRxSRKq CavwlDT0F90FHDoOVrmd4b3kj0jNjNhja7vf/5UVo45uHGkjdnvoKSDi6BedQX5Fy5PW x5F3JEOItlX8wbLYNI09/f0lguTS8bK28nhTX2gO/dzX+Ixw/uEa4rNWkhRhbBu6QJBE JJBw== X-Gm-Message-State: AOJu0YyCqskW4rjOGcUkC7+zKjzcCCshmmPxpDM9gE988h9FuYkvizBB KIA76HU/h+Jy/HtujKjDongk0wN7hamVrv9O5vgdNbFPnTCsFuWqUX24Gg== X-Gm-Gg: ASbGncuRO27WZWBm7QLsD4hagjbPTmhFIJM3vUZSuc7kSasPSZ8n+yBY/dpTM3TYSd1 tNLOt07Dv5FKC3KDfu6hUDmz7KFR6UQY0Ya0tpiLn5BSQp4v7KssBxoO8EPy4AYfRRy4aJwp2Kr qBqKglRM6vNnQGErRfX96TT82yYnonlFo+BjmQita3ouhS+/b3EYXv5kd42k5SqiIqZV9VgteeI ggC4NaxRAMSJX3RkOd7V+rKqyLJBl0WnJ6O9gFZjDCodbD5N8tGNw/0rUODyuNIs3sc/GbNJk8U Ufg1LOO1pnDJxvm8Aw== X-Google-Smtp-Source: AGHT+IGAG1Sv7y6m3ENjw1Peq1EGtDR5pchWUOJ3LzMA+bgMfAwrpFyTngCaZCs+yY/ju8aJ3eQB4g== X-Received: by 2002:a05:6402:3216:b0:5d9:d58:bcfa with SMTP id 4fb4d7f45d1cf-5d972e63d9cmr4314188a12.27.1736325760297; Wed, 08 Jan 2025 00:42:40 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:39 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/20] ruby: update 3.3.6 -> 3.4.1 Date: Wed, 8 Jan 2025 09:42:21 +0100 Message-Id: <20250108084226.117178-15-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209537 From: Alexander Kanavin License-update: formatting Exclude aclocal, as aclocal.m4 is hand-maintained (similar to recent tweaks elsewhere in core). Find rbconfig.rb directly in ${D}, as grepping ruby's internal file produces bogus results now. Signed-off-by: Alexander Kanavin --- ...x-cross-compilation-of-external-gems.patch | 6 ++-- ...ine-REG_S1-and-REG_S2-for-musl-riscv.patch | 6 ++-- ...Obey-LDFLAGS-for-the-link-of-libruby.patch | 6 ++-- ...doc-build-reproducible-documentation.patch | 2 +- ...-list-of-object-files-in-generated-M.patch | 6 ++-- ...eproducible-change-fixing-784225-too.patch | 6 ++-- .../0006-Make-gemspecs-reproducible.patch | 30 +++++++++---------- .../ruby/{ruby_3.3.6.bb => ruby_3.4.1.bb} | 10 +++---- 8 files changed, 36 insertions(+), 36 deletions(-) rename meta/recipes-devtools/ruby/{ruby_3.3.6.bb => ruby_3.4.1.bb} (95%) diff --git a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch index bd8f736247e..f17970e9c9b 100644 --- a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch +++ b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch @@ -1,4 +1,4 @@ -From b74950d4f06bbfb91b2e68044147a226c15f4639 Mon Sep 17 00:00:00 2001 +From 03700ec256789e02de20b58bca080c6fef592336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Mon, 30 Sep 2019 16:57:01 +0100 Subject: [PATCH] extmk: fix cross-compilation of external gems @@ -16,10 +16,10 @@ Signed-off-by: André Draszik 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/extmk.rb b/ext/extmk.rb -index d9c2417..da14c49 100755 +index 8b6b365..3048f75 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb -@@ -428,8 +428,8 @@ else +@@ -434,8 +434,8 @@ else end $ruby = [$ruby] $ruby << "-I'$(topdir)'" diff --git a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch index bc1744da82d..799324caeaa 100644 --- a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch +++ b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch @@ -1,4 +1,4 @@ -From f4edf72c76bc06fa92c61f6cb9163cc777912a1f Mon Sep 17 00:00:00 2001 +From f992d781e05b61489bdf5a2a9aee6cc616f1742a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Jan 2022 20:29:14 -0800 Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj 1 file changed, 5 insertions(+) diff --git a/vm_dump.c b/vm_dump.c -index 444be4a..8a081a7 100644 +index 5873e52..9eb4db1 100644 --- a/vm_dump.c +++ b/vm_dump.c -@@ -39,6 +39,11 @@ +@@ -40,6 +40,11 @@ #define MAX_POSBUF 128 diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 6f95685917b..bb67df0f406 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -1,4 +1,4 @@ -From e6267676addd27f3c02667116185211d711ef940 Mon Sep 17 00:00:00 2001 +From 7e2337d8b0daf264785cb06d1d6c7d61e428a11b Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Thu, 5 May 2016 10:59:07 -0700 Subject: [PATCH] Obey LDFLAGS for the link of libruby @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/Makefile.in b/template/Makefile.in -index 8c462f2..2200c8c 100644 +index 05432cd..41a05bb 100644 --- a/template/Makefile.in +++ b/template/Makefile.in -@@ -115,7 +115,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ +@@ -119,7 +119,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ DLDSHARED = @DLDSHARED@ XDLDFLAGS = @DLDFLAGS@ diff --git a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch index abbbd35702d..87a1e82516e 100644 --- a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch +++ b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch @@ -1,4 +1,4 @@ -From 09a6df0d32e2177406ed391e536c0c7c4b503c5d Mon Sep 17 00:00:00 2001 +From 98071c0b28a45cd21a2cbe6746ce39067932b62f Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Tue, 10 Oct 2017 15:04:34 -0300 Subject: [PATCH] rdoc: build reproducible documentation diff --git a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch index f08aaf555f3..4b6771fd268 100644 --- a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch +++ b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch @@ -1,4 +1,4 @@ -From f491fff7d006954c1c51eb7a513a85bdbab0fe5a Mon Sep 17 00:00:00 2001 +From 0887facc4ca5bcb0280b025b35bbc18528e52914 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Tue, 10 Oct 2017 15:06:13 -0300 Subject: [PATCH] lib/mkmf.rb: sort list of object files in generated Makefile @@ -17,10 +17,10 @@ Signed-off-by: Reiner Herrmann 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb -index 6da7dde..3af30a9 100644 +index 768a152..f16cdd8 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb -@@ -2368,7 +2368,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS} +@@ -2480,7 +2480,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS} LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')} SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')} diff --git a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch index 248158b6dca..eda45dd862b 100644 --- a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch +++ b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch @@ -1,4 +1,4 @@ -From d2376d94b4d285062b67803dc3278d58c14a5297 Mon Sep 17 00:00:00 2001 +From ff25f6dddcfbbb7b0464485bb5132458866ab51a Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Fri, 1 Nov 2019 15:25:17 -0300 Subject: [PATCH] Make gemspecs reproducible @@ -12,10 +12,10 @@ Upstream-Status: Backport [debian] 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb -index e438669..3ce9af8 100644 +index 8f353ae..095125f 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb -@@ -1707,7 +1707,9 @@ class Gem::Specification < Gem::BasicSpecification +@@ -1711,7 +1711,9 @@ class Gem::Specification < Gem::BasicSpecification raise(Gem::InvalidSpecificationException, "invalid date format in specification: #{date.inspect}") end diff --git a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch index 8a1daba7bdb..121bdcf3abf 100644 --- a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch +++ b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch @@ -1,4 +1,4 @@ -From 42f8019e62f392f5bc09c25e90cc63123eb764fe Mon Sep 17 00:00:00 2001 +From d58bdaca3d5379afcb954bb57c690c7736807ec5 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Fri, 1 Nov 2019 15:25:17 -0300 Subject: [PATCH] Make gemspecs reproducible @@ -8,17 +8,17 @@ build unreproducible Upstream-Status: Backport [debian] --- - ext/bigdecimal/bigdecimal.gemspec | 1 + - ext/fiddle/fiddle.gemspec | 1 + - ext/io/console/io-console.gemspec | 1 + - lib/ipaddr.gemspec | 1 + - lib/rdoc/rdoc.gemspec | 1 + + .bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec | 1 + + ext/fiddle/fiddle.gemspec | 1 + + ext/io/console/io-console.gemspec | 1 + + lib/ipaddr.gemspec | 1 + + lib/rdoc/rdoc.gemspec | 1 + 5 files changed, 5 insertions(+) -diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec -index f9f3b45..b9a469d 100644 ---- a/ext/bigdecimal/bigdecimal.gemspec -+++ b/ext/bigdecimal/bigdecimal.gemspec +diff --git a/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec b/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec +index b6ef8fd..596b8bb 100644 +--- a/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec ++++ b/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec @@ -14,6 +14,7 @@ Gem::Specification.new do |s| s.name = name s.version = source_version @@ -28,7 +28,7 @@ index f9f3b45..b9a469d 100644 s.summary = "Arbitrary-precision decimal floating-point number library." diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec -index 8781093..efdca32 100644 +index 0092f52..f77c224 100644 --- a/ext/fiddle/fiddle.gemspec +++ b/ext/fiddle/fiddle.gemspec @@ -8,6 +8,7 @@ end @@ -40,10 +40,10 @@ index 8781093..efdca32 100644 spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec -index d4f5276..8f89611 100644 +index 0a19992..4a80529 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec -@@ -4,6 +4,7 @@ _VERSION = "0.7.1" +@@ -12,6 +12,7 @@ end Gem::Specification.new do |s| s.name = "io-console" s.version = _VERSION @@ -52,7 +52,7 @@ index d4f5276..8f89611 100644 s.email = "nobu@ruby-lang.org" s.description = "add console capabilities to IO instances." diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec -index 1f4798e..48743cf 100644 +index 5719f83..fe76260 100644 --- a/lib/ipaddr.gemspec +++ b/lib/ipaddr.gemspec @@ -18,6 +18,7 @@ end @@ -64,7 +64,7 @@ index 1f4798e..48743cf 100644 spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec -index 93a281c..cc5c155 100644 +index 3144df5..65c313f 100644 --- a/lib/rdoc/rdoc.gemspec +++ b/lib/rdoc/rdoc.gemspec @@ -7,6 +7,7 @@ end diff --git a/meta/recipes-devtools/ruby/ruby_3.3.6.bb b/meta/recipes-devtools/ruby/ruby_3.4.1.bb similarity index 95% rename from meta/recipes-devtools/ruby/ruby_3.3.6.bb rename to meta/recipes-devtools/ruby/ruby_3.4.1.bb index 6751b36a448..09415a31326 100644 --- a/meta/recipes-devtools/ruby/ruby_3.3.6.bb +++ b/meta/recipes-devtools/ruby/ruby_3.4.1.bb @@ -10,7 +10,7 @@ LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LEGAL;md5=81e6a4d81533b9263da4c3485a0ad883 \ + file://LEGAL;md5=eff3bb1382b590cc5814f1f3de6eb4e5 \ " DEPENDS = "zlib openssl libyaml libffi" @@ -32,6 +32,7 @@ UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" inherit autotools ptest pkgconfig +EXTRA_AUTORECONF += "--exclude=aclocal" # This snippet lets compiled extensions which rely on external libraries, # such as zlib, compile properly. If we don't do this, then when extmk.rb @@ -47,7 +48,7 @@ do_configure:prepend() { DEPENDS:append:libc-musl = " libucontext" -SRC_URI[sha256sum] = "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d" +SRC_URI[sha256sum] = "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" @@ -78,8 +79,7 @@ EXTRA_OECONF:append:libc-musl = "\ PARALLEL_MAKEINST = "" do_install:append:class-target () { - # Find out rbconfig.rb from .installed.list - rbconfig_rb=`grep rbconfig.rb ${B}/.installed.list` + rbconfig_rb=`find ${D} -name rbconfig.rb` # Remove build host directories sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' \ -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \ @@ -88,7 +88,7 @@ do_install:append:class-target () { -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${RECIPE_SYSROOT}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - ${D}$rbconfig_rb + $rbconfig_rb sed -i -e 's|${DEBUG_PREFIX_MAP}||g' \ ${D}${libdir}/pkgconfig/*.pc From patchwork Wed Jan 8 08:42:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 002F2E7719C for ; Wed, 8 Jan 2025 08:42:50 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web10.14223.1736325762810952429 for ; Wed, 08 Jan 2025 00:42:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XW3d3dJe; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-aaf8f0ea963so220670966b.3 for ; Wed, 08 Jan 2025 00:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325761; x=1736930561; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z1s1BvdSyA5ZxTDrlqjED6+TL2HQWqOBxGVp0dKNjKs=; b=XW3d3dJeOWo2EkjaHNyE0NDDSjrngPHGpawYGnN/Sr0PuklJWCopgx0mu3UEi+dD85 7PE+KwPI6Jz+ZOgDSjBP6Fd1jJjB3/bVf2vvwLcu4+uP6xJb6pXt3WIbw0EemJRT+NeT nAHbqc9rj/vaZ/3tOMMab1fG4yV6b07tA2XB3JAOCj/N14zi25HWgGRYwB9Ci7IJuGQq mr4Hxd/N1n/O8S5nQbba1miZ8v2O76Q/RfB5ZLtCXq8ccYZVm1c0E0nKXTSM70upVhlD la7h7OVCx38HHL/1dHcT24nMf/CwVYv45QXqmGdAvSnVA1Q8Ha4PZU4xScmfPoXDM5E3 SEng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325761; x=1736930561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z1s1BvdSyA5ZxTDrlqjED6+TL2HQWqOBxGVp0dKNjKs=; b=OoJA1ADed+oTEYespOcAiGmnb4vzQuZdYE/wTtltMiwiK5RDuJwWKhNZ0rd5PecfyT ynjGISDmxzJM1g+yqRBsoBu93X5R4KrPxrMTS11rtgcbGCAhBCoyIMcvKVf0YEApRvUT nO7Pk2jSQZ/U7Zkgux9w32FGUy8Rj7Wc/M5+UY0dcwsxLrWUnA6IiTNSBkCEJSGDNoLA 5oIeq4Qu+XDjYbWkPX9hDZr/Rr5aR3YL5BfLsGzy9GLexQCmIVJ7tCLRiwKe0lzAeT36 GhiSItbpvuQmTQYUuTqOirNQU7Amtf1aNSm1n1ucYQ7Uuc+6xR8dNqvs/ykCMa3y2XMX zniQ== X-Gm-Message-State: AOJu0Ywel+TAPytL51zV8ucw6/zg64jC2GisRy+KlIwNZX/qTGDpfZmv XxdpG/Er0GtSXp9/HHrMb2XXlUbK8vy9V8dootv/NnFp7u69qIvtII5HAQ== X-Gm-Gg: ASbGncshlAORzXcWhTRGlhqBLos1eeSN6GGwf/dUZlq+9FHAAFFYiZKEGscod2p8/vS VTnODdg29QzPHGRqZQL+n+TP8NPt+DvUevGOLi9FQhwQGbm2w/q7kow++x8oVLNzhh8W3nwGlTo hXFIYeB+juRFNn04egu7Zp3Zhsr00xh+/RwMd2dc+5/srCkdw+0pTB8AWLFBndJGH6f+BPAc/nR I/dxI1BBtogsIzgBLNhPxpGWy36weSwZmmv3OLx8nDE6cshX8avifvBZZzpKW+Z/Qf0LVEnAVM4 q0kyEQwwsdLia19E1Q== X-Google-Smtp-Source: AGHT+IEP16jjmnloqTpKzK5vssnB2DgLz1BT8ZM5B7eiPAeMDC38Td0eBrFeQAABJwXGWftRyBEjYg== X-Received: by 2002:a17:907:944a:b0:aab:c78c:a705 with SMTP id a640c23a62f3a-ab2abc8f081mr156730666b.52.1736325761030; Wed, 08 Jan 2025 00:42:41 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:40 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/20] shadow: update 4.16.0 -> 4.17.1 Date: Wed, 8 Jan 2025 09:42:22 +0100 Message-Id: <20250108084226.117178-16-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209538 From: Alexander Kanavin Remove groups entries, as that has been removed in favor of the coreutils implementation. Add a patch to support older host compilers. Signed-off-by: Alexander Kanavin --- ...-use-C23-attributes-only-with-gcc-10.patch | 29 +++++++++++++++++++ ...nexpected-open-failure-in-chroot-env.patch | 6 ++-- .../shadow/files/shadow-update-pam-conf.patch | 2 +- .../{shadow_4.16.0.bb => shadow_4.17.1.bb} | 9 +++--- 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch rename meta/recipes-extended/shadow/{shadow_4.16.0.bb => shadow_4.17.1.bb} (96%) diff --git a/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch b/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch new file mode 100644 index 00000000000..4e2d3a89c34 --- /dev/null +++ b/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch @@ -0,0 +1,29 @@ +From f2d8d96e8586772becd68593a5bd9e14632841af Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 7 Jan 2025 17:03:32 +0100 +Subject: [PATCH] lib/attr.h: use C23 attributes only with gcc >= 10 + +These are not available on earlier versions and builds break there. + +Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/1172] +Signed-off-by: Alexander Kanavin +--- + lib/attr.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/attr.h b/lib/attr.h +index 02c7e252..290514d8 100644 +--- a/lib/attr.h ++++ b/lib/attr.h +@@ -5,7 +5,7 @@ + #include "config.h" + + +-#if defined(__GNUC__) ++#if defined(__GNUC__) && (__GNUC__ >= 10) + # define MAYBE_UNUSED [[gnu::unused]] + # define NORETURN [[gnu::__noreturn__]] + # define format_attr(type, fmt, va) [[gnu::format(type, fmt, va)]] +-- +2.45.2 + diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch index cd99aad135c..699269ed643 100644 --- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch @@ -1,4 +1,4 @@ -From f512071dd3a4c29d4bf048c5a89c4ba9160e37b1 Mon Sep 17 00:00:00 2001 +From f7b765c022e4cad9140ac44712885c66e149abdc Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 17 Jul 2014 15:53:34 +0800 Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env @@ -20,10 +20,10 @@ Signed-off-by: Chen Qi 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/commonio.c b/lib/commonio.c -index 01a26c9..82b2868 100644 +index 4d83e83..9ee0e13 100644 --- a/lib/commonio.c +++ b/lib/commonio.c -@@ -601,10 +601,18 @@ int commonio_open (struct commonio_db *db, int mode) +@@ -604,10 +604,18 @@ int commonio_open (struct commonio_db *db, int mode) db->cursor = NULL; db->changed = false; diff --git a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch index 1eacb8a53fe..cb3baf450c4 100644 --- a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch +++ b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch @@ -1,4 +1,4 @@ -From 38882ab288fd4d2cc2e45dff222ae3412c8fe357 Mon Sep 17 00:00:00 2001 +From eb17cd91d8e4d76ee95de9c0c9f4938ba2e3e82a Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Wed, 20 Jul 2011 19:18:14 +0800 Subject: [PATCH] shadow: update pam related configure files diff --git a/meta/recipes-extended/shadow/shadow_4.16.0.bb b/meta/recipes-extended/shadow/shadow_4.17.1.bb similarity index 96% rename from meta/recipes-extended/shadow/shadow_4.16.0.bb rename to meta/recipes-extended/shadow/shadow_4.17.1.bb index b7282d7933f..a70ecea1f2e 100644 --- a/meta/recipes-extended/shadow/shadow_4.16.0.bb +++ b/meta/recipes-extended/shadow/shadow_4.17.1.bb @@ -14,6 +14,7 @@ GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ + file://0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch \ " SRC_URI:append:class-target = " \ @@ -24,7 +25,7 @@ SRC_URI:append:class-target = " \ SRC_URI:append:class-native = " \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ " -SRC_URI[sha256sum] = "1744f339e07a2b41056347ddd612839762ff565d7e9494fb049428002fa2e7e0" +SRC_URI[sha256sum] = "51a946bbce141c5de14b6d47cab167206cd685d2307e917611dbc1be46c84a18" UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)$" # Additional Policy files for PAM @@ -182,7 +183,6 @@ FILES:${PN}-base = "\ ${base_bindir}/su.shadow \ ${bindir}/sg \ ${bindir}/newgrp.shadow \ - ${bindir}/groups.shadow \ ${sysconfdir}/pam.d/login \ ${sysconfdir}/pam.d/su \ ${sysconfdir}/login.defs \ @@ -201,14 +201,13 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" -ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1 groups.1 su.1 nologin.8" +ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1 su.1 nologin.8" ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" -ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" -ALTERNATIVE:${PN}-base = "newgrp groups login su" +ALTERNATIVE:${PN}-base = "newgrp login su" ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" From patchwork Wed Jan 8 08:42:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55208 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D82EE7719D for ; Wed, 8 Jan 2025 08:42:50 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.14224.1736325763614243212 for ; Wed, 08 Jan 2025 00:42:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YLWfwUVY; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-aa66ead88b3so725698466b.0 for ; Wed, 08 Jan 2025 00:42:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325762; x=1736930562; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PPZuq/wXri8Ul+nHWxA/jFNHhDAIksSnIWO5UgMBM+M=; b=YLWfwUVYrcG0bkTnOTxQk+TI0NK16Y/oN1PsWGp9FTIgRxSoivpj5m+K0QI0W3SX0w o5Bwc8piguFwjK6zRfxLyxzox12PiC64qSNqmsCkhmwzY9+PfIHrLqf4Bh9GxdXxhpdd h3thjMu34HSkTvioyke4YTmVFtZjeEp36rrZaQB0+6JmhopYD/jqzxDDV589RzB0cMZx 3HqSeCslmaqtrvNFI5Dm5+5TDYoHUao8/D9rFajgqPp1vpQM5p76ESy0ZufaYExubAwV YOWi7UxaDxKJda6DD3OOGeh037Lh299TgfcWIa9QonUp0q+uR65eIlVnbHcaxrfLd/Ja 92TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325762; x=1736930562; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PPZuq/wXri8Ul+nHWxA/jFNHhDAIksSnIWO5UgMBM+M=; b=B3RrwdDZ8BO3dC2jDzfnqbA3d8f6aQ4JoMc3bg7TfL7qH9KCcUkEfZ8kBCCNIdQPuX 8cvOHbowF6BD5hj0Sr6dxkt2JKg3qUcGeKxT2MUxrLrIIYdpGM0EIHopLlWE6+rfXZ6g dqPYEqWGX8pNGlE8QVrAbW+t836+hjtT05drAEW0G0oCobfT+IrrMKInfc6c0RfRTUCW xWxxL4N5CrdCTHBqH+gH/FLrfLlkerk4oG2XTD/6cKawDsCe6qTlYyB2H06XCZPMeH32 IUVtflvK2bAVjHsu2xSpsNlM59riHPZIUECXVulN2hHCpCxvaY9RP8Kzn937TvwqL/L+ K9JQ== X-Gm-Message-State: AOJu0YwjXBILo4QWSLJB/85ER8oCAlLr6QyKwVhPrFXd+qmcNhilbZYT PLECCzjOr/ikoLTLEXvmF6xYEC2NPqsYIXw7AyzQCPtjNVB9L9xpzZrsOg== X-Gm-Gg: ASbGnctz4c3xd5dJ+Qn8EgJ/dJ0go22VYYzpzi0LVEXpMw3NU7nOH7JMilKmTGTogmO cc0acEmLsJWyyBTH9gX7/nfNPh0rITABm8AccwzcS4/ywlG9i2SjvwE3vfbaVFyFeowSkzbLdPT aTOWuHXhB/irmPApWdhDGrP2HL/JYisiooI+I4F3fY7RBSxBX2NkVuIe6vDm0i8Au30MU7lclEe 4iqCT+EaVjxIZOb1SGITCdGKPJEbTf/zXLwT9FI8Qn7mf8OVLq9zg+hWKJ1c+u5brxnFnTZ6arL Af2nm/U3+LU13h6VxQ== X-Google-Smtp-Source: AGHT+IHeULDRYXhv49loLR28yGin0KgPrcgZoNo2YL0UGhMXXGiKrExDRR3folxO5HI+nrTxvdAeJw== X-Received: by 2002:a17:907:3e21:b0:aa6:7107:db00 with SMTP id a640c23a62f3a-ab2ab70940amr124815566b.50.1736325761694; Wed, 08 Jan 2025 00:42:41 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:41 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/20] blktool: remove the recipe Date: Wed, 8 Jan 2025 09:42:23 +0100 Message-Id: <20250108084226.117178-17-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209539 From: Alexander Kanavin It was created in 2004 as an alternative to hdparm and never updated since (while hdparm remains in active development). Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/distro/include/maintainers.inc | 1 - .../packagegroup-core-tools-testapps.bb | 1 - .../blktool/0001-fix-typos-in-manpage.patch | 40 ---------- .../blktool/0002-fix-string-error.patch | 31 -------- ...nt-for-BLKROSET-it-must-be-const-int.patch | 78 ------------------- .../blktool/0004-fix-ftbfs-glibc-2.28.patch | 19 ----- .../recipes-extended/blktool/blktool_4-7.1.bb | 29 ------- 8 files changed, 200 deletions(-) delete mode 100644 meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch delete mode 100644 meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch delete mode 100644 meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch delete mode 100644 meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch delete mode 100644 meta/recipes-extended/blktool/blktool_4-7.1.bb diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 6d11c98dfe5..5000b08eb83 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -17,7 +17,6 @@ DISTRO_PN_ALIAS:pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" DISTRO_PN_ALIAS:pn-babeltrace = "OSPDT" DISTRO_PN_ALIAS:pn-babeltrace2 = "OSPDT" DISTRO_PN_ALIAS:pn-bjam = "OpenSuSE=boost-jam Debian=bjam" -DISTRO_PN_ALIAS:pn-blktool = "Debian=blktool Mandriva=blktool" DISTRO_PN_ALIAS:pn-bluez5 = "Fedora=bluez Opensuse=bluez" DISTRO_PN_ALIAS:pn-bootchart2 = "Fedora=bootchart2 Opensuse=bootchart" DISTRO_PN_ALIAS:pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 5d1aa17183d..6e3cb54a1fb 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -69,7 +69,6 @@ RECIPE_MAINTAINER:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem R RECIPE_MAINTAINER:pn-binutils-testsuite = "Khem Raj " RECIPE_MAINTAINER:pn-binutils-crosssdk-${SDK_SYS} = "Khem Raj " RECIPE_MAINTAINER:pn-bison = "Chen Qi " -RECIPE_MAINTAINER:pn-blktool = "Yi Zhao " RECIPE_MAINTAINER:pn-blktrace = "Unassigned " RECIPE_MAINTAINER:pn-bluez5 = "Anuj Mittal " RECIPE_MAINTAINER:pn-bmaptool = "Trevor Woerner " diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 4fadcd49ae9..d7ea8e937f4 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -46,7 +46,6 @@ X11TOOLS = "\ " RDEPENDS:${PN} = "\ - blktool \ ${KEXECTOOLS} \ alsa-utils-amixer \ alsa-utils-aplay \ diff --git a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch b/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch deleted file mode 100644 index 25a2fabe156..00000000000 --- a/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9cb1667f9d3a9bcfc3b83466cd8d3b79f0554ff0 Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin -Date: Wed, 8 Jul 2015 01:37:09 +0300 -Subject: [PATCH 1/3] fix typos in manpage - -This patch is taken from -ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz - -Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin - ---- - blktool.8 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/blktool.8 b/blktool.8 -index a1f5c96..45b7724 100644 ---- a/blktool.8 -+++ b/blktool.8 -@@ -191,7 +191,7 @@ Query or set device bus state (0 off, 1 on, 2 tristate) - Query the detected (or overridden, via -t) device class. - Typically this will result in 'ATA' or 'SCSI' for most devices. - Detection is based on device major; thus your SATA device may appear as --'SCSI'. -+\&'SCSI'. - - .TP - .B cd-speed -@@ -237,7 +237,7 @@ Omitting the on/off argument will print the current state. - - .TP - .B media --Lock in (or unlock) a removeable device. -+Lock in (or unlock) a removable device. - - .TP - .B multiple-count --- -2.1.4 - diff --git a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch b/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch deleted file mode 100644 index 401e41e3ed1..00000000000 --- a/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ddb1071da2c78d8155aab62e9f0d46f69500200f Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin -Date: Wed, 8 Jul 2015 01:42:24 +0300 -Subject: [PATCH 2/3] fix string error - -This patch is taken from -ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz - -Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin - ---- - util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.c b/util.c -index 1f3a9ca..2ccf56a 100644 ---- a/util.c -+++ b/util.c -@@ -28,7 +28,7 @@ void pdie(const char *msg, int perr) - if (perr) - perror(msg); - else -- fprintf(stderr, msg); -+ fprintf(stderr, "%s", msg); - if (blkdev >= 0) - close(blkdev); - exit(1); --- -2.1.4 - diff --git a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch b/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch deleted file mode 100644 index d1f1e797fe1..00000000000 --- a/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 68faa63aaad81f4a289e4a03173ab4cf798deb53 Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin -Date: Sat, 1 Nov 2014 22:24:32 +0300 -Subject: [PATCH 3/3] Fix 3-d argument for BLKROSET it must be 'const int *' - -Most of *SET ioctls have int type for 3-d argument, except BLKROSET. -So add bc_arg_type enum, build it into bool_comand and install arg_type -to bc_arg_int_ptr for BLKROSET only. - -Debian-bug-id: 641164 -Link: https://bugs.debian.org/641164 - -This patch is taken from -ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.debian.tar.xz - -Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin - ---- - blktool.c | 11 +++++++++-- - blktool.h | 7 +++++++ - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/blktool.c b/blktool.c -index fbefecd..221a195 100644 ---- a/blktool.c -+++ b/blktool.c -@@ -85,7 +85,7 @@ static struct bool_command bool_cmd_tbl[] = { - { { DEF_BOOL("pio-data"), dc_ata, DEF_HDIO(32BIT) }, - "16-bit", "32-bit" }, - { { DEF_BOOL("readonly"), dc_any, IOCNAME(BLKROGET), IOCNAME(BLKROSET) }, -- DEF_BOOLSTR }, -+ DEF_BOOLSTR, bc_arg_int_ptr }, - { { DEF_BOOL("unmask-irq"), dc_ata, DEF_HDIO(UNMASKINTR) }, - DEF_BOOLSTR }, - { { "wcache", ct_bool, handle_wcache, dc_any, -@@ -171,7 +171,14 @@ static void handle_bool(int argc, char **argv, struct command *cmd) - - } else if ((argc == 4) && (cmd->write_ioctl_name != NULL)) { - do_32 = parse_bool(argc, argv, bcm); -- if (ioctl(blkdev, cmd->write_ioctl, do_32)) -+ -+ int ret; -+ if (bcm->arg_type == bc_arg_int_ptr) { -+ ret = ioctl(blkdev, cmd->write_ioctl, &do_32); -+ } else { -+ ret = ioctl(blkdev, cmd->write_ioctl, do_32); -+ } -+ if (ret) - pdie(cmd->write_ioctl_name, 1); - } - else { -diff --git a/blktool.h b/blktool.h -index fce4387..85add83 100644 ---- a/blktool.h -+++ b/blktool.h -@@ -85,11 +85,18 @@ struct command { - const char *write_ioctl_name; - }; - -+enum bc_arg_type { -+ bc_arg_int, -+ bc_arg_int_ptr, -+}; -+ - struct bool_command { - struct command cmd; - - const char *str_false; - const char *str_true; -+ -+ enum bc_arg_type arg_type; - }; - - struct class_operations { --- -2.1.4 - diff --git a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch deleted file mode 100644 index 65bca651000..00000000000 --- a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fix FTBFS with glibc 2.28 -Author: Adrian Bunk -Bug-Debian: https://bugs.debian.org/917055 - -This patch is taken from -http://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.1.debian.tar.xz - -Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin ---- blktool-4.orig/blktool.c -+++ blktool-4/blktool.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/meta/recipes-extended/blktool/blktool_4-7.1.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb deleted file mode 100644 index bb44befb564..00000000000 --- a/meta/recipes-extended/blktool/blktool_4-7.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Tune low-level block device parameters" -DESCRIPTION = "blktool is used for querying and/or changing settings \ -of a block device. It is like hdparm but a more general tool, as it \ -works on SCSI, IDE and SATA devices." -HOMEPAGE = "http://packages.debian.org/unstable/admin/blktool" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373" - -DEPENDS = "glib-2.0" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/b/${BPN}/${BPN}_4.orig.tar.gz;name=tarball \ - file://0001-fix-typos-in-manpage.patch \ - file://0002-fix-string-error.patch \ - file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \ - file://0004-fix-ftbfs-glibc-2.28.patch \ - " - -SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" -SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764" - -# for this package we're mostly interested in tracking debian patches, -# and not in the upstream version where all development has effectively stopped -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/blktool/" -UPSTREAM_CHECK_REGEX = "(?P((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" - -S = "${WORKDIR}/${BPN}-4.orig" - -inherit autotools pkgconfig From patchwork Wed Jan 8 08:42:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55206 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB18DE7719B for ; Wed, 8 Jan 2025 08:42:49 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web10.14226.1736325765154997671 for ; Wed, 08 Jan 2025 00:42:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OTltezuT; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5d122cf8dd1so28751059a12.2 for ; Wed, 08 Jan 2025 00:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325763; x=1736930563; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sHrzH0lZ55Ccfqbw/psQigbnfitEWMl6ifNmtzmZNnk=; b=OTltezuTwPNAios8iq0ccZUiJAh7EZgHvGvDFs00KrlaIsD2pWfvbPYooWTLUG3cTz ZUBTGmwxrQaEMiRgHZqwyJLvTe3xzfW+i3NTrAm4qvi6/n/QXkY9/TKtf44xYDzYoHV6 v96q8gy1j4DhNP4nZfTy1VIMWGR90K0Cc/YDNY6VXm4Iq3s/UTuuVwJgGDOIlfJ+U32k MqNxBj1IxtUOGzntzsT3kelIFGMQlkOLYPGtbGosAQYnt2XxvO1GRXwp56joBUXC7l2A aL69r/Pdr4rCgw7hyCbhGZlmXx9sdk2geJ0K0rtOF7WssXIY27ZbaKDJDYTywyEHbpw1 14Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325763; x=1736930563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sHrzH0lZ55Ccfqbw/psQigbnfitEWMl6ifNmtzmZNnk=; b=urgWfTTUW2horAIAdbwptUrTLCGFmAYTSsZJYZiQVnAWxZAdG9BU4iLYh4dQ66hF6M BDdYiZxyoICyPWGK/75RV6F5Q5bq6pgfm0QPh/fPnsokTByH6hUQY+0+CQTrauMebU66 TRg+ZEQ074gS0tAbyBliBDJOW+HkKdQwTYacoPNeQ5v+mtJh17GjEhInv3cSyZnzdYOT aEGwxZil8IFrJ7wqNC3uDYXzYwMAM8PjhBrGHZikjwdYDVDkuR5smTXepHYDIllWdxRF SPuU06BWG/4fWsDGwBsHfdeglvqQJydNhAIm4F/RTp+9HF5cHSkMZIIypsZqOxpuOPf6 DKTw== X-Gm-Message-State: AOJu0YyQKVlAzaPbQCGAfgcOblXygFLyRiLQ4Lq6ang3/85KeaDGeSxS R+wBlBaPooaWQuSmAEp+6YxZdStDa6PqMZ6RE+jIIXzOtsN90nwC8eWiww== X-Gm-Gg: ASbGncvsoDgWCuMeEpjOkBSdoQJiuu1AD77Sq9CI+BA23WCFFDPuBnM2lCW0B19UCKi teITZ5BCJmLGhI0BRusERwQV3HB60lEnWHeUsm7ZkKrNEfXGHdR6j8nujQN8NnPs7+NcE4eixhL 5Zx/X8DxRDALuoOsDT32ADh61gmaiJHVI8BNuy/SOCo3e+XWA9810LxFvC2CBeazLTbEXkMVgaN NyS5ZllRPC3LR7e9rIRO94M8IdjWRTIlFHvCygXOsYEYzl6uolye+bLtz2sHzGSZo5BPZ3uIXER bXTKZejzsfT/UKHYyg== X-Google-Smtp-Source: AGHT+IHj7cW5se22d6K7pGL3MDo3vKaCi2BrplNw0izT12bkhOj84mB+Mx81V0xJcPV9U6cfPcnqEQ== X-Received: by 2002:a17:906:7956:b0:aa6:707a:af59 with SMTP id a640c23a62f3a-ab2abdc36c5mr121690766b.50.1736325762379; Wed, 08 Jan 2025 00:42:42 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:42 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/20] python3-numpy: upgrade 2.1.3 -> 2.2.1 Date: Wed, 8 Jan 2025 09:42:24 +0100 Message-Id: <20250108084226.117178-18-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209541 From: Alexander Kanavin Add a svml option, disabled by default (it's avx-512 only, and uses randomly generated intermediate .o file names, which makes the installed library non-reproducible). Signed-off-by: Alexander Kanavin --- ...-and-so-on-for-libraries-by-default-.patch | 7 +-- ...1-numpy-core-Define-RISCV-32-support.patch | 58 ------------------- .../python3-numpy/fix_reproducibility.patch | 23 +++++--- ...-numpy_2.1.3.bb => python3-numpy_2.2.1.bb} | 5 +- 4 files changed, 21 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch rename meta/recipes-devtools/python/{python3-numpy_2.1.3.bb => python3-numpy_2.2.1.bb} (94%) diff --git a/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index bbe309c5568..4a673081062 100644 --- a/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ b/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch @@ -1,4 +1,4 @@ -From 46eea664cf89d0602e7ff16d587c37c045b125b7 Mon Sep 17 00:00:00 2001 +From 16a973c118989674afeeda2c2ccc24c9c366210e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 10 Dec 2015 13:20:30 +0200 Subject: [PATCH] Don't search /usr and so on for libraries by default to @@ -8,16 +8,15 @@ Subject: [PATCH] Don't search /usr and so on for libraries by default to Upstream-Status: Inappropriate (As the code stands, this is a hack) Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin - --- numpy/distutils/system_info.py | 42 +++++----------------------------- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index feb28f6..a48d6d1 100644 +index 6478548..c0620e7 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -327,44 +327,14 @@ def add_system_root(library_root): +@@ -326,44 +326,14 @@ def add_system_root(library_root): add_system_root(os.path.join(conda_dir, 'Library')) else: diff --git a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch deleted file mode 100644 index 6da9047ec57..00000000000 --- a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0e2b652a0eff85798584116c905a2d6ad8f25d5f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 15:32:39 -0800 -Subject: [PATCH] numpy/core: Define RISCV-32 support - -Helps compile on riscv32 - -Upstream-Status: Backport -(https://github.com/numpy/numpy/pull/17780/commits/0e2b652a0eff85798584116c905a2d6ad8f25d5f) - -Signed-off-by: Khem Raj ---- - numpy/_core/include/numpy/npy_cpu.h | 9 +++++++-- - numpy/_core/include/numpy/npy_endian.h | 1 + - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/numpy/_core/include/numpy/npy_cpu.h b/numpy/_core/include/numpy/npy_cpu.h -index a19f8e6bbd..15f9f12931 100644 ---- a/numpy/_core/include/numpy/npy_cpu.h -+++ b/numpy/_core/include/numpy/npy_cpu.h -@@ -18,6 +18,7 @@ - * NPY_CPU_ARCEL - * NPY_CPU_ARCEB - * NPY_CPU_RISCV64 -+ * NPY_CPU_RISCV32 - * NPY_CPU_LOONGARCH - * NPY_CPU_WASM - */ -@@ -102,8 +103,12 @@ - #define NPY_CPU_ARCEL - #elif defined(__arc__) && defined(__BIG_ENDIAN__) - #define NPY_CPU_ARCEB --#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 -- #define NPY_CPU_RISCV64 -+#elif defined(__riscv) -+ #if __riscv_xlen == 64 -+ #define NPY_CPU_RISCV64 -+ #elif __riscv_xlen == 32 -+ #define NPY_CPU_RISCV32 -+ #endif - #elif defined(__loongarch__) - #define NPY_CPU_LOONGARCH - #elif defined(__EMSCRIPTEN__) -diff --git a/numpy/_core/include/numpy/npy_endian.h b/numpy/_core/include/numpy/npy_endian.h -index 5e58a7f52c..09262120bf 100644 ---- a/numpy/_core/include/numpy/npy_endian.h -+++ b/numpy/_core/include/numpy/npy_endian.h -@@ -49,6 +49,7 @@ - || defined(NPY_CPU_PPC64LE) \ - || defined(NPY_CPU_ARCEL) \ - || defined(NPY_CPU_RISCV64) \ -+ || defined(NPY_CPU_RISCV32) \ - || defined(NPY_CPU_LOONGARCH) \ - || defined(NPY_CPU_WASM) - #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN --- -2.39.5 - diff --git a/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch b/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch index d952aed00c6..18d7f3f84e4 100644 --- a/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch +++ b/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch @@ -1,7 +1,11 @@ -This regex decides whether to use O3 opimisation on numpy or not. +From cde931f4380745b9818b55d7b06a43d347518967 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Fri, 29 Sep 2023 22:53:24 +0100 +Subject: [PATCH] This regex decides whether to use O3 opimisation on numpy or + not. It includes "od", which happens to be a substring of "reproducible" -but not "qemux86-world". +but not "qemux86-world". The regex will run against all compiler options including things like: @@ -17,12 +21,15 @@ reproducible target ran first and won the race to populate sstate. Upstream-Status: Inappropriate [upstream have dropped distutils and switched to meson] Signed-off-by: Richard Purdie - -Index: numpy-1.26.0/numpy/distutils/ccompiler_opt.py -=================================================================== ---- numpy-1.26.0.orig/numpy/distutils/ccompiler_opt.py -+++ numpy-1.26.0/numpy/distutils/ccompiler_opt.py -@@ -990,7 +990,7 @@ class _CCompiler: +--- + numpy/distutils/ccompiler_opt.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/distutils/ccompiler_opt.py b/numpy/distutils/ccompiler_opt.py +index b1a6fa3..7b0302b 100644 +--- a/numpy/distutils/ccompiler_opt.py ++++ b/numpy/distutils/ccompiler_opt.py +@@ -991,7 +991,7 @@ def __init__(self): ("cc_is_nocc", "", ""), ) detect_args = ( diff --git a/meta/recipes-devtools/python/python3-numpy_2.1.3.bb b/meta/recipes-devtools/python/python3-numpy_2.2.1.bb similarity index 94% rename from meta/recipes-devtools/python/python3-numpy_2.1.3.bb rename to meta/recipes-devtools/python/python3-numpy_2.2.1.bb index 0120bee4390..251e7b0c64d 100644 --- a/meta/recipes-devtools/python/python3-numpy_2.1.3.bb +++ b/meta/recipes-devtools/python/python3-numpy_2.2.1.bb @@ -9,11 +9,10 @@ SRCNAME = "numpy" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ - file://0001-numpy-core-Define-RISCV-32-support.patch \ file://fix_reproducibility.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "aa08e04e08aaf974d4458def539dece0d28146d866a39da5639596f4921fd761" +SRC_URI[sha256sum] = "45681fd7128c8ad1c379f0ca0776a8b0c6583d2f69889ddac01559dfe4390918" GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)$" @@ -22,6 +21,8 @@ inherit pkgconfig ptest python_mesonpy github-releases cython S = "${WORKDIR}/numpy-${PV}" +PACKAGECONFIG[svml] = "-Ddisable-svml=false,-Ddisable-svml=true" + # Remove references to buildpaths from numpy's __config__.py do_install:append() { sed -i \ From patchwork Wed Jan 8 08:42:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02FB9C3DA4A for ; Wed, 8 Jan 2025 08:42:50 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web11.14686.1736325765010691093 for ; Wed, 08 Jan 2025 00:42:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=drKz746u; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-aa68b513abcso3043028766b.0 for ; Wed, 08 Jan 2025 00:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325763; x=1736930563; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+cUZ8FtS/Wcj4OtFZ7Bf9FWZWajO8c8IWrNVgRVXLF0=; b=drKz746u2FqxGTHAogh1Fy8LQxk0z7qiR8NGUyb8ek3l5i8ZG5CDGZ+ARvOFkDDrUS vb3f1a1CWLeAWNZK++HXcGkj8qh17uu5IveJ42QURBFTaaXdPoJaLoYjhZ7povYbSkJj 5V6l94lHVDGwl50/g8l1S8fRVrlKaUHxpO1VVdg3ROw7Bo/+yaVtIsq3CDQPQgEWkVCF w3IfI5FYceIth85zpoAGUZ93RlDoWSIjQWNM/0QU0HMLV55Oy4cswfbXNhPbXK9d00hQ dMzUYlGLinsMAOM/A4iMlfgP0cA/aPUa1pQTKxGXRZY1EENp/OedySS6Okfl5IhMiifZ ALmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325763; x=1736930563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+cUZ8FtS/Wcj4OtFZ7Bf9FWZWajO8c8IWrNVgRVXLF0=; b=ZV6X7Crus3jryTF6bF2cpPadb3YwxTXwGV/BiRwolqmPgwK3+Z/QU0RMTsMGegs4gc jWzXBof6cUNsRwicLEz6Ry8EXBRoMLt4M/lXe2bZSMboy/pPmtI3jFiVOygXWHLJMiGY 5dqgUByEpky2BtdT22f+Nr96wsc1YaVCYXlJrMm/6LpdeRIx8Hzn3RFIUualP1lJlQyC CDFaCUzwR3PONZ/ByYQp/DW3ysEtJRM6XCANTwJFI/oQ+2ZYVNp898IgFHvmBI5StRIf NKvFg3vg0ts+AKxOlsdTxHbTJwJjbh8Ti9Zf+5bCc+4A852Lua9U5FWIJZ5N9DYWa6jP 3osg== X-Gm-Message-State: AOJu0YxU7qP1IIQKpQSUGqBHSr2l7UZHD0fNj3tJHlOl61120PcvLYqu KzDpGoxwsMHvEnkCbGJxgNTYf7oiabQ1S2BtHpGPEeu6/eo3ZCA64rRTAA== X-Gm-Gg: ASbGncttjkWVwcgP7oTorG5kCQcXB8YDy0GtqU/WmmpU3a8MKdCZaDJZ+HrbA5nFZWS tqlFHSl2R1XTlZV49lkWDjI3IRkBFTKvtaZZbQix7gQt/snN1U69Wp15z1FbuB4z/QYFADfaUQe BolyDXnkkR61qaUj8XJE4hdnrgEBuJi1NwQheyf78CaTL+vOfWlpwh2K52was3baIVzBedTsYki KYhBgkAWWu2mf6zFhtkp1KVIWlTBLuKdfVlp73fxD8CMapoHk16jnFh8W4CsQ71fiIW8Gkox4H8 4HkzU0040mcw36yNpw== X-Google-Smtp-Source: AGHT+IHkWZcBfaT73RNp1G1UXBO0BoqOkjr7NeONmZKIZG68gG8xlOVeSOtlgQkJh3K5KAcoJLoL8A== X-Received: by 2002:a17:907:1c22:b0:aa5:43c4:da78 with SMTP id a640c23a62f3a-ab2abdbfe39mr154629466b.51.1736325763063; Wed, 08 Jan 2025 00:42:43 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:42 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/20] tcl8: upgrade 8.6.15 -> 8.6.16 Date: Wed, 8 Jan 2025 09:42:25 +0100 Message-Id: <20250108084226.117178-19-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209540 From: Alexander Kanavin Adjust run-ptest to use the absolute ptest library location (tcl 9.x already does this) to avoid clock.test failures. Signed-off-by: Alexander Kanavin --- .../tcltk8/tcl8/alter-includedir.patch | 10 +++++----- .../tcltk8/tcl8/fix_non_native_build_issue.patch | 4 ++-- meta/recipes-devtools/tcltk8/tcl8/interp.patch | 6 +++--- meta/recipes-devtools/tcltk8/tcl8/run-ptest | 2 +- 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} | 3 ++- 7 files changed, 20 insertions(+), 19 deletions(-) rename meta/recipes-devtools/tcltk8/{tcl8_8.6.15.bb => tcl8_8.6.16.bb} (96%) diff --git a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch index bfc718cfd3c..6ceb297cea8 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 8bb8174e13c1c0e3b27fdf96a393f9fb1b7e14be Mon Sep 17 00:00:00 2001 From: Mingli Yu 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 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/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch index 7480156ce01..61153878fef 100644 --- a/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch +++ b/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch @@ -1,4 +1,4 @@ -From bd512547fc002fdb20808bf5b8b9feeb848b6512 Mon Sep 17 00:00:00 2001 +From 3d11e7fd9aba6251974d990286347c06582e87b9 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 13 Aug 2010 12:24:00 -0700 Subject: [PATCH] tcl: fix a build issue @@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index 965f6da..a0bd63f 100644 +index a2f9e21..c3b75e3 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -723,7 +723,7 @@ tcltest-real: diff --git a/meta/recipes-devtools/tcltk8/tcl8/interp.patch b/meta/recipes-devtools/tcltk8/tcl8/interp.patch index 2e0dc94cff1..a4fb0c5a9d4 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 09049beed723243d092ffaa37939dfe0f2ed6828 Mon Sep 17 00:00:00 2001 From: Ross Burton 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 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/run-ptest b/meta/recipes-devtools/tcltk8/tcl8/run-ptest index c485e535c71..bea9d9ccfd0 100644 --- a/meta/recipes-devtools/tcltk8/tcl8/run-ptest +++ b/meta/recipes-devtools/tcltk8/tcl8/run-ptest @@ -2,7 +2,7 @@ # clock.test needs a timezone to be set export TZ="Europe/London" -export TCL_LIBRARY=library +export TCL_LIBRARY=@libdir@/tcl8/ptest/library export ERROR_ON_FAILURES=1 # Some tests are overly strict with timings and fail on loaded systems. diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch index 1cd4d76283f..88faf8ac730 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 0d8e567d132e050c5d4a8d8d9257417e0679483c Mon Sep 17 00:00:00 2001 From: Richard Purdie 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 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 93e7877256b..0a0c1173a22 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 6e3cbc3600ac474776e92eb9a88abcb74299c321 Mon Sep 17 00:00:00 2001 From: "Song.Li" 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 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 96% rename from meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb rename to meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb index b13102dd7af..c8f4b5df2aa 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}" @@ -85,6 +85,7 @@ do_install_ptest() { cp ${B}/tcltest ${D}${PTEST_PATH} cp -r ${S}/library ${D}${PTEST_PATH} cp -r ${S}/tests ${D}${PTEST_PATH} + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest } do_install_ptest:append:libc-musl () { From patchwork Wed Jan 8 08:42:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 55204 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5A50E77188 for ; Wed, 8 Jan 2025 08:42:49 +0000 (UTC) Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mx.groups.io with SMTP id smtpd.web11.14687.1736325765638898872 for ; Wed, 08 Jan 2025 00:42:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ArB4Ugz8; spf=pass (domain: gmail.com, ip: 209.85.218.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-aab6fa3e20eso2732483366b.2 for ; Wed, 08 Jan 2025 00:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736325764; x=1736930564; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EBUCeohYynlPOKJA3nn/xKC6wKTeSKDk3z/fDLFLheo=; b=ArB4Ugz8dAf0nXWG+IwHM58O/2uJNbEfi0tGzn8jqbnx2rTldygi3uAe2aaoBIPdjT tRgrpo0PXLdZaIMPYR7gUsUW1O2pe20fWnFEoCQ9Gp9Xu0GsGJJsIuWWZyxlB50Zf6Xs NGXeJx/IOU49iOWXBV9g3+LEefIaMdKDD+/SzTWnMuwBO8liX/IBj2HOsPaPfxlkzHrG 9Bn6R8Kr5xQVgQNlueMzkY0sDkNTXRbweFDGlIbXb1fHIzfHDdZTZkZ9O2xOiWGiykfS IUQq1T2WdTps0eiLXfw59fwCAKC27EUfw/JeOtmNmgVrlonHynRRpr1U4dhVLiKSG+JN IWqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736325764; x=1736930564; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EBUCeohYynlPOKJA3nn/xKC6wKTeSKDk3z/fDLFLheo=; b=AvIOYT4HpqFEbOI+MjnL1sfzgVFBkTw8PuPkplERwxp99tzBEd5k+5lxJHYBFhgEXJ rOvrAmy8/TVjMlaS2OtOx3FuiSUIZPPRXoYbdmOHSpKszNaqkvWgz3iLcX/gCOMQbXoR 20De4VzNxFRAHcaudfEAJIgGH245+JGK/oMCZPj4AS/jU06/Uik5rJtI8pAEnWLKyKz/ i0CRgFWNvH/QOiyhOmC3hLrDxIr95WkZ8Yt6cfoc9INnNPoiAB9e0eQja1Mmp/Kz1YAr bJ1cVsRS/TKe/T3JA++cerPz3Vj8JgEnJyuN1T9mSu7AMMCgqTVm8uGYrTtHoSsGIbA2 0n/g== X-Gm-Message-State: AOJu0YyBkvs+zVrAGHbTmIQacvmalVZbMkBD7ZovIgp90DbuBTTf+TLK ffaMPzSRKxMx7v3PhzfAYAcyf8j0WwbnFuTS1dHhAzXUB4MuB5XFo0ikaw== X-Gm-Gg: ASbGncuU94j1Fn2KxydRYjer+co3TetSp62xpYkYEOLV/AGc/fev/z2sl2wFHfmkKgR bmCJp6mdPSWc2PJmOwddqBCkYd9gl1hH0ul9zV432LjMvDsb7AtMh7+C1ChcSFrrRMzBCQN1bX6 I7m8Vg2Qw4u+or+P8Ba6laNdzPzhvlUdfki2WREdWD+IzutBbaiGhNSqjd9LYhJDA54ccqGIwfE i4d2EXG8vXb1AD1y4FLdXnTC5TcKrteRlbpE3b1Vzd/H8KST1geWWK8t4/P2fQoRpTxsMvX5cUa CBLWl/j39BeHIzSzVg== X-Google-Smtp-Source: AGHT+IFKbhm7uNXds7BjhoSkoAQmD046lmLPWgfC2qWHzhrjoLfs35J/r/P7BKdQBACCqi2fuzQYYA== X-Received: by 2002:a17:907:1b97:b0:ab2:b610:35fb with SMTP id a640c23a62f3a-ab2b6103692mr70511666b.3.1736325763777; Wed, 08 Jan 2025 00:42:43 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0f06c7c2sm2499661766b.188.2025.01.08.00.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 00:42:43 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 20/20] python3-jinja2: upgrade 3.1.4 -> 3.1.5 Date: Wed, 8 Jan 2025 09:42:26 +0100 Message-Id: <20250108084226.117178-20-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250108084226.117178-1-alex.kanavin@gmail.com> References: <20250108084226.117178-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Jan 2025 08:42:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209542 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- .../python/python3-jinja2/fix-3.13.patch | 87 ------------------- .../python/python3-jinja2/run-ptest | 3 +- ...inja2_3.1.4.bb => python3-jinja2_3.1.5.bb} | 7 +- 3 files changed, 4 insertions(+), 93 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch rename meta/recipes-devtools/python/{python3-jinja2_3.1.4.bb => python3-jinja2_3.1.5.bb} (85%) diff --git a/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch b/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch deleted file mode 100644 index 34ecd15176c..00000000000 --- a/meta/recipes-devtools/python/python3-jinja2/fix-3.13.patch +++ /dev/null @@ -1,87 +0,0 @@ -From cf6ba7732b49ab4637aa747186cf1d1572688584 Mon Sep 17 00:00:00 2001 -From: Thomas Grainger -Date: Mon, 13 May 2024 18:02:35 +0100 -Subject: [PATCH] fix test_package_zip_list on 3.13 - -Upstream-Status: Backport [https://github.com/pallets/jinja/pull/1979] -Signed-off-by: Alexander Kanavin ---- - src/jinja2/loaders.py | 32 ++++++++++++++++++++++++++------ - tests/test_loader.py | 4 ++-- - 2 files changed, 28 insertions(+), 8 deletions(-) - -diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py -index 9eaf647..8c2c86c 100644 ---- a/src/jinja2/loaders.py -+++ b/src/jinja2/loaders.py -@@ -238,6 +238,30 @@ class FileSystemLoader(BaseLoader): - return sorted(found) - - -+if sys.version_info >= (3, 13): -+ -+ def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]: -+ try: -+ get_files = z._get_files -+ except AttributeError as e: -+ raise TypeError( -+ "This zip import does not have the required" -+ " metadata to list templates." -+ ) from e -+ return get_files() -+else: -+ -+ def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]: -+ try: -+ files = z._files -+ except AttributeError as e: -+ raise TypeError( -+ "This zip import does not have the required" -+ " metadata to list templates." -+ ) from e -+ return files # type: ignore[no-any-return] -+ -+ - class PackageLoader(BaseLoader): - """Load templates from a directory in a Python package. - -@@ -382,11 +406,7 @@ class PackageLoader(BaseLoader): - for name in filenames - ) - else: -- if not hasattr(self._loader, "_files"): -- raise TypeError( -- "This zip import does not have the required" -- " metadata to list templates." -- ) -+ files = _get_zipimporter_files(self._loader) - - # Package is a zip file. - prefix = ( -@@ -395,7 +415,7 @@ class PackageLoader(BaseLoader): - ) - offset = len(prefix) - -- for name in self._loader._files.keys(): -+ for name in files: - # Find names under the templates directory that aren't directories. - if name.startswith(prefix) and name[-1] != os.path.sep: - results.append(name[offset:].replace(os.path.sep, "/")) -diff --git a/tests/test_loader.py b/tests/test_loader.py -index 77d686e..e0683e4 100644 ---- a/tests/test_loader.py -+++ b/tests/test_loader.py -@@ -364,8 +364,8 @@ def test_package_zip_source(package_zip_loader, template, expect): - - - @pytest.mark.xfail( -- platform.python_implementation() == "PyPy", -- reason="PyPy's zipimporter doesn't have a '_files' attribute.", -+ sys.implementation.name == "pypy", -+ reason="zipimporter doesn't have a '_files' attribute", - raises=TypeError, - ) - def test_package_zip_list(package_zip_loader): --- -2.39.5 - diff --git a/meta/recipes-devtools/python/python3-jinja2/run-ptest b/meta/recipes-devtools/python/python3-jinja2/run-ptest index 8d2017d39ce..4c351af5e71 100644 --- a/meta/recipes-devtools/python/python3-jinja2/run-ptest +++ b/meta/recipes-devtools/python/python3-jinja2/run-ptest @@ -1,3 +1,4 @@ #!/bin/sh -pytest --automake +# test_async items require trio module +pytest --automake --ignore=./tests/test_async.py --ignore=./tests/test_async_filters.py diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.5.bb similarity index 85% rename from meta/recipes-devtools/python/python3-jinja2_3.1.4.bb rename to meta/recipes-devtools/python/python3-jinja2_3.1.5.bb index fd0afc1cb14..e5212e7ffc0 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://pypi.org/project/Jinja2/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" -SRC_URI[sha256sum] = "4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369" +SRC_URI[sha256sum] = "8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb" PYPI_PACKAGE = "jinja2" @@ -14,10 +14,7 @@ CLEANBROKEN = "1" inherit pypi python_flit_core ptest -SRC_URI += " \ - file://run-ptest \ - file://fix-3.13.patch \ -" +SRC_URI += "file://run-ptest" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests