summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@gentoo.org>2024-10-13 15:03:39 +0200
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2024-11-01 18:05:47 +0100
commit73acde46849358374af4ce57b80421039cc6a830 (patch)
tree878ccfd167cfb2a9650daf35c28fece57f34cf2c /sys-kernel
parentsys-kernel/ugrd: fix for running the tests (diff)
downloadgentoo-73acde46849358374af4ce57b80421039cc6a830.tar.gz
gentoo-73acde46849358374af4ce57b80421039cc6a830.tar.bz2
gentoo-73acde46849358374af4ce57b80421039cc6a830.zip
sys-kernel/dracut: add 105
Closes: https://github.com/gentoo/gentoo/pull/38912 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/dracut/Manifest1
-rw-r--r--sys-kernel/dracut/dracut-105.ebuild202
-rw-r--r--sys-kernel/dracut/files/dracut-105-ensure-abs-args-for-objcopy.patch48
3 files changed, 251 insertions, 0 deletions
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 93fcb1e769ad..5db010d68363 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,2 +1,3 @@
DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277
+DIST dracut-105.tar.gz 575857 BLAKE2B 93463e3d1649e6e68accbb4f2480af471e851a54185771cec01e8b7112f5c4158901747bdc1180e08e270d3b3b21afb4d510dae09ca6ef00e309300bede188d1 SHA512 1608fb31d6a53905ea25a279586573db5fc7e084b4f6ff06e52065cbcb4ff503c2d51c0a282345844228232b1b590382b482a224183e0c4ee16c9c9e6932b275
diff --git a/sys-kernel/dracut/dracut-105.ebuild b/sys-kernel/dracut/dracut-105.ebuild
new file mode 100644
index 000000000000..b6668b2572f4
--- /dev/null
+++ b/sys-kernel/dracut/dracut-105.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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 ~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="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/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
+ )
+"
+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
+ # https://github.com/dracut-ng/dracut-ng/pull/834
+ "${FILESDIR}"/${PN}-105-ensure-abs-args-for-objcopy.patch
+)
+
+src_configure() {
+ local myconf=(
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc"
+ --bashcompletiondir="$(get_bashcompdir)"
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ # 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]"
+}
diff --git a/sys-kernel/dracut/files/dracut-105-ensure-abs-args-for-objcopy.patch b/sys-kernel/dracut/files/dracut-105-ensure-abs-args-for-objcopy.patch
new file mode 100644
index 000000000000..aefd8be67e90
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-105-ensure-abs-args-for-objcopy.patch
@@ -0,0 +1,48 @@
+From 1579bb0c77d9e1e4599623a165c54a0dccdaf875 Mon Sep 17 00:00:00 2001
+From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+Date: Thu, 31 Oct 2024 11:28:37 +0100
+Subject: [PATCH] fix(dracut.sh): ensure abs path for objcopy args
+
+Closes: https://github.com/dracut-ng/dracut-ng/issues/833
+Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+---
+ dracut.sh | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 90927136e..8b666a1ac 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -35,6 +35,19 @@ readonly dracut_cmd=$(readlink -f "$0")
+
+ set -o pipefail
+
++# below we sometimes cd, which causes problems if we're building an UKI
++# and relative paths are passed on to us. Store the pwd before we do anything.
++pwd=$(pwd)
++path_rel_to_abs() {
++ for var in "$@"; do
++ if [[ $var == /* ]]; then
++ echo "$var"
++ else
++ echo "$pwd/$var"
++ fi
++ done
++}
++
+ usage() {
+ [[ $sysroot_l ]] && dracutsysrootdir="$sysroot_l"
+ [[ $dracutbasedir ]] || dracutbasedir="$dracutsysrootdir"/usr/lib/dracut
+@@ -1095,9 +1108,9 @@ drivers_dir="${drivers_dir%"${drivers_dir##*[!/]}"}"
+ [[ $reproducible_l ]] && reproducible="$reproducible_l"
+ [[ $loginstall_l ]] && loginstall="$loginstall_l"
+ [[ $uefi_l ]] && uefi=$uefi_l
+-[[ $uefi_stub_l ]] && uefi_stub="$uefi_stub_l"
+-[[ $uefi_splash_image_l ]] && uefi_splash_image="$uefi_splash_image_l"
+-[[ $kernel_image_l ]] && kernel_image="$kernel_image_l"
++[[ $uefi_stub_l ]] && uefi_stub=$(path_rel_to_abs "$uefi_stub_l")
++[[ $uefi_splash_image_l ]] && uefi_splash_image=$(path_rel_to_abs "$uefi_splash_image_l")
++[[ $kernel_image_l ]] && kernel_image=$(path_rel_to_abs "$kernel_image_l")
+ [[ $sbat_l ]] && sbat="$sbat_l"
+ [[ $machine_id_l ]] && machine_id="$machine_id_l"
+