From patchwork Thu Aug 15 18:58:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 47878 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 645A3C54E65 for ; Thu, 15 Aug 2024 18:59:05 +0000 (UTC) Received: from a27-45.smtp-out.us-west-2.amazonses.com (a27-45.smtp-out.us-west-2.amazonses.com [54.240.27.45]) by mx.groups.io with SMTP id smtpd.web10.131094.1723748333948332047 for ; Thu, 15 Aug 2024 11:58:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=Us276XS1; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=R6W19x01; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.45, mailfrom: 0101019157683f18-8925fc2a-b24a-43b5-ba17-a85c1815a073-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1723748335; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=m4S5S0zqmJI/sj5Ifx8t/XyUsnXB2dIrtqDC4unGec4=; b=Us276XS1r2mfYApG1aKXhrX/wOkzMwHOPqX7N1pwYOXCTevi7Jhm8eOEVd7Yf7MQ uQTnfoiT1jaiuP/apGsHmSAjAv4Dc8DfuZFJXRWs6Y4tycCkyRCNimQNhTfKGCwnPPP JVvueBQfFpKNTxGAOBFdyR7RKI0MbjuziLgPaptE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1723748335; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=m4S5S0zqmJI/sj5Ifx8t/XyUsnXB2dIrtqDC4unGec4=; b=R6W19x01TFhij2V5ZUEd3jhwrLq9E/7tB+7qSI2J/onB5zWCGt4kcnsyMqypVu2I TpL7ilXoA3NMxx/TdEnczCRvrG4cxOW8gQ26e99LssJYbRTXQAG/qLSvwPjBQy9q190 krF3Z6rL7y65BDEK4N4qDY1eMz7ndSVy/BftIOsA= MIME-Version: 1.0 From: auh@yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] kmod: upgrading to 33 SUCCEEDED Message-ID: <0101019157683f18-8925fc2a-b24a-43b5-ba17-a85c1815a073-000000@us-west-2.amazonses.com> Date: Thu, 15 Aug 2024 18:58:55 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.08.15-54.240.27.45 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 ; Thu, 15 Aug 2024 18:59:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203442 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *kmod* to *33* has Succeeded. Next steps: - apply the patch: git am 0001-kmod-upgrade-32-33.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From ce59b8e334fecd100555ccc7e3b3b4a75684bc67 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 15 Aug 2024 15:54:10 +0000 Subject: [PATCH] kmod: upgrade 32 -> 33 --- ...able-implementation-for-basename-API.patch | 50 +++++++------------ .../kmod/kmod/avoid_parallel_tests.patch | 10 ++-- meta/recipes-kernel/kmod/kmod/gtkdocdir.patch | 9 ++-- .../kmod/{kmod_32.bb => kmod_33.bb} | 2 +- 4 files changed, 26 insertions(+), 45 deletions(-) rename meta/recipes-kernel/kmod/{kmod_32.bb => kmod_33.bb} (98%) diff --git a/meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch b/meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch index 6a7f9ded4f..d4fc88c338 100644 --- a/meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch +++ b/meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch @@ -1,4 +1,4 @@ -From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001 +From c3a9d346c6541aa20723bfcd6306c22ca1d32055 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 9 Dec 2023 17:35:59 -0800 Subject: [PATCH] Use portable implementation for basename API @@ -22,18 +22,18 @@ Suggested-by: Rich Felker Signed-off-by: Khem Raj --- libkmod/libkmod-config.c | 2 +- - shared/util.c | 4 ++-- - shared/util.h | 7 +++++++ + shared/util.c | 2 +- + shared/util.h | 6 ++++++ testsuite/testsuite.c | 2 +- tools/depmod.c | 2 +- tools/kmod.c | 4 ++-- - 6 files changed, 14 insertions(+), 7 deletions(-) + 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c -index e83621b..8aa555a 100644 +index 919f4ed..02aca03 100644 --- a/libkmod/libkmod-config.c +++ b/libkmod/libkmod-config.c -@@ -794,7 +794,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx, +@@ -957,7 +957,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx, bool is_single = false; if (name == NULL) { @@ -43,15 +43,12 @@ index e83621b..8aa555a 100644 } diff --git a/shared/util.c b/shared/util.c -index e2bab83..0e16670 100644 +index 66a7622..c46af99 100644 --- a/shared/util.c +++ b/shared/util.c -@@ -172,9 +172,9 @@ char *modname_normalize(const char *modname, char buf[static PATH_MAX], size_t * - - char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) +@@ -160,7 +160,7 @@ char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) { -- char *modname; -+ const char *modname; + const char *modname; - modname = basename(path); + modname = gnu_basename(path); @@ -59,18 +56,10 @@ index e2bab83..0e16670 100644 return NULL; diff --git a/shared/util.h b/shared/util.h -index c4a3916..073dc5a 100644 +index 2a377dd..073dc5a 100644 --- a/shared/util.h +++ b/shared/util.h -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -76,6 +77,12 @@ do { \ +@@ -77,6 +77,12 @@ do { \ __p->__v = (val); \ } while(0) @@ -84,10 +73,10 @@ index c4a3916..073dc5a 100644 { return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1)); diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c -index 318343a..aafc987 100644 +index a567839..1af8702 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c -@@ -70,7 +70,7 @@ static void help(void) +@@ -59,7 +59,7 @@ static void help(void) printf("Usage:\n" "\t%s [options] \n" @@ -97,10 +86,10 @@ index 318343a..aafc987 100644 for (itr = options, itr_short = options_short; itr->name != NULL; itr++, itr_short++) diff --git a/tools/depmod.c b/tools/depmod.c -index 43fc354..cfb15b1 100644 +index 8b0a428..e8e3869 100644 --- a/tools/depmod.c +++ b/tools/depmod.c -@@ -762,7 +762,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files +@@ -724,7 +724,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files if (name != NULL) namelen = strlen(name); else { @@ -110,10 +99,10 @@ index 43fc354..cfb15b1 100644 dirlen -= namelen + 1; } diff --git a/tools/kmod.c b/tools/kmod.c -index 55689c0..df91e5c 100644 +index d28ec7b..4e5c422 100644 --- a/tools/kmod.c +++ b/tools/kmod.c -@@ -68,7 +68,7 @@ static int kmod_help(int argc, char *argv[]) +@@ -50,7 +50,7 @@ static int kmod_help(int argc, char *argv[]) "Options:\n" "\t-V, --version show version\n" "\t-h, --help show this help\n\n" @@ -122,7 +111,7 @@ index 55689c0..df91e5c 100644 for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { if (kmod_cmds[i]->help != NULL) { -@@ -156,7 +156,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[]) +@@ -138,7 +138,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[]) const char *cmd; size_t i; @@ -131,6 +120,3 @@ index 55689c0..df91e5c 100644 for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) { if (streq(kmod_compat_cmds[i]->name, cmd)) --- -2.43.0 - diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch index 04a8204815..6db4fa7e97 100644 --- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From be6f82c54f694617c646ca1f8b5bcf93694e20ad Mon Sep 17 00:00:00 2001 +From 7a22abf188e5b688080bb1321a77588474114339 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 6 Sep 2013 21:11:57 +0000 Subject: [PATCH] kmod: avoid parallel-tests @@ -11,16 +11,15 @@ serial-tests is now required Signed-off-by: Tudor Florea Upstream-Status: Inappropriate (disable feature incompatible with ptest) - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index ee72283..60980c0 100644 +index 2f1c525..7056aae 100644 --- a/configure.ac +++ b/configure.ac -@@ -14,8 +14,8 @@ AC_USE_SYSTEM_EXTENSIONS +@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE AC_PREFIX_DEFAULT([/usr]) AM_MAINTAINER_MODE([enable]) @@ -28,5 +27,4 @@ index ee72283..60980c0 100644 +AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) AM_SILENT_RULES([yes]) LT_INIT([disable-static pic-only]) - - AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])]) + diff --git a/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch b/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch index a34ea466e8..91d622b8c7 100644 --- a/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch +++ b/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch @@ -1,4 +1,4 @@ -From dd59095f70f774f6d1e767010e25b35ef6db4c4b Mon Sep 17 00:00:00 2001 +From 90fb7bb85002cde39de3b3d2e2481933390832af Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 8 Dec 2023 22:35:45 +0000 Subject: [PATCH] configure: set docdir in GTK_DOC_CHECK @@ -16,10 +16,10 @@ Signed-off-by: Ross Burton 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index de01e08..67696c4 100644 +index 7056aae..d53a20c 100644 --- a/configure.ac +++ b/configure.ac -@@ -255,7 +255,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [ +@@ -236,7 +236,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [ AM_CONDITIONAL([ENABLE_COVERAGE], [test "x$enable_coverage" = "xyes"]) m4_ifdef([GTK_DOC_CHECK], [ @@ -28,6 +28,3 @@ index de01e08..67696c4 100644 ], [ AM_CONDITIONAL([ENABLE_GTK_DOC], false)]) --- -2.34.1 - diff --git a/meta/recipes-kernel/kmod/kmod_32.bb b/meta/recipes-kernel/kmod/kmod_33.bb similarity index 98% rename from meta/recipes-kernel/kmod/kmod_32.bb rename to meta/recipes-kernel/kmod/kmod_33.bb index 1c4e5a94db..8ee9618982 100644 --- a/meta/recipes-kernel/kmod/kmod_32.bb +++ b/meta/recipes-kernel/kmod/kmod_33.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " inherit autotools bash-completion gtk-doc pkgconfig manpages update-alternatives -SRCREV = "41faa59711742c1476d59985011ee0f27ed91d30" +SRCREV = "e193aeb99a04fb4b63ce47eb2c7f119db59446a0" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master;protocol=https \ file://depmod-search.conf \