diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch deleted file mode 100644 index 6db4fa7e97..0000000000 --- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - -Avoid parallel-tests as it remove -buildtest-TESTS and runtest-TESTS targets required by ptest. -In automake 1.13.4 parallel-tests is assumed by defauls. -In order to have buildtest-TESTS and runtest-TESTS targets -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 2f1c525..7056aae 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS - AC_SYS_LARGEFILE - AC_PREFIX_DEFAULT([/usr]) - AM_MAINTAINER_MODE([enable]) --AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) -+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]) - diff --git a/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch b/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch deleted file mode 100644 index 91d622b8c7..0000000000 --- a/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - -By passing --docdir in the GTK_DOC_CHECK arguments (to match -autogen.sh) autoreconf will work out of the box. - -Without this autoreconf fails due to the documentation not being in -./docs, the default location. - -Upstream-Status: Submitted [https://lore.kernel.org/linux-modules/20231208224511.1363066-1-ross.burton@arm.com/T/#u] -Signed-off-by: Ross Burton ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7056aae..d53a20c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -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], [ --GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat]) -+GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat --docdir libkmod/docs]) - ], [ - AM_CONDITIONAL([ENABLE_GTK_DOC], false)]) - diff --git a/meta/recipes-kernel/kmod/kmod/run-ptest b/meta/recipes-kernel/kmod/kmod/run-ptest deleted file mode 100755 index 598dd2cb5f..0000000000 --- a/meta/recipes-kernel/kmod/kmod/run-ptest +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -touch testsuite/stamp-rootfs -tar xf testmodule.tar -make -k runtest-TESTS 2>/dev/null| grep -e ^PASS -e ^FAIL -find testsuite -name *.ko -exec rm -f {} \; diff --git a/meta/recipes-kernel/kmod/kmod_33.bb b/meta/recipes-kernel/kmod/kmod_34.1.bb similarity index 58% rename from meta/recipes-kernel/kmod/kmod_33.bb rename to meta/recipes-kernel/kmod/kmod_34.1.bb index 15f42766f3..8154e6ec57 100644 --- a/meta/recipes-kernel/kmod/kmod_33.bb +++ b/meta/recipes-kernel/kmod/kmod_34.1.bb @@ -13,28 +13,28 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tools/COPYING;md5=751419260aa954499f7abaabaa882bbe \ " -inherit autotools bash-completion gtk-doc pkgconfig update-alternatives +inherit bash-completion gtk-doc manpages meson pkgconfig update-alternatives -SRCREV = "e193aeb99a04fb4b63ce47eb2c7f119db59446a0" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master;protocol=https \ +SRC_URI = "https://www.kernel.org/pub/linux/utils/kernel/${BPN}/${BP}.tar.xz \ file://depmod-search.conf \ - file://avoid_parallel_tests.patch \ - file://gtkdocdir.patch \ " +SRC_URI[sha256sum] = "125957c9125fc5db1bd6a2641a1c9a6a0b500882fb8ccf7fb6483fcae5309b17" -S = "${WORKDIR}/git" - -EXTRA_OECONF += "--enable-tools" +EXTRA_OEMESON += "\ + -Ddistconfdir=${nonarch_base_libdir} \ + --bindir=${base_bindir} \ + --sbindir=${base_sbindir} \ + -Dtools=true \ +" PACKAGECONFIG ??= "zlib xz openssl" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" -PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, scdoc-native" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" -PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" +PACKAGECONFIG[debug] = "-Ddebug-messages=true,-Ddebug-messages=false" +PACKAGECONFIG[logging] = " -Dlogging=true,-Dlogging=false" +PACKAGECONFIG[manpages] = "-Dmanpages=true,-Dmanpages=false,scdoc-native" +PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" +PACKAGECONFIG[xz] = "-Dxz=enabled,-Dxz=disabled,xz" +PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" +PACKAGECONFIG[zstd] = "-Dzstd=enabled,-Dzstd=disabled,zstd" PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" @@ -44,24 +44,7 @@ RREPLACES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod mod # to force user to remove old module-init-tools and replace them with kmod variants RCONFLICTS:libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" -# autotools set prefix to /usr, however we want them in /bin and /sbin -EXTRA_OECONF += "--bindir=${base_bindir} --sbindir=${base_sbindir}" - do_install:append () { - install -dm755 ${D}${base_bindir} - install -dm755 ${D}${base_sbindir} - # add symlinks to kmod - [ -e ${D}${base_bindir}/lsmod ] || ln -rs ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod - for tool in insmod rmmod depmod modinfo modprobe; do - rm -f ${D}${base_bindir}/${tool} - ln -rs ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool} - done - # configuration directories - install -dm755 ${D}${nonarch_base_libdir}/depmod.d - install -dm755 ${D}${nonarch_base_libdir}/modprobe.d - install -dm755 ${D}${sysconfdir}/depmod.d - install -dm755 ${D}${sysconfdir}/modprobe.d - # install depmod.d file for search/ dir install -Dm644 "${UNPACKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" @@ -69,6 +52,11 @@ do_install:append () { echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf } +PACKAGES += "${PN}-fish-completion ${PN}-zsh-completion" + +FILES:${PN}-fish-completion = "${datadir}/fish" +FILES:${PN}-zsh-completion = "${datadir}/zsh" + ALTERNATIVE_PRIORITY = "70" ALTERNATIVE:kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod" @@ -78,9 +66,9 @@ ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod" ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe" ALTERNATIVE_LINK_NAME[rmmod] = "${base_sbindir}/rmmod" ALTERNATIVE_LINK_NAME[modinfo] = "${base_sbindir}/modinfo" -ALTERNATIVE_LINK_NAME[bin-lsmod] = "${base_bindir}/lsmod" +ALTERNATIVE_LINK_NAME[bin-lsmod] = "${base_sbindir}/lsmod" ALTERNATIVE_LINK_NAME[lsmod] = "${base_sbindir}/lsmod" -ALTERNATIVE_TARGET[lsmod] = "${base_bindir}/lsmod.${BPN}" +ALTERNATIVE_TARGET[lsmod] = "${base_sbindir}/lsmod.${BPN}" PACKAGES =+ "libkmod" FILES:libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}"