From e0b36559faa0aed82b8f7a0685e4dbe301be071f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 4 Mar 2024 08:01:04 +0000 Subject: [PATCH] sys-apps/kmod: Sync with Gentoo It's from Gentoo commit bc235c9a342826e6aab77d08ded3ca008823dd28. --- .../portage-stable/sys-apps/kmod/Manifest | 1 - .../files/kmod-30-configure-clang16.patch | 26 ---- .../kmod/files/kmod-31-musl-basename.patch | 113 ++++++++++++++++++ .../{kmod-30-r1.ebuild => kmod-31-r1.ebuild} | 109 +++-------------- .../sys-apps/kmod/kmod-9999.ebuild | 102 +++------------- 5 files changed, 145 insertions(+), 206 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-30-configure-clang16.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch rename sdk_container/src/third_party/portage-stable/sys-apps/kmod/{kmod-30-r1.ebuild => kmod-31-r1.ebuild} (57%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest index c20a66d382..554efc99d6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest @@ -1,2 +1 @@ -DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-30-configure-clang16.patch b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-30-configure-clang16.patch deleted file mode 100644 index a9e1093aec..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-30-configure-clang16.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/kmod-project/kmod/commit/035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 - -From 035e6667d1ace2fd77ef36f5e5d93cd4b1e128a2 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Sat, 17 Dec 2022 17:52:34 +0100 -Subject: [PATCH] kmod: configure.ac: In _Noreturn check, include - for exit - -Otherwise, an implicit functiona declaration is used, causing -a C99 compatibility issue. - -Signed-off-by: Florian Weimer -Signed-off-by: Lucas De Marchi ---- a/configure.ac -+++ b/configure.ac -@@ -68,7 +68,8 @@ AC_COMPILE_IFELSE( - - AC_MSG_CHECKING([whether _Noreturn is supported]) - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE([[_Noreturn int foo(void) { exit(0); }]])], -+ [AC_LANG_SOURCE([[#include -+ _Noreturn int foo(void) { exit(0); }]])], - [AC_DEFINE([HAVE_NORETURN], [1], [Define if _Noreturn is available]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch new file mode 100644 index 0000000000..f4839dad24 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch @@ -0,0 +1,113 @@ +https://github.com/kmod-project/kmod/pull/32 + +From 721ed6040c7aa47070faf6378c433089e178bd43 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 + +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 + +Suggested-by: Rich Felker + +Signed-off-by: Khem Raj +--- 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; + } + +--- 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; + +--- a/shared/util.h ++++ b/shared/util.h +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -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)); +--- a/testsuite/testsuite.c ++++ b/testsuite/testsuite.c +@@ -70,7 +70,7 @@ static void help(void) + + printf("Usage:\n" + "\t%s [options] \n" +- "Options:\n", basename(progname)); ++ "Options:\n", gnu_basename(progname)); + + for (itr = options, itr_short = options_short; + itr->name != NULL; itr++, itr_short++) +--- 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; + } +--- 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)) + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-30-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-31-r1.ebuild similarity index 57% rename from sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-30-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-31-r1.ebuild index 5dff140732..d0de1d663e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-31-r1.ebuild @@ -3,24 +3,22 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +inherit autotools libtool bash-completion-r1 -inherit autotools libtool bash-completion-r1 python-r1 +DESCRIPTION="Library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" +IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -31,15 +29,16 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch # - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND="!sys-apps/module-init-tools +RDEPEND=" + !sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= )" + zstd? ( >=app-arch/zstd-1.5.2-r1:= ) +" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -47,23 +46,14 @@ BDEPEND=" dev-build/gtk-doc-am ) lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then - BDEPEND="${BDEPEND} - dev-libs/libxslt" + BDEPEND+=" dev-libs/libxslt" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( NEWS README.md TODO ) - PATCHES=( - "${FILESDIR}"/${P}-configure-clang16.patch + "${FILESDIR}"/${PN}-31-musl-basename.patch ) src_prepare() { @@ -78,10 +68,7 @@ src_prepare() { fi eautoreconf else - #elibtoolize - # TODO: restore to elibtoolize in next release after 30 - # autoreconf only here for clang patch. - eautoreconf + elibtoolize fi # Restore possibility of running --enable-static, bug #472608 @@ -96,8 +83,9 @@ src_configure() { --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" + --disable-python $(use_enable debug) - $(usex doc '--enable-gtk-doc' '') + $(usev doc '--enable-gtk-doc') $(use_enable static-libs static) $(use_enable tools) $(use_with lzma xz) @@ -106,76 +94,11 @@ src_configure() { $(use_with zstd) ) - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_test() { - python_test() { - mkdir "${T}/test-${EPYTHON}" || die - emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - - # Smoke test based on https://bugs.gentoo.org/891975#c5 - local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" - ${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die - rm -r "${T}/test-${EPYTHON}" || die - } - - if use python; then - python_foreach_impl python_test - fi + econf "${myeconfargs[@]}" } src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - - einstalldocs - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - python_optimize - } - - python_foreach_impl python_install - fi + default find "${ED}" -type f -name "*.la" -delete || die diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild index a67cecf3e9..d0de1d663e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild @@ -3,9 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +inherit autotools libtool bash-completion-r1 -inherit autotools libtool bash-completion-r1 python-r1 +DESCRIPTION="Library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -15,12 +16,9 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" +IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -31,15 +29,16 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" # - >=zlib-1.2.6 required because of bug #427130 # - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch # - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND="!sys-apps/module-init-tools +RDEPEND=" + !sys-apps/module-init-tools !sys-apps/modutils !=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= )" + zstd? ( >=app-arch/zstd-1.5.2-r1:= ) +" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -47,20 +46,15 @@ BDEPEND=" dev-build/gtk-doc-am ) lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then - BDEPEND="${BDEPEND} - dev-libs/libxslt" + BDEPEND+=" dev-libs/libxslt" fi -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( NEWS README.md TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-31-musl-basename.patch +) src_prepare() { default @@ -89,8 +83,9 @@ src_configure() { --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" + --disable-python $(use_enable debug) - $(usex doc '--enable-gtk-doc' '') + $(usev doc '--enable-gtk-doc') $(use_enable static-libs static) $(use_enable tools) $(use_with lzma xz) @@ -99,76 +94,11 @@ src_configure() { $(use_with zstd) ) - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_test() { - python_test() { - mkdir "${T}/test-${EPYTHON}" || die - emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - - # Smoke test based on https://bugs.gentoo.org/891975#c5 - local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" - ${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die - rm -r "${T}/test-${EPYTHON}" || die - } - - if use python; then - python_foreach_impl python_test - fi + econf "${myeconfargs[@]}" } src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - - einstalldocs - - if use python; then - local native_builddir="${BUILD_DIR}" - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - python_optimize - } - - python_foreach_impl python_install - fi + default find "${ED}" -type f -name "*.la" -delete || die