mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
sys-apps/kmod: Sync with Gentoo
It's from Gentoo commit 60f73e347fd6815fea01d4f6fe841dc60ab86e55.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
9b944d3d77
commit
89c2e0691a
@ -1,2 +1 @@
|
||||
DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24
|
||||
DIST kmod-33.tar.xz 514428 BLAKE2B 5fb4ea9d96217f8c94cba752b07a1b53228c6ae79dbaa605030cd84e3c6ca8d9c1a703a0253cea1d6c78a78f1507e2a1d9c6215d28dcb01b9e7f8b98a9fde425 SHA512 32d79d0bb7e89012f18458d4e88325f8e19a7dba6e1d5cff01aec3e618d1757b0f7c119735bf38d02e0d056a14273fd7522fca7c61a4d12a3ea5854bb662fff8
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
https://github.com/kmod-project/kmod/pull/32
|
||||
|
||||
From 721ed6040c7aa47070faf6378c433089e178bd43 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
|
||||
|
||||
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 <raj.khem@gmail.com>
|
||||
--- 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 <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));
|
||||
--- 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++)
|
||||
--- 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))
|
||||
|
||||
@ -1,149 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools libtool bash-completion-r1
|
||||
|
||||
DESCRIPTION="Library and tools for managing linux kernel modules"
|
||||
HOMEPAGE="https://git.kernel.org/pub/scm/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://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
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.
|
||||
# So we have to restrict it.
|
||||
# See bug #408915.
|
||||
#RESTRICT="test"
|
||||
|
||||
# - >=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
|
||||
!sys-apps/modutils
|
||||
!<sys-apps/openrc-0.13.8
|
||||
!<sys-apps/systemd-216-r3
|
||||
lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
|
||||
pkcs7? ( >=dev-libs/openssl-1.1.0:= )
|
||||
zlib? ( >=sys-libs/zlib-1.2.6 )
|
||||
zstd? ( >=app-arch/zstd-1.5.2-r1:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
doc? (
|
||||
dev-util/gtk-doc
|
||||
dev-build/gtk-doc-am
|
||||
)
|
||||
lzma? ( virtual/pkgconfig )
|
||||
zlib? ( virtual/pkgconfig )
|
||||
"
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
BDEPEND+=" dev-libs/libxslt"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-31-musl-basename.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ ! -e configure ]] || use doc ; then
|
||||
if use doc; then
|
||||
cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
|
||||
gtkdocize --copy --docdir libkmod/docs || die
|
||||
else
|
||||
touch libkmod/docs/gtk-doc.make
|
||||
fi
|
||||
eautoreconf
|
||||
else
|
||||
elibtoolize
|
||||
fi
|
||||
|
||||
# Restore possibility of running --enable-static, bug #472608
|
||||
sed -i \
|
||||
-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
|
||||
configure || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--bindir="${EPREFIX}/bin"
|
||||
--sbindir="${EPREFIX}/sbin"
|
||||
--enable-shared
|
||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
||||
$(use_enable debug)
|
||||
$(usev doc '--enable-gtk-doc')
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable tools)
|
||||
$(use_with lzma xz)
|
||||
$(use_with pkcs7 openssl)
|
||||
$(use_with zlib)
|
||||
$(use_with zstd)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
|
||||
if use tools; then
|
||||
local cmd
|
||||
for cmd in depmod insmod modprobe rmmod; do
|
||||
rm "${ED}"/bin/${cmd} || die
|
||||
dosym ../bin/kmod /sbin/${cmd}
|
||||
done
|
||||
fi
|
||||
|
||||
cat <<-EOF > "${T}"/usb-load-ehci-first.conf
|
||||
softdep uhci_hcd pre: ehci_hcd
|
||||
softdep ohci_hcd pre: ehci_hcd
|
||||
EOF
|
||||
|
||||
insinto /lib/modprobe.d
|
||||
# bug #260139
|
||||
doins "${T}"/usb-load-ehci-first.conf
|
||||
|
||||
newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
|
||||
ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
|
||||
rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
|
||||
fi
|
||||
|
||||
# Add kmod to the runlevel automatically if this is the first install of this package.
|
||||
if [[ -z ${REPLACING_VERSIONS} ]]; then
|
||||
if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
|
||||
mkdir -p "${EROOT}"/etc/runlevels/sysinit
|
||||
fi
|
||||
if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
|
||||
ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
|
||||
if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
|
||||
ewarn
|
||||
ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
|
||||
ewarn "kernel modules to have required static nodes!"
|
||||
ewarn "Run this command:"
|
||||
ewarn "\trc-update add kmod-static-nodes sysinit"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user