sys-apps/kmod: Sync with gentoo

It's from gentoo commit 54a10f136e553685304453e62938ff77a34f12fd.
This commit is contained in:
Krzesimir Nowak 2021-11-17 22:18:30 +01:00
parent f923f9050f
commit 728b32e49e
5 changed files with 90 additions and 255 deletions

View File

@ -1,2 +1 @@
DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998

View File

@ -1,189 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit bash-completion-r1 eutils multilib python-r1
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
inherit autotools git-r3
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
inherit libtool
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 python static-libs +tools zlib"
# 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"
# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
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 )
python? ( ${PYTHON_DEPS} )
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
DEPEND="${RDEPEND}
doc? ( dev-util/gtk-doc )
lzma? ( virtual/pkgconfig )
python? (
dev-python/cython[${PYTHON_USEDEP}]
virtual/pkgconfig
)
zlib? ( virtual/pkgconfig )"
if [[ ${PV} == 9999* ]]; then
DEPEND="${DEPEND}
dev-libs/libxslt"
fi
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DOCS="NEWS README TODO"
src_prepare() {
if [ ! -e configure ]; then
if use doc; then
gtkdocize --copy --docdir libkmod/docs || die
else
touch libkmod/docs/gtk-doc.make
fi
eautoreconf
else
elibtoolize
fi
# Restore possibility of running --enable-static wrt #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"
--with-rootlibdir="${EPREFIX}/$(get_libdir)"
--enable-shared
$(use_enable static-libs static)
$(use_enable tools)
$(use_enable debug)
$(use_enable doc gtk-doc)
$(use_with lzma xz)
$(use_with zlib)
--with-bashcompletiondir="$(get_bashcompdir)"
)
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_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_foreach_impl python_install
fi
prune_libtool_files --modules
if use tools; then
local bincmd sbincmd
for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
dosym ../bin/kmod /sbin/${sbincmd}
done
# These are also usable as normal user
for bincmd in lsmod modinfo; do
dosym kmod /bin/${bincmd}
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
doins "${T}"/usb-load-ehci-first.conf #260139
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 [[ ! -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
}

View File

@ -1,19 +1,19 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
PYTHON_COMPAT=( python3_{7..10} )
inherit bash-completion-r1 ltprune multilib python-r1
inherit autotools bash-completion-r1 multilib python-r1
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
inherit autotools git-r3
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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
inherit libtool
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
#inherit libtool
fi
DESCRIPTION="library and tools for managing linux kernel modules"
@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
LICENSE="LGPL-2"
SLOT="0"
IUSE="debug doc lzma python static-libs +tools zlib"
IUSE="debug doc +lzma pkcs7 python 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.
@ -29,6 +29,7 @@ IUSE="debug doc lzma python static-libs +tools zlib"
# 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
RDEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
@ -36,29 +37,37 @@ RDEPEND="!sys-apps/module-init-tools
!<sys-apps/systemd-216-r3
lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
python? ( ${PYTHON_DEPS} )
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
DEPEND="${RDEPEND}
doc? ( dev-util/gtk-doc )
pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
zlib? ( >=sys-libs/zlib-1.2.6 )
zstd? ( >=app-arch/zstd-1.4.4 )"
DEPEND="${RDEPEND}"
BDEPEND="
doc? (
dev-util/gtk-doc
dev-util/gtk-doc-am
)
lzma? ( virtual/pkgconfig )
python? (
dev-python/cython[${PYTHON_USEDEP}]
virtual/pkgconfig
)
zlib? ( virtual/pkgconfig )"
zlib? ( virtual/pkgconfig )
"
if [[ ${PV} == 9999* ]]; then
DEPEND="${DEPEND}
BDEPEND="${BDEPEND}
dev-libs/libxslt"
fi
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DOCS="NEWS README TODO"
DOCS=( NEWS README TODO )
src_prepare() {
default
if [ ! -e configure ]; then
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
@ -81,11 +90,13 @@ src_configure() {
--with-bashcompletiondir="$(get_bashcompdir)"
--with-rootlibdir="${EPREFIX}/$(get_libdir)"
$(use_enable debug)
$(use_enable doc gtk-doc)
$(usex 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)
)
local ECONF_SOURCE="${S}"
@ -133,22 +144,23 @@ src_install() {
VPATH="${native_builddir}:${S}" \
install-pkgpyexecLTLIBRARIES \
install-dist_pkgpyexecPYTHON
python_optimize
}
python_foreach_impl python_install
fi
prune_libtool_files --modules
find "${ED}" -type f -name "*.la" -delete || die
if use tools; then
local bincmd sbincmd
for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
dosym ../bin/kmod /sbin/${sbincmd}
local cmd
for cmd in depmod insmod modprobe rmmod; do
dosym ../bin/kmod /sbin/${cmd}
done
# These are also usable as normal user
for bincmd in lsmod modinfo; do
dosym kmod /bin/${bincmd}
for cmd in lsmod modinfo; do
dosym kmod /bin/${cmd}
done
fi
@ -164,23 +176,23 @@ src_install() {
}
pkg_postinst() {
if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
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
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
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
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 [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
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!"

View File

@ -1,19 +1,19 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
PYTHON_COMPAT=( python3_{7..10} )
inherit bash-completion-r1 ltprune multilib python-r1
inherit autotools bash-completion-r1 multilib python-r1
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
inherit autotools git-r3
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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
inherit libtool
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
#inherit libtool
fi
DESCRIPTION="library and tools for managing linux kernel modules"
@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
LICENSE="LGPL-2"
SLOT="0"
IUSE="debug doc lzma python static-libs +tools zlib"
IUSE="debug doc +lzma pkcs7 python 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.
@ -29,6 +29,7 @@ IUSE="debug doc lzma python static-libs +tools zlib"
# 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
RDEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
@ -36,29 +37,37 @@ RDEPEND="!sys-apps/module-init-tools
!<sys-apps/systemd-216-r3
lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
python? ( ${PYTHON_DEPS} )
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
DEPEND="${RDEPEND}
doc? ( dev-util/gtk-doc )
pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
zlib? ( >=sys-libs/zlib-1.2.6 )
zstd? ( >=app-arch/zstd-1.4.4 )"
DEPEND="${RDEPEND}"
BDEPEND="
doc? (
dev-util/gtk-doc
dev-util/gtk-doc-am
)
lzma? ( virtual/pkgconfig )
python? (
dev-python/cython[${PYTHON_USEDEP}]
virtual/pkgconfig
)
zlib? ( virtual/pkgconfig )"
zlib? ( virtual/pkgconfig )
"
if [[ ${PV} == 9999* ]]; then
DEPEND="${DEPEND}
BDEPEND="${BDEPEND}
dev-libs/libxslt"
fi
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DOCS="NEWS README TODO"
DOCS=( NEWS README TODO )
src_prepare() {
default
if [ ! -e configure ]; then
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
@ -81,11 +90,13 @@ src_configure() {
--with-bashcompletiondir="$(get_bashcompdir)"
--with-rootlibdir="${EPREFIX}/$(get_libdir)"
$(use_enable debug)
$(use_enable doc gtk-doc)
$(usex 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)
)
local ECONF_SOURCE="${S}"
@ -133,22 +144,23 @@ src_install() {
VPATH="${native_builddir}:${S}" \
install-pkgpyexecLTLIBRARIES \
install-dist_pkgpyexecPYTHON
python_optimize
}
python_foreach_impl python_install
fi
prune_libtool_files --modules
find "${ED}" -type f -name "*.la" -delete || die
if use tools; then
local bincmd sbincmd
for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
dosym ../bin/kmod /sbin/${sbincmd}
local cmd
for cmd in depmod insmod modprobe rmmod; do
dosym ../bin/kmod /sbin/${cmd}
done
# These are also usable as normal user
for bincmd in lsmod modinfo; do
dosym kmod /bin/${bincmd}
for cmd in lsmod modinfo; do
dosym kmod /bin/${cmd}
done
fi
@ -164,23 +176,23 @@ src_install() {
}
pkg_postinst() {
if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
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
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
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
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 [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
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!"

View File

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>udev-bugs@gentoo.org</email>
</maintainer>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
<use>
<flag name="lzma">Enable support for XZ compressed modules</flag>
<flag name="pkcs7">Enable PKCS#7 signature parsing for modinfo.</flag>
<flag name="tools">Install module loading/unloading tools.</flag>
<flag name="zlib">Enable support for gzipped modules</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:kernel:kmod</remote-id>
</upstream>
</pkgmetadata>