Skip to contentSkip to conversation

kmod: remove obsolete ac_pwd manipulation

PATCH New Ross Burton 1 participant 3 messages Dec 20, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 kmod: remove obsolete ac_pwd manipulation

Remove the change of ac_pwd from config.status as the build is successful without it (it was added with no explanation in 152c973 when ptest was enabled).

---
 meta/recipes-kernel/kmod/kmod_git.bb | 4 ----
 1 file changed, 4 deletions(-)
meta/recipes-kernel/kmod/kmod_git.bb +0 -4
index 9bd66de430..234f072fb6 100644
@@ -33,10 +33,6 @@ do_install:append () {
         install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf"
 }
 
-do_compile:prepend() {
-            sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status
-}
-
 inherit update-alternatives bash-completion
 
 ALTERNATIVE_PRIORITY = "70"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/3 kmod: merge target/native recipes

There's no good reason to keep separate target and native recipes for kmod, so merge them into a single kmod_29.bb which uses class extension.

The symlinks are not created differently for target vs native builds, as the native sbindir is in PATH.

---
 meta/recipes-kernel/kmod/kmod-native_git.bb   | 15 -------
 meta/recipes-kernel/kmod/kmod.inc             | 37 ----------------
 .../kmod/{kmod_git.bb => kmod_29.bb}          | 44 +++++++++++++++----
 3 files changed, 35 insertions(+), 61 deletions(-)
 delete mode 100644 meta/recipes-kernel/kmod/kmod-native_git.bb
 delete mode 100644 meta/recipes-kernel/kmod/kmod.inc
 rename meta/recipes-kernel/kmod/{kmod_git.bb => kmod_29.bb} (60%)
meta/recipes-kernel/kmod/kmod-native_git.bb deleted +0 -15
deleted file mode 100644
index 4dd34b1c82..0000000000
@@ -1,15 +0,0 @@
-# Copyright (C) 2012 Khem Raj <[email protected]>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require kmod.inc
-
-DEPENDS += "zlib-native"
-
-inherit native
-
-do_install:append (){
-	for tool in depmod insmod lsmod modinfo modprobe rmmod
-	do
-		ln -s kmod ${D}${bindir}/$tool
-	done
-}
meta/recipes-kernel/kmod/kmod.inc deleted +0 -37
deleted file mode 100644
index d527887b78..0000000000
@@ -1,37 +0,0 @@
-# Copyright (C) 2012 Khem Raj <[email protected]>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-SUMMARY = "Tools for managing Linux kernel modules"
-DESCRIPTION = "kmod is a set of tools to handle common tasks with Linux kernel modules like \
-               insert, remove, list, check properties, resolve dependencies and aliases."
-HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kmod/"
-LICENSE = "GPL-2.0+ & LGPL-2.1+"
-LICENSE:libkmod = "LGPL-2.1+"
-SECTION = "base"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://tools/COPYING;md5=751419260aa954499f7abaabaa882bbe \
-                   "
-inherit autotools gtk-doc pkgconfig manpages
-
-SRCREV = "b6ecfc916a17eab8f93be5b09f4e4f845aabd3d1"
-# Lookout for PV bump too when SRCREV is changed
-PV = "29"
-
-SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master \
-           file://depmod-search.conf \
-           file://avoid_parallel_tests.patch \
-           "
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF +=" --enable-tools --with-zlib"
-
-PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
-PACKAGECONFIG[logging] = " --enable-logging,--disable-logging"
-PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
-PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz"
-PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
-
-GTKDOC_DOCDIR = "${S}/libkmod/docs"
meta/recipes-kernel/kmod/kmod_29.bb renamed from meta/recipes-kernel/kmod/kmod_git.bb +35 -9

75 lines not on this page · raw message

Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/3 kmod: expand compression PACKAGECONFIGs

In reply to Ross Burton

Turn the explicitly enabled zlib support into an enabled by default PACKAGECONFIG, and add Zstd support (disabled by default).

---
 meta/recipes-kernel/kmod/kmod_29.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
meta/recipes-kernel/kmod/kmod_29.bb +5 -3
index 904a17d9d0..9ac5214df6 100644
@@ -24,17 +24,19 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF += "--enable-tools --with-zlib"
+EXTRA_OECONF += "--enable-tools"
 
+PACKAGECONFIG ??= "zlib"
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[logging] = " --enable-logging,--disable-logging"
 PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
-PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz"
 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"
 
 GTKDOC_DOCDIR = "${S}/libkmod/docs"
 
-DEPENDS += "zlib"
 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"
 RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
Signature · 1 line
2.25.1