From d556d350c796583cb941d2152caec5f05a5ac45d Mon Sep 17 00:00:00 2001 From: Nowa Ammerlaan Date: Mon, 4 Aug 2025 20:40:40 +0200 Subject: [PATCH] sys-kernel/dracut: add 108 Signed-off-by: Nowa Ammerlaan --- sys-kernel/dracut/Manifest | 1 + sys-kernel/dracut/dracut-108.ebuild | 244 ++++++++++++++++++ sys-kernel/dracut/dracut-9999.ebuild | 9 +- .../dracut-108-acct-user-group-gentoo.patch | 13 + ...acut-108-respect-objcopy-and-objdump.patch | 89 +++++++ 5 files changed, 355 insertions(+), 1 deletion(-) create mode 100644 sys-kernel/dracut/dracut-108.ebuild create mode 100644 sys-kernel/dracut/files/dracut-108-acct-user-group-gentoo.patch create mode 100644 sys-kernel/dracut/files/dracut-108-respect-objcopy-and-objdump.patch diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 41f1fa126376a..6443a88d1a1a3 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -2,3 +2,4 @@ DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078 DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277 DIST dracut-106.tar.gz 527743 BLAKE2B 837621da329500b88b0c81a724990702a9f4e816a4818c26622b2bc5e3885c908f0bbba682a262f967d9a08a912cfd63a33270143560a30e3d067dc4217c5262 SHA512 ab17f9440129e2db7c2902115459309132ce7f7b29bbb3172002b7a8ea8ab54799d62d89fbf3f84581a5c14196f6754d33669b583b9d758ab4686a3443a3c4ad DIST dracut-107.tar.gz 536435 BLAKE2B 8ff85073853f874b31b659b73abfafe27bb0da59c8e77039bd1739d266dffe26616f6c96eceb2cb36319801d0fb3df53ea4153bf426f081e7e5b73c11522018b SHA512 3f8e79fbfd40c0d384e856cbabe9257c5cbafbb4a3fe4b56da27832c36844dbbf9c59f12155d165d9343bc7341eda2b90c215148eb46ae873c219fbc93992944 +DIST dracut-108.tar.gz 552724 BLAKE2B fa5efd4039be8d2d30564a0768d2dec8c3d72b3721391d3a02bde8445cd7a5766d4b119594ebbca86dbd59bd71b64353febaaa7e2257f02d0075333dc29e9047 SHA512 ed06844b65003c1f75373309dbdc10a3036958f413b05b608510142fa78bb34dd9fb1e622242b02b2e9e4063bfa916fd755f5131a77fb3249f77d3f08eca2283 diff --git a/sys-kernel/dracut/dracut-108.ebuild b/sys-kernel/dracut/dracut-108.ebuild new file mode 100644 index 0000000000000..db530c8eb1296 --- /dev/null +++ b/sys-kernel/dracut/dracut-108.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +CARGO_OPTIONAL=1 + +inherit cargo flag-o-matic bash-completion-r1 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 ~m68k ~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-alternatives/cpio + >=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/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 + ) +" +DEPEND=" + >=sys-apps/kmod-23 + elibc_musl? ( sys-libs/fts-standalone ) +" + +BDEPEND=" + || ( + dev-ruby/asciidoctor + 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 + dracut-cpio? ( ${RUST_DEPEND} ) + 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}-108-acct-user-group-gentoo.patch + # https://github.com/dracut-ng/dracut-ng/pull/1447 + "${FILESDIR}"/${PN}-108-respect-objcopy-and-objdump.patch +) + +pkg_setup() { + use dracut-cpio && rust_pkg_setup +} + +src_configure() { + local myconf=( + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc" + --bashcompletiondir="$(get_bashcompdir)" + --systemdsystemunitdir="$(systemd_get_systemunitdir)" + --disable-dracut-cpio + ) + + if ! has_version dev-ruby/asciidoctor; then + myconf+=( --disable-asciidoctor ) + fi + + # 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[@]}" + 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() { + 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 + ) + default + if use dracut-cpio; then + exeinto /usr/lib/dracut + doexe "src/dracut-cpio/$(cargo_target_dir)/dracut-cpio" + fi + + # Use our own from sys-kernel/installkernel[dracut] + rm -r "${ED}/usr/lib/kernel" || die +} + +pkg_preinst() { + # 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() { + 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]" +} diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 624115e9cc843..95c80b5dac16b 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -54,7 +54,10 @@ DEPEND=" " BDEPEND=" - app-text/asciidoc + || ( + dev-ruby/asciidoctor + app-text/asciidoc + ) app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 @@ -115,6 +118,10 @@ src_configure() { --disable-dracut-cpio ) + if ! has_version dev-ruby/asciidoctor; then + myconf+=( --disable-asciidoctor ) + fi + # this emulates what the build system would be doing without us append-cflags -D_FILE_OFFSET_BITS=64 diff --git a/sys-kernel/dracut/files/dracut-108-acct-user-group-gentoo.patch b/sys-kernel/dracut/files/dracut-108-acct-user-group-gentoo.patch new file mode 100644 index 0000000000000..52c15205c6305 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-108-acct-user-group-gentoo.patch @@ -0,0 +1,13 @@ +diff --git a/modules.d/73tpm2-tss/module-setup.sh b/modules.d/73tpm2-tss/module-setup.sh +index 4441f5528..4b5654d56 100755 +--- a/modules.d/73tpm2-tss/module-setup.sh ++++ b/modules.d/73tpm2-tss/module-setup.sh +@@ -30,7 +30,7 @@ installkernel() { + + # Install the required file(s) and directories for the module in the initramfs. + install() { +- inst_sysusers tpm2-tss.conf ++ inst_sysusers tss.conf + + inst_multiple -o \ + "$tmpfilesdir"/tpm2-tss-fapi.conf \ diff --git a/sys-kernel/dracut/files/dracut-108-respect-objcopy-and-objdump.patch b/sys-kernel/dracut/files/dracut-108-respect-objcopy-and-objdump.patch new file mode 100644 index 0000000000000..5ab73d1a8e881 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-108-respect-objcopy-and-objdump.patch @@ -0,0 +1,89 @@ +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 84a34fafd..617ccf91c 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -1042,7 +1042,7 @@ get_dev_module() { + pe_file_format() { + if [[ $# -eq 1 ]]; then + local magic +- magic=$(objdump -p "$1" \ ++ magic=$("${OBJDUMP:-objdump}" -p "$1" \ + | awk '{if ($1 == "Magic"){print $2}}') + # 010b (PE32), 020b (PE32+) + [[ $magic == "020b" || $magic == "010b" ]] && return 0 +@@ -1055,7 +1055,7 @@ pe_get_header_data() { + local data_header + [[ $# -ne "2" ]] && return 1 + [[ $(pe_file_format "$1") -eq 1 ]] && return 1 +- data_header=$(objdump -p "$1" \ ++ data_header=$("${OBJDUMP:-objdump}" -p "$1" \ + | awk -v data="$2" '{if ($1 == data){print $2}}') + echo "$data_header" + } +diff --git a/dracut.sh b/dracut.sh +index 45373efb7..b53d72924 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -1649,7 +1649,7 @@ if [[ ! $print_cmdline ]]; then + fi + + if [[ $uefi == yes ]]; then +- if ! command -v objcopy &> /dev/null; then ++ if ! command -v "${OBJCOPY:-objcopy}" &> /dev/null; then + dfatal "Need 'objcopy' to create a UEFI executable" + exit 1 + fi +@@ -2638,7 +2638,7 @@ clean_sbat_string() { + get_sbat_string() { + local inp=$1 + local out=$uefi_outdir/$2 +- objcopy -O binary --only-section=.sbat "$inp" "$out" ++ "${OBJCOPY:-objcopy}" -O binary --only-section=.sbat "$inp" "$out" + clean_sbat_string "$out" + } + +@@ -2656,7 +2656,7 @@ if [[ $uefi == yes ]]; then + fi + fi + +- offs=$(($(objdump -h "$uefi_stub" 2> /dev/null | awk 'NF==7 {size=$3; ++ offs=$(($("${OBJDUMP:-objdump}" -h "$uefi_stub" 2> /dev/null | awk 'NF==7 {size=$3; + offset=$4} END {print "16#"size" + 16#"offset}'))) + if [[ $offs -eq 0 ]]; then + dfatal "Failed to get the size of $uefi_stub to create UEFI image file" +@@ -2719,7 +2719,7 @@ if [[ $uefi == yes ]]; then + + tmp_uefi_stub=$uefi_outdir/elf.stub + cp "$uefi_stub" "$tmp_uefi_stub" +- objcopy --remove-section .sbat "$tmp_uefi_stub" &> /dev/null ++ "${OBJCOPY:-objcopy}" --remove-section .sbat "$tmp_uefi_stub" &> /dev/null + + if command -v ukify &> /dev/null; then + dinfo "*** Using ukify to create UKI ***" +@@ -2749,7 +2749,7 @@ if [[ $uefi == yes ]]; then + exit 1 + fi + else +- if objcopy \ ++ if "${OBJCOPY:-objcopy}" \ + ${SOURCE_DATE_EPOCH:+--enable-deterministic-archives --preserve-dates} \ + ${uefi_osrelease:+--add-section .osrel="$uefi_osrelease" --change-section-vma .osrel=$(printf 0x%x "$uefi_osrelease_offs")} \ + ${uefi_cmdline:+--add-section .cmdline="$uefi_cmdline" --change-section-vma .cmdline=$(printf 0x%x "$uefi_cmdline_offs")} \ +diff --git a/lsinitrd.sh b/lsinitrd.sh +index 86b2c5a67..fd0633dfa 100755 +--- a/lsinitrd.sh ++++ b/lsinitrd.sh +@@ -358,11 +358,11 @@ unpack_files() { + + read -r -N 2 bin < "$image" + if [ "$bin" = "MZ" ]; then +- command -v objcopy > /dev/null || { ++ command -v "${OBJCOPY:-objcopy}" > /dev/null || { + echo "Need 'objcopy' to unpack an UEFI executable." + exit 1 + } +- objcopy \ ++ "${OBJCOPY:-objcopy}" \ + --dump-section .linux="$TMPDIR/vmlinuz" \ + --dump-section .initrd="$TMPDIR/initrd.img" \ + --dump-section .cmdline="$TMPDIR/cmdline.txt" \