[10/24] kmod: upgrade 32 -> 33

From: Wang Mingyu <wangmy@fujitsu.com>

0001-Use-portable-implementation-for-basename-API.patch
avoid_parallel_tests.patch
gtkdocdir.patch
refreshed for 33

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...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%)

The 0001-Use-portable-implementation-for-basename-API.patch should be dropped, as it has been merged upstream, with some changes.

Regards,
Qi

-----Original Message-----
From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of wangmy via lists.openembedded.org
Sent: Tuesday, August 20, 2024 2:51 PM
To: openembedded-core@lists.openembedded.org
Cc: Wang Mingyu <wangmy@fujitsu.com>
Subject: [OE-core] [PATCH 10/24] kmod: upgrade 32 -> 33

From: Wang Mingyu <wangmy@fujitsu.com>

0001-Use-portable-implementation-for-basename-API.patch
avoid_parallel_tests.patch
gtkdocdir.patch
refreshed for 33

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...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..57330ff2a6 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 1ea666f8a2384581b5a960020acb958310cae95b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 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 <raj.khem@gmail.com>
 ---
  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 <stdbool.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <time.h>
-@@ -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] <test>\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..f7ebe184a3 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 94aa964b875b391ad03ff79ea36c82292d53bf17 Mon Sep 17 00:00:00 2001
 From: Tudor Florea <tudor.florea@enea.com>
 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 <tudor.florea@enea.com>
 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..8aa2763d9c 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 1d6d57c2da502dfcc4f09356306177130ceceec9 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 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 <ross.burton@arm.com>
  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 \
--
2.34.1