Skip to contentSkip to conversation

kmod: upgrade 32 -> 33

PATCH In review [email protected] 3 participants 5 messages Aug 20, 2024 – Aug 21, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 kmod: upgrade 32 -> 33

From: Wang Mingyu <[email protected]>

0001-Use-portable-implementation-for-basename-API.patch removed since it's included in 33

avoid_parallel_tests.patch
gtkdocdir.patch
refreshed for 33

---
 ...able-implementation-for-basename-API.patch | 136 ------------------
 .../kmod/kmod/avoid_parallel_tests.patch      |  10 +-
 meta/recipes-kernel/kmod/kmod/gtkdocdir.patch |   9 +-
 .../kmod/{kmod_32.bb => kmod_33.bb}           |   3 +-
 4 files changed, 8 insertions(+), 150 deletions(-)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch
 rename meta/recipes-kernel/kmod/{kmod_32.bb => kmod_33.bb} (96%)
meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch deleted +0 -136
deleted file mode 100644
index 6a7f9ded4f..0000000000
@@ -1,136 +0,0 @@
-From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 9 Dec 2023 17:35:59 -0800
-Subject: [PATCH] Use portable implementation for basename API
-
-musl has removed the non-prototype declaration of basename from
-string.h [1] which now results in build errors with clang-17+ compiler
-
-Implement GNU basename behavior using strchr which is portable across libcs
-
-Fixes
-../git/tools/kmod.c:71:19: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-71 | "Commands:\n", basename(argv[0]));
-| ^
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://github.com/kmod-project/kmod/pull/32]
-
-Suggested-by: Rich Felker
-
-Signed-off-by: Khem Raj <[email protected]>
----
- libkmod/libkmod-config.c | 2 +-
- shared/util.c            | 4 ++--
- shared/util.h            | 7 +++++++
- testsuite/testsuite.c    | 2 +-
- tools/depmod.c           | 2 +-
- tools/kmod.c             | 4 ++--
- 6 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
-index e83621b..8aa555a 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,
- 	bool is_single = false;
- 
- 	if (name == NULL) {
--		name = basename(path);
-+		name = gnu_basename(path);
- 		is_single = true;
- 	}
- 
-diff --git a/shared/util.c b/shared/util.c
-index e2bab83..0e16670 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)
- {
--	char *modname;
-+	const char *modname;
- 
--	modname = basename(path);
-+	modname = gnu_basename(path);
- 	if (modname == NULL || modname[0] == '\0')
- 		return NULL;
- 
-diff --git a/shared/util.h b/shared/util.h
-index c4a3916..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 {						\
- 	__p->__v = (val);			\
- } while(0)
- 
-+static _always_inline_ const char *gnu_basename(const char *s)
-+{
-+  const char *p = strrchr(s, '/');
-+  return p ? p+1 : s;
-+}
-+
- static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u)
- {
- 	return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1));
-diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
-index 318343a..aafc987 100644
---- a/testsuite/testsuite.c
-+++ b/testsuite/testsuite.c
-@@ -70,7 +70,7 @@ static void help(void)
- 
- 	printf("Usage:\n"
- 	       "\t%s [options] <test>\n"
--	       "Options:\n", basename(progname));
-+	       "Options:\n", gnu_basename(progname));
- 
- 	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
---- 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
- 	if (name != NULL)
- 		namelen = strlen(name);
- 	else {
--		name = basename(dir);
-+		name = gnu_basename(dir);
- 		namelen = strlen(name);
- 		dirlen -= namelen + 1;
- 	}
-diff --git a/tools/kmod.c b/tools/kmod.c
-index 55689c0..df91e5c 100644
---- a/tools/kmod.c
-+++ b/tools/kmod.c
-@@ -68,7 +68,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"
--			"Commands:\n", basename(argv[0]));
-+			"Commands:\n", gnu_basename(argv[0]));
- 
- 	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[])
- 	const char *cmd;
- 	size_t i;
- 
--	cmd = basename(argv[0]);
-+	cmd = gnu_basename(argv[0]);
- 
- 	for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) {
- 		if (streq(kmod_compat_cmds[i]->name, cmd))
--- 
-2.43.0
-
meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +4 -6
index 04a8204815..f7ebe184a3 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 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])])
+ 
meta/recipes-kernel/kmod/kmod/gtkdocdir.patch +3 -6
index a34ea466e8..8aa2763d9c 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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
-
meta/recipes-kernel/kmod/kmod_33.bb renamed from meta/recipes-kernel/kmod/kmod_32.bb +1 -2
similarity index 96%
rename from meta/recipes-kernel/kmod/kmod_32.bb
rename to meta/recipes-kernel/kmod/kmod_33.bb
index 1c4e5a94db..a4a3a6b088 100644
@@ -15,12 +15,11 @@ 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 \
            file://avoid_parallel_tests.patch \
-           file://0001-Use-portable-implementation-for-basename-API.patch \
            file://gtkdocdir.patch \
            "
 
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/1 systemd: upgrade 256.4 -> 256.5

From: Wang Mingyu <[email protected]>

---
 ...ystemd-boot-native_256.4.bb => systemd-boot-native_256.5.bb} | 0
 .../systemd/{systemd-boot_256.4.bb => systemd-boot_256.5.bb}    | 0
 meta/recipes-core/systemd/systemd.inc                           | 2 +-
 .../recipes-core/systemd/{systemd_256.4.bb => systemd_256.5.bb} | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/systemd/{systemd-boot-native_256.4.bb => systemd-boot-native_256.5.bb} (100%)
 rename meta/recipes-core/systemd/{systemd-boot_256.4.bb => systemd-boot_256.5.bb} (100%)
 rename meta/recipes-core/systemd/{systemd_256.4.bb => systemd_256.5.bb} (100%)
meta/recipes-core/systemd/systemd-boot-native_256.5.bb renamed from meta/recipes-core/systemd/systemd-boot-native_256.4.bb +0 -0
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot-native_256.4.bb
rename to meta/recipes-core/systemd/systemd-boot-native_256.5.bb
meta/recipes-core/systemd/systemd-boot_256.5.bb renamed from meta/recipes-core/systemd/systemd-boot_256.4.bb +0 -0
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_256.4.bb
rename to meta/recipes-core/systemd/systemd-boot_256.5.bb
meta/recipes-core/systemd/systemd.inc +1 -1
index 63f024baa9..83dcd65a83 100644
@@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "566210c272820ca6655800ce0d27b6ebc0aedc4c"
+SRCREV = "b45730389ba025489ec8d445bc91534fef515c28"
 SRCBRANCH = "v256-stable"
 SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH}"
 
meta/recipes-core/systemd/systemd_256.5.bb renamed from meta/recipes-core/systemd/systemd_256.4.bb +0 -0
similarity index 100%
rename from meta/recipes-core/systemd/systemd_256.4.bb
rename to meta/recipes-core/systemd/systemd_256.5.bb
Signature · 1 line
2.34.1
#2 lore raw
In reply to [email protected]
Quoted 10 lines · wangmy via lists.openembedded.org

From: Wang Mingyu <[email protected]>

0001-Use-portable-implementation-for-basename-API.patch removed since it's included in 33

avoid_parallel_tests.patch
gtkdocdir.patch
refreshed for 33

Quoted 8 lines

---
 ...able-implementation-for-basename-API.patch | 136 ------------------ .../kmod/kmod/avoid_parallel_tests.patch      |  10 +- meta/recipes-kernel/kmod/kmod/gtkdocdir.patch |   9 +- .../kmod/{kmod_32.bb => kmod_33.bb}           |   3 +-

 4 files changed, 8 insertions(+), 150 deletions(-)

 delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch rename meta/recipes-kernel/kmod/{kmod_32.bb => kmod_33.bb} (96%)

It looks like this has failures when manpages are enabled:

https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/7027/steps/14/logs/stdio

(selftest)

| checking for scdoc... no
| configure: error: *** scdoc needed for building manpages. Either install it or pass --disable-manpages

https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/6302/steps/11/logs/stdio

(docs world build)

Cheers,

Richard

#3 lore raw

I have a patch where this is addressed in
https://git.yoctoproject.org/poky-contrib/log/?h=akanavin/package-version-updates

The whole set is being tested in a-full now.

Alex

Quoted 55 lines · Richard Purdie via lists.openembedded.org
Quoted 9 lines · wangmy via lists.openembedded.org

From: Wang Mingyu <[email protected]>

0001-Use-portable-implementation-for-basename-API.patch removed since it's included in 33

avoid_parallel_tests.patch
gtkdocdir.patch
refreshed for 33

Quoted 8 lines
---
 ...able-implementation-for-basename-API.patch | 136 ------------------
 .../kmod/kmod/avoid_parallel_tests.patch      |  10 +-
 meta/recipes-kernel/kmod/kmod/gtkdocdir.patch |   9 +-
 .../kmod/{kmod_32.bb => kmod_33.bb}           |   3 +-
 4 files changed, 8 insertions(+), 150 deletions(-)
 delete mode 100644

meta/recipes-kernel/kmod/kmod/0001-Use-portable-implementation-for-basename-API.patch

Quoted 1 line
 rename meta/recipes-kernel/kmod/{kmod_32.bb => kmod_33.bb} (96%)

It looks like this has failures when manpages are enabled:

https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/7027/steps/14/logs/stdio

(selftest)

| checking for scdoc... no
| configure: error: *** scdoc needed for building manpages. Either install it or pass --disable-manpages

https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/6302/steps/11/logs/stdio

(docs world build)

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#203575):
https://lists.openembedded.org/g/openembedded-core/message/203575
Mute This Topic: https://lists.openembedded.org/mt/107997333/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw
Quoted 4 lines · Alexander Kanavin

I have a patch where this is addressed in
https://git.yoctoproject.org/poky-contrib/log/?h=akanavin/package-version-updates

The whole set is being tested in a-full now.

This is getting a bit tricky as Wang Mingyu posted a series and there is change log information in many of those commits.

I had tested the other series with an a-full with two issues found, I'm in the process of re-testing it without those two commits (after your build).

Somehow I'll have to try and pull the best bits of both series together...

Cheers,

Richard