[sys-kernel/dracut] sync to in-tree live, deal with real cpio later

This commit is contained in:
Robert Förster 2024-11-12 22:35:47 +01:00
parent 1da9e36a1a
commit d524664c38
3 changed files with 51 additions and 217 deletions

View File

@ -2,10 +2,9 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
CARGO_OPTIONAL=1 CARGO_OPTIONAL=1
inherit flag-o-matic bash-completion-r1 cargo edo optfeature systemd toolchain-funcs inherit cargo flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs
if [[ ${PV} == 9999 ]] ; then if [[ ${PV} == 9999 ]] ; then
inherit git-r3 inherit git-r3
@ -23,11 +22,12 @@ HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
IUSE="dracut-cpio selinux test" IUSE="+dracut-cpio selinux test"
RESTRICT="test" RESTRICT="test"
PROPERTIES="test? ( test_privileged test_network )" PROPERTIES="test? ( test_privileged test_network )"
RDEPEND=" RDEPEND="
app-alternatives/cpio
>=app-shells/bash-4.0:0 >=app-shells/bash-4.0:0
sys-apps/coreutils[xattr(-)] sys-apps/coreutils[xattr(-)]
>=sys-apps/kmod-23[tools] >=sys-apps/kmod-23[tools]
@ -48,7 +48,6 @@ RDEPEND="
sys-libs/libselinux sys-libs/libselinux
sys-libs/libsepol sys-libs/libsepol
) )
!dracut-cpio? ( app-alternatives/cpio )
" "
DEPEND=" DEPEND="
>=sys-apps/kmod-23 >=sys-apps/kmod-23
@ -61,6 +60,7 @@ BDEPEND="
>=app-text/docbook-xsl-stylesheets-1.75.2 >=app-text/docbook-xsl-stylesheets-1.75.2
>=dev-libs/libxslt-1.1.26 >=dev-libs/libxslt-1.1.26
virtual/pkgconfig virtual/pkgconfig
dracut-cpio? ( ${RUST_DEPEND} )
test? ( test? (
net-nds/rpcbind net-nds/rpcbind
net-fs/nfs-utils net-fs/nfs-utils
@ -109,13 +109,17 @@ PATCHES=(
"${FILESDIR}"/dracut-105-systemd-cryptsetup.patch "${FILESDIR}"/dracut-105-systemd-cryptsetup.patch
) )
pkg_setup() {
use dracut-cpio && rust_pkg_setup
}
src_configure() { src_configure() {
local myconf=( local myconf=(
--prefix="${EPREFIX}/usr" --prefix="${EPREFIX}/usr"
--sysconfdir="${EPREFIX}/etc" --sysconfdir="${EPREFIX}/etc"
--bashcompletiondir="$(get_bashcompdir)" --bashcompletiondir="$(get_bashcompdir)"
--systemdsystemunitdir="$(systemd_get_systemunitdir)" --systemdsystemunitdir="$(systemd_get_systemunitdir)"
--enable-dracut-cpio="$(usex dracut-cpio)" --disable-dracut-cpio
) )
# this emulates what the build system would be doing without us # this emulates what the build system would be doing without us
@ -124,6 +128,19 @@ src_configure() {
tc-export CC PKG_CONFIG tc-export CC PKG_CONFIG
edo ./configure "${myconf[@]}" edo ./configure "${myconf[@]}"
if use dracut-cpio; then
cargo_gen_config
cargo_src_configure
fi
}
src_compile() {
default
if use dracut-cpio; then
pushd src/dracut-cpio >/dev/null || die
cargo_src_compile
popd >/dev/null || die
fi
} }
src_test() { src_test() {
@ -149,17 +166,30 @@ src_install() {
AUTHORS AUTHORS
NEWS.md NEWS.md
README.md README.md
docs/HACKING.md
docs/README.cross
docs/README.kernel
docs/RELEASE.md
docs/SECURITY.md
) )
default default
if use dracut-cpio; then
exeinto /usr/lib/dracut
doexe "src/dracut-cpio/$(cargo_target_dir)/dracut-cpio"
fi
}
docinto html pkg_preinst() {
dodoc dracut.html # Remove directory/symlink conflicts
# https://bugs.gentoo.org/943007
local save_nullglob=$(shopt -p nullglob)
shopt -s nullglob
local module
for module in "${EROOT}"/usr/lib/dracut/modules.d/{80test,80test-makeroot,80test-root}; do
if [[ ! -L ${module} && -d ${module} ]]; then
rm -rv "${module}" || die
fi
local backups=( "${module}".backup.* )
if [[ ${#backups[@]} -gt 0 ]]; then
rm -v "${backups[@]}" || die
fi
done
eval "${save_nullglob}"
} }
pkg_postinst() { pkg_postinst() {

View File

@ -1,203 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CARGO_OPTIONAL=1
inherit flag-o-matic bash-completion-r1 cargo edo optfeature systemd toolchain-funcs
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng"
else
if [[ "${PV}" != *_rc* ]]; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-ng-${PV}"
fi
DESCRIPTION="Generic initramfs generation tool"
HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
LICENSE="GPL-2"
SLOT="0"
IUSE="dracut-cpio selinux test"
RESTRICT="test"
PROPERTIES="test? ( test_privileged test_network )"
RDEPEND="
>=app-shells/bash-4.0:0
sys-apps/coreutils[xattr(-)]
>=sys-apps/kmod-23[tools]
|| (
>=sys-apps/sysvinit-2.87-r3
sys-apps/openrc[sysv-utils(-),selinux?]
sys-apps/openrc-navi[sysv-utils(-),selinux?]
sys-apps/systemd[sysv-utils]
sys-apps/s6-linux-init[sysv-utils(-)]
)
>=sys-apps/util-linux-2.21
virtual/pkgconfig[native-symlinks(+)]
virtual/udev
elibc_musl? ( sys-libs/fts-standalone )
selinux? (
sec-policy/selinux-dracut
sys-libs/libselinux
sys-libs/libsepol
)
!dracut-cpio? ( app-alternatives/cpio )
"
DEPEND="
>=sys-apps/kmod-23
elibc_musl? ( sys-libs/fts-standalone )
"
BDEPEND="
app-text/asciidoc
app-text/docbook-xml-dtd:4.5
>=app-text/docbook-xsl-stylesheets-1.75.2
>=dev-libs/libxslt-1.1.26
virtual/pkgconfig
test? (
net-nds/rpcbind
net-fs/nfs-utils
sys-block/open-iscsi
sys-fs/btrfs-progs
sys-fs/dmraid
sys-fs/lvm2[lvm,thin]
sys-fs/mdadm
sys-fs/multipath-tools
alpha? ( app-emulation/qemu[qemu_softmmu_targets_alpha] )
amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
arm? ( app-emulation/qemu[qemu_softmmu_targets_arm] )
arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
hppa? ( app-emulation/qemu[qemu_softmmu_targets_hppa] )
loong? ( app-emulation/qemu[qemu_softmmu_targets_loongarch64] )
mips? ( || (
app-emulation/qemu[qemu_softmmu_targets_mips]
app-emulation/qemu[qemu_softmmu_targets_mips64]
app-emulation/qemu[qemu_softmmu_targets_mips64el]
) )
ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] )
ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] )
riscv? ( || (
app-emulation/qemu[qemu_softmmu_targets_riscv32]
app-emulation/qemu[qemu_softmmu_targets_riscv64]
) )
sparc? ( || (
app-emulation/qemu[qemu_softmmu_targets_sparc]
app-emulation/qemu[qemu_softmmu_targets_sparc64]
) )
x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] )
)
"
QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
# Gentoo specific acct-user and acct-group conf adjustments
"${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch
)
src_configure() {
local myconf=(
--prefix="${EPREFIX}/usr"
--sysconfdir="${EPREFIX}/etc"
--bashcompletiondir="$(get_bashcompdir)"
--systemdsystemunitdir="$(systemd_get_systemunitdir)"
--enable-dracut-cpio="$(usex dracut-cpio)"
)
# this emulates what the build system would be doing without us
append-cflags -D_FILE_OFFSET_BITS=64
tc-export CC PKG_CONFIG
edo ./configure "${myconf[@]}"
}
src_test() {
addwrite /dev/kvm
# Translate ARCH so run-qemu can find the correct qemu-system-ARCH
local qemu_arch
if use amd64; then
qemu_arch=x86_64
elif use arm64; then
qemu_arch=aarch64
elif use loong; then
qemu_arch=loongarch64
elif use x86; then
qemu_arch=i386
else
qemu_arch=$(tc-arch)
fi
ARCH=${qemu_arch} emake -C test check
}
src_install() {
local DOCS=(
AUTHORS
NEWS.md
README.md
docs/HACKING.md
docs/README.cross
docs/README.kernel
docs/RELEASE.md
docs/SECURITY.md
)
default
docinto html
dodoc dracut.html
}
pkg_postinst() {
optfeature "Networking support" net-misc/networkmanager
optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
sys-apps/iproute2 "net-misc/iputils[arping]"
optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs
optfeature "Load kernel modules and drop this privilege for real init" \
sys-libs/libcap
optfeature "Support CIFS" net-fs/cifs-utils
optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
"sys-fs/cryptsetup[-static-libs]"
optfeature "Support for GPG-encrypted keys for crypt module" \
app-crypt/gnupg
optfeature \
"Allows use of dash instead of default bash (on your own risk)" \
app-shells/dash
optfeature \
"Allows use of busybox instead of default bash (on your own risk)" \
sys-apps/busybox
optfeature "Support iSCSI" sys-block/open-iscsi
optfeature "Support Logical Volume Manager" sys-fs/lvm2[lvm]
optfeature "Support MD devices, also known as software RAID devices" \
sys-fs/mdadm sys-fs/dmraid
optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5'
optfeature "Support network block devices" sys-block/nbd
optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
optfeature \
"Install ssh and scp along with config files and specified keys" \
virtual/openssh
optfeature "Enable logging with rsyslog" app-admin/rsyslog
optfeature "Support Squashfs" sys-fs/squashfs-tools
optfeature "Support TPM 2.0 TSS" app-crypt/tpm2-tools
optfeature "Support Bluetooth (experimental)" net-wireless/bluez
optfeature "Support BIOS-given device names" sys-apps/biosdevname
optfeature "Support network NVMe" sys-apps/nvme-cli app-misc/jq
optfeature \
"Enable rngd service to help generating entropy early during boot" \
sys-apps/rng-tools
optfeature "building Unified Kernel Images with dracut (--uefi)" \
"sys-apps/systemd[boot]" "sys-apps/systemd-utils[boot]"
optfeature "automatically generating an initramfs on each kernel installation" \
"sys-kernel/installkernel[dracut]"
optfeature "automatically generating an UKI on each kernel installation" \
"sys-kernel/installkernel[dracut,uki]"
}

View File

@ -9,7 +9,14 @@
<email>floppym@gentoo.org</email> <email>floppym@gentoo.org</email>
<name>Mike Gilbert</name> <name>Mike Gilbert</name>
</maintainer> </maintainer>
<maintainer type="person">
<email>nowa@gentoo.org</email>
<name>Nowa Ammerlaan</name>
</maintainer>
<use>
<flag name="dracut-cpio">Build the enhanced 'dracut-cpio' program</flag>
</use>
<upstream> <upstream>
<remote-id type="github">dracutdevs/dracut</remote-id> <remote-id type="github">dracut-ng/dracut-ng</remote-id>
</upstream> </upstream>
</pkgmetadata> </pkgmetadata>