* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2015-08-12 23:09 Amadeusz Żołnowski
0 siblings, 0 replies; 30+ messages in thread
From: Amadeusz Żołnowski @ 2015-08-12 23:09 UTC (permalink / raw
To: gentoo-commits
commit: 4ed878b6287eed1d538e65bd89c9d7bf99040a97
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 22:51:42 2015 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 23:08:39 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed878b6
sys-kernel/dracut: Remove broken LVM activation skip logic
Gentoo-Bug: 553444
sys-kernel/dracut/dracut-043-r1.ebuild | 276 +++++++++++++++++++++
...01-Revert-lvm-Don-t-activate-LVs-with-act.patch | 33 +++
2 files changed, 309 insertions(+)
diff --git a/sys-kernel/dracut/dracut-043-r1.ebuild b/sys-kernel/dracut/dracut-043-r1.ebuild
new file mode 100644
index 0000000..b734413
--- /dev/null
+++ b/sys-kernel/dracut/dracut-043-r1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-043.ebuild,v 1.1 2015/06/26 22:27:52 aidecoe Exp $
+
+EAPI=4
+
+inherit bash-completion-r1 eutils linux-info multilib systemd
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="http://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux systemd"
+
+RESTRICT="test"
+
+CDEPEND="virtual/udev
+ systemd? ( >=sys-apps/systemd-199 )
+ "
+RDEPEND="${CDEPEND}
+ app-arch/cpio
+ >=app-shells/bash-4.0
+ >sys-apps/kmod-5[tools]
+ || (
+ >=sys-apps/sysvinit-2.87-r3
+ sys-apps/systemd[sysv-utils]
+ sys-apps/systemd-sysv-utils
+ )
+ >=sys-apps/util-linux-2.21
+
+ debug? ( dev-util/strace )
+ selinux? (
+ sys-libs/libselinux
+ sys-libs/libsepol
+ sec-policy/selinux-dracut
+ )
+ "
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ >=dev-libs/libxslt-1.1.26
+ app-text/docbook-xml-dtd:4.5
+ >=app-text/docbook-xsl-stylesheets-1.75.2
+ virtual/pkgconfig
+ "
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+ README.testsuite TODO )
+MY_LIBDIR=/usr/lib
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch"
+ )
+QA_MULTILIB_PATHS="
+ usr/lib/dracut/dracut-install
+ usr/lib/dracut/skipcpio
+ "
+
+#
+# Helper functions
+#
+
+# Removes module from modules.d.
+# $1 = module name
+# Module name can be specified without number prefix.
+rm_module() {
+ local force m
+ [[ $1 = -f ]] && force=-f
+
+ for m in $@; do
+ if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
+ rm ${force} --interactive=never -r "${modules_dir}"/$m
+ else
+ rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
+ fi
+ done
+}
+
+# Grabbed from net-misc/netctl ebuild.
+optfeature() {
+ local desc=$1
+ shift
+ while (( $# )); do
+ if has_version "$1"; then
+ elog " [I] $1 to ${desc}"
+ else
+ elog " [ ] $1 to ${desc}"
+ fi
+ shift
+ done
+}
+
+#
+# ebuild functions
+#
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+
+ local libdirs="/$(get_libdir) /usr/$(get_libdir)"
+ if [[ ${SYMLINK_LIB} = yes ]]; then
+ # Preserve lib -> lib64 symlinks in initramfs
+ [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib"
+ fi
+ einfo "Setting libdirs to \"${libdirs}\" ..."
+ sed -e "3alibdirs=\"${libdirs}\"" \
+ -i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+ local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
+ einfo "Setting udevdir to ${udevdir}..."
+ sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
+ -i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+ if use systemd; then
+ local systemdutildir="$(systemd_get_utildir)"
+ local systemdsystemunitdir="$(systemd_get_unitdir)"
+ local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
+ --variable=systemdsystemconfdir)"
+ [[ ${systemdsystemconfdir} ]] \
+ || systemdsystemconfdir=/etc/systemd/system
+ einfo "Setting systemdutildir to ${systemdutildir} and ..."
+ sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+ -i "${S}/dracut.conf.d/gentoo.conf.example" || die
+ einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
+ sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
+ -i "${S}/dracut.conf.d/gentoo.conf.example" || die
+ einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
+ sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
+ -i "${S}/dracut.conf.d/gentoo.conf.example" || die
+ else
+ local systemdutildir="/lib/systemd"
+ einfo "Setting systemdutildir for standalone udev to" \
+ "${systemdutildir}..."
+ sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+ -i "${S}/dracut.conf.d/gentoo.conf.example" || die
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf="--libdir=${MY_LIBDIR}"
+ myconf+=" --bashcompletiondir=$(get_bashcompdir)"
+
+ if use systemd; then
+ myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
+ fi
+
+ econf ${myconf}
+}
+
+src_compile() {
+ tc-export CC
+ emake doc install/dracut-install skipcpio/skipcpio
+}
+
+src_install() {
+ default
+
+ local my_libdir="${MY_LIBDIR}"
+ local dracutlibdir="${my_libdir#/}/dracut"
+
+ echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
+
+ insinto "${dracutlibdir}/dracut.conf.d/"
+ newins dracut.conf.d/gentoo.conf.example gentoo.conf
+
+ insinto /etc/logrotate.d
+ newins dracut.logrotate dracut
+
+ dodir /var/lib/dracut/overlay
+
+ dohtml dracut.html
+
+ if ! use systemd; then
+ # Scripts in kernel/install.d are systemd-specific
+ rm -r "${D%/}/${my_libdir}/kernel" || die
+ fi
+
+ #
+ # Modules
+ #
+ local module
+ modules_dir="${D%/}/${dracutlibdir}/modules.d"
+
+ use debug || rm_module 95debug
+ use selinux || rm_module 98selinux
+
+ if use systemd; then
+ # With systemd following modules do not make sense
+ rm_module 96securityfs 97masterkey 98integrity
+ else
+ rm_module 00systemd 98dracut-systemd
+ # Without systemd following modules do not make sense
+ rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
+ fi
+
+ # Remove modules which won't work for sure
+ rm_module 95fcoe # no tools
+ # fips module depends on masked app-crypt/hmaccalc
+ rm_module 01fips 02fips-aesni
+}
+
+pkg_postinst() {
+ if linux-info_get_any_version && linux_config_src_exists; then
+ ewarn ""
+ ewarn "If the following test report contains a missing kernel"
+ ewarn "configuration option, you should reconfigure and rebuild your"
+ ewarn "kernel before booting image generated with this Dracut version."
+ ewarn ""
+
+ local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+ # Kernel configuration options descriptions:
+ local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
+ local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
+"(initramfs/initrd) support"
+
+ local opt desc
+
+ # Generate ERROR_* variables for check_extra_config.
+ for opt in ${CONFIG_CHECK}; do
+ opt=${opt#\~}
+ desc=desc_${opt}
+ eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
+ "is missing and REQUIRED'"
+ done
+
+ check_extra_config
+ echo
+ else
+ ewarn ""
+ ewarn "Your kernel configuration couldn't be checked. Do you have"
+ ewarn "/usr/src/linux/.config file there? Please check manually if"
+ ewarn "following options are enabled:"
+ ewarn ""
+ ewarn " CONFIG_BLK_DEV_INITRD"
+ ewarn " CONFIG_DEVTMPFS"
+ ewarn ""
+ fi
+
+ elog "To get additional features, a number of optional runtime"
+ elog "dependencies may be installed:"
+ elog ""
+ optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
+ sys-apps/iproute2
+ optfeature \
+ "Measure performance of the boot process for later visualisation" \
+ app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+ 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 "Framebuffer splash (media-gfx/splashutils)" \
+ media-gfx/splashutils
+ optfeature "Support iSCSI" sys-block/open-iscsi
+ optfeature "Support Logical Volume Manager" sys-fs/lvm2
+ optfeature "Support MD devices, also known as software RAID devices" \
+ sys-fs/mdadm
+ 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" \
+ net-misc/openssh
+ optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+ app-admin/rsyslog
+}
diff --git a/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch b/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch
new file mode 100644
index 0000000..54d1ef8
--- /dev/null
+++ b/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch
@@ -0,0 +1,33 @@
+From 7c782700a82e6f8b1cb665075e14eaf9d4f70867 Mon Sep 17 00:00:00 2001
+From: Fabian Deutsch <fabiand@fedoraproject.org>
+Date: Thu, 25 Jun 2015 11:17:59 +0200
+Subject: [PATCH] Revert "lvm: Don't activate LVs with activationskip set"
+
+This reverts commit cfa365a32d47388c8476064b23d7d4684f1e591b.
+
+The logic in commit cfa365a was added to prevent (odl) lvms from
+activating snapshots which should not be activated.
+Newer lvms however do this automatically (not enabling an LV if the
+the 'k' attribute set), thus we can revert the previous commit.
+---
+ modules.d/90lvm/lvm_scan.sh | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
+index ce46e14..7495644 100755
+--- a/modules.d/90lvm/lvm_scan.sh
++++ b/modules.d/90lvm/lvm_scan.sh
+@@ -106,10 +106,6 @@ if [ -n "$LVS" ] ; then
+ info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
+ lvm lvscan --ignorelockingfailure 2>&1 | vinfo
+ for LV in $LVS; do
+- if [ "x$(lvm lvs --noheadings --select "lv_attr =~ k" $LV | wc -l)" = "x0" ]; then
+- info "Skipping activation of '$LV' because activationskip is set."
+- continue
+- fi
+ if [ -z "$sysinit" ]; then
+ lvm lvchange --yes -ay --ignorelockingfailure $nopoll --ignoremonitoring $LV 2>&1 | vinfo
+ else
+--
+2.4.5
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2015-08-16 10:36 Amadeusz Żołnowski
0 siblings, 0 replies; 30+ messages in thread
From: Amadeusz Żołnowski @ 2015-08-16 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 01f96bde83ab52f47cea0c0f9641e0528b87522e
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 10:33:59 2015 +0000
Commit: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 10:36:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f96bde
sys-kernel/dracut: Add patch fixing dracut-initramfs-restore
Patch makes mount error nonfatal in dracut-initramfs-restore.
Commit on behalf of Alexander Tsoy <alexander <AT> tsoy.me>.
Gentoo-Bug: 533084
Package-Manager: portage-2.2.20.1
sys-kernel/dracut/dracut-043-r2.ebuild | 1 +
...04-dracut-initramfs-restore-make-mount-er.patch | 28 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/sys-kernel/dracut/dracut-043-r2.ebuild b/sys-kernel/dracut/dracut-043-r2.ebuild
index b713bea..017bc20 100644
--- a/sys-kernel/dracut/dracut-043-r2.ebuild
+++ b/sys-kernel/dracut/dracut-043-r2.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
"${FILESDIR}/${PV}-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch"
"${FILESDIR}/${PV}-0002-Replace-echo-n-with-printf-in-code-wit.patch"
"${FILESDIR}/${PV}-0003-syncheck-Look-for-echo-n-usage-in-modu.patch"
+ "${FILESDIR}/${PV}-0004-dracut-initramfs-restore-make-mount-er.patch"
)
QA_MULTILIB_PATHS="
usr/lib/dracut/dracut-install
diff --git a/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch b/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch
new file mode 100644
index 0000000..23e30e1
--- /dev/null
+++ b/sys-kernel/dracut/files/043-0004-dracut-initramfs-restore-make-mount-er.patch
@@ -0,0 +1,28 @@
+From a18c8fdc9cb3eb917e9a7a30466839c33131cc8a Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 28 Jul 2015 14:55:59 +0300
+Subject: [PATCH 4/4] dracut-initramfs-restore: make mount error nonfatal
+
+Script enables errexit option (set -e). So if /boot is not a mount point
+or is already mounted, then script dies after unsuccessful mount
+command. Fix this by always returning successful result.
+---
+ dracut-initramfs-restore.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
+index 0e6a1a8..0c41a59 100644
+--- a/dracut-initramfs-restore.sh
++++ b/dracut-initramfs-restore.sh
+@@ -14,7 +14,7 @@ SKIP="$dracutbasedir/skipcpio"
+
+ [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
+
+-mount -o ro /boot &>/dev/null
++mount -o ro /boot &>/dev/null || true
+
+ if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
+ IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+--
+2.5.0
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2017-07-04 2:52 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2017-07-04 2:52 UTC (permalink / raw
To: gentoo-commits
commit: 785b9ef776a8106029579209bbd8d6d2a0862ae7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 4 02:52:18 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 4 02:52:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785b9ef7
sys-kernel/dracut: better fix for systemdutildir
Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77
.../{dracut-045-r1.ebuild => dracut-045-r2.ebuild} | 7 +---
sys-kernel/dracut/files/045-systemdutildir.patch | 45 ++++++++++++++++++++++
2 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/sys-kernel/dracut/dracut-045-r1.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild
similarity index 97%
rename from sys-kernel/dracut/dracut-045-r1.ebuild
rename to sys-kernel/dracut/dracut-045-r2.ebuild
index 3c4fcadb254..145d0b7f5ea 100644
--- a/sys-kernel/dracut/dracut-045-r1.ebuild
+++ b/sys-kernel/dracut/dracut-045-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux systemd"
+IUSE="debug selinux"
RESTRICT="test"
@@ -36,7 +36,6 @@ RDEPEND="${CDEPEND}
sys-libs/libsepol
sec-policy/selinux-dracut
)
- systemd? ( sys-apps/systemd )
!net-analyzer/arping
"
DEPEND="${CDEPEND}
@@ -52,6 +51,7 @@ DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
QA_MULTILIB_PATHS="usr/lib/dracut"
PATCHES=(
+ "${FILESDIR}/045-systemdutildir.patch"
)
src_configure() {
@@ -81,9 +81,6 @@ src_install() {
einfo "Setting libdirs to \"${libdirs}\" ..."
echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf"
-
- use systemd || echo 'systemdutildir="/lib/systemd"' >> "${T}/gentoo.conf"
-
insinto "${dracutlibdir}/dracut.conf.d"
doins "${T}/gentoo.conf"
diff --git a/sys-kernel/dracut/files/045-systemdutildir.patch b/sys-kernel/dracut/files/045-systemdutildir.patch
new file mode 100644
index 00000000000..e56abba3547
--- /dev/null
+++ b/sys-kernel/dracut/files/045-systemdutildir.patch
@@ -0,0 +1,45 @@
+From ed5cc98864c28eab2c4cb45ec0f67450699aaaa8 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 3 Jul 2017 22:39:42 -0400
+Subject: [PATCH] dracut.sh: improve udevdir and systemdutildir fallback logic
+
+Check for a common binary in systemdutildir. This resolves an issue on
+split-usr systems, where it is common to have both /lib/systemd[/system]
+and /usr/lib/systemd[/user] present.
+
+Check for systemd-udevd specifically, since some distros (Gentoo) allow
+udev to be installed without the rest of the systemd stack.
+
+Similar logic is applied to udevdir simply for consistency.
+---
+ dracut.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 64d94201..67c12a72 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1266,16 +1266,16 @@ done
+ [[ -d $udevdir ]] \
+ || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
+ if ! [[ -d "$udevdir" ]]; then
+- [[ ! -h /lib ]] && [[ -d /lib/udev ]] && udevdir=/lib/udev
+- [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
++ [[ -e /lib/udev/collect ]] && udevdir=/lib/udev
++ [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev
+ fi
+
+ [[ -d $systemdutildir ]] \
+ || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
+
+ if ! [[ -d "$systemdutildir" ]]; then
+- [[ ! -h /lib ]] && [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd
+- [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd
++ [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
++ [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
+ fi
+
+ [[ -d $systemdsystemunitdir ]] \
+--
+2.13.2
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2018-01-07 16:56 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2018-01-07 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 64981bc77cab21181a2184b7b5c993333f41ded7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 16:55:30 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 16:55:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64981bc7
sys-kernel/dracut: backport support for newer AMD microcode
Closes: https://bugs.gentoo.org/643764
Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37
.../{dracut-046.ebuild => dracut-046-r1.ebuild} | 3 ++-
sys-kernel/dracut/files/046-amd-microcode.patch | 30 ++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/sys-kernel/dracut/dracut-046.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-046.ebuild
rename to sys-kernel/dracut/dracut-046-r1.ebuild
index 8c505a56267..501ca018791 100644
--- a/sys-kernel/dracut/dracut-046.ebuild
+++ b/sys-kernel/dracut/dracut-046-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -51,6 +51,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}/045-systemdutildir.patch"
+ "${FILESDIR}/046-amd-microcode.patch"
)
src_configure() {
diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch
new file mode 100644
index 00000000000..c351275dbeb
--- /dev/null
+++ b/sys-kernel/dracut/files/046-amd-microcode.patch
@@ -0,0 +1,30 @@
+From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Tue, 12 Dec 2017 17:48:36 +0100
+Subject: [PATCH] Simplify microcode lookup for for AMD CPUs
+
+---
+ dracut-functions.sh | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 112b2434..d7fc5303 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -661,11 +661,8 @@ get_ucode_file ()
+ local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //`
+
+ if [[ "$(get_cpu_vendor)" == "AMD" ]]; then
+- # If family greater than or equal to 0x16
+- if [[ $family -ge 22 ]]; then
+- printf "microcode_amd_fam16h.bin"
+- elif [[ $family -eq 21 ]]; then
+- printf "microcode_amd_fam15h.bin"
++ if [[ $family -ge 21 ]]; then
++ printf "microcode_amd_fam%xh.bin" $family
+ else
+ printf "microcode_amd.bin"
+ fi
+--
+2.16.0.rc0
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2018-10-09 19:23 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2018-10-09 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 6093c44b4abfabbdd98b92aaf0faaf10c0646acc
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 9 19:23:34 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Oct 9 19:23:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6093c44b
sys-kernel/dracut: simplify ldd parsing logic in dracut-install
Closes: https://bugs.gentoo.org/667752
Package-Manager: Portage-2.3.50_p14, Repoman-2.3.11_p21
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/dracut-048-r1.ebuild | 154 +++++++++++++++++++++
...dracut-install-simplify-ldd-parsing-logic.patch | 41 ++++++
2 files changed, 195 insertions(+)
diff --git a/sys-kernel/dracut/dracut-048-r1.ebuild b/sys-kernel/dracut/dracut-048-r1.ebuild
new file mode 100644
index 00000000000..5984c374472
--- /dev/null
+++ b/sys-kernel/dracut/dracut-048-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux"
+
+# Tests need root privileges, bug #298014
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/kmod-23[tools]
+ virtual/pkgconfig
+ virtual/udev
+ "
+RDEPEND="${COMMON_DEPEND}
+ app-arch/cpio
+ >=app-shells/bash-4.0:0
+ sys-apps/coreutils[xattr(-)]
+ || (
+ >=sys-apps/sysvinit-2.87-r3
+ sys-apps/systemd[sysv-utils]
+ )
+ >=sys-apps/util-linux-2.21
+
+ debug? ( dev-util/strace )
+ selinux? (
+ sec-policy/selinux-dracut
+ sys-libs/libselinux
+ sys-libs/libsepol
+ )
+ "
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/docbook-xml-dtd:4.5
+ >=app-text/docbook-xsl-stylesheets-1.75.2
+ >=dev-libs/libxslt-1.1.26
+ "
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+ README.testsuite TODO )
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
+)
+
+src_configure() {
+ local myconf=(
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc"
+ --bashcompletiondir="$(get_bashcompdir)"
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ tc-export CC PKG_CONFIG
+
+ echo ./configure "${myconf[@]}"
+ ./configure "${myconf[@]}" || die
+}
+
+src_install() {
+ default
+
+ local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
+ if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
+ # Preserve lib -> lib64 symlinks in initramfs
+ libdirs+=( /lib /usr/lib )
+ fi
+
+ einfo "Setting libdirs to \"${libdirs[*]}\" ..."
+ echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
+ insinto "/usr/lib/dracut/dracut.conf.d"
+ doins "${T}/gentoo.conf"
+
+ insinto /etc/logrotate.d
+ newins dracut.logrotate dracut
+
+ docinto html
+ dodoc dracut.html
+}
+
+pkg_postinst() {
+ if linux-info_get_any_version && linux_config_exists; then
+ ewarn ""
+ ewarn "If the following test report contains a missing kernel"
+ ewarn "configuration option, you should reconfigure and rebuild your"
+ ewarn "kernel before booting image generated with this Dracut version."
+ ewarn ""
+
+ local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+ # Kernel configuration options descriptions:
+ local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+ ERROR_DEVTMPFS+='is missing and REQUIRED'
+ local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+ ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
+
+ check_extra_config
+ echo
+ else
+ ewarn ""
+ ewarn "Your kernel configuration couldn't be checked."
+ ewarn "Please check manually if following options are enabled:"
+ ewarn ""
+ ewarn " CONFIG_BLK_DEV_INITRD"
+ ewarn " CONFIG_DEVTMPFS"
+ ewarn ""
+ fi
+
+ elog "To get additional features, a number of optional runtime"
+ elog "dependencies may be installed:"
+ elog ""
+ optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
+ sys-apps/iproute2 "net-misc/iputils[arping]"
+ optfeature \
+ "Measure performance of the boot process for later visualisation" \
+ app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+ 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 "Framebuffer splash (media-gfx/splashutils)" \
+ media-gfx/splashutils
+ optfeature "Support iSCSI" sys-block/open-iscsi
+ optfeature "Support Logical Volume Manager" sys-fs/lvm2
+ optfeature "Support MD devices, also known as software RAID devices" \
+ sys-fs/mdadm
+ 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" \
+ net-misc/openssh
+ optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+ app-admin/rsyslog
+}
diff --git a/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch b/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch
new file mode 100644
index 00000000000..aa9c543fdce
--- /dev/null
+++ b/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch
@@ -0,0 +1,41 @@
+From 6d886bb74d1608e4565d926aa259ea5afc9df7b9 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 4 Oct 2018 16:45:47 -0400
+Subject: [PATCH] dracut-install: simplify ldd parsing logic
+
+The previous logic would not handle absolute paths on the left side of
+the "=>" properly. For example, on Gentoo ARM64, ldd outputs this:
+
+ /lib/ld-linux-aarch64.so.1 => /lib64/ld-linux-aarch64.so.1
+
+At runtime, the kernel tries to load the file from /lib, and fails if we
+only provide it in /lib64.
+
+Instead of looking for the first slash after the "=>", just look for the
+first slash, period. This would fail if we somehow had a relative path
+on the left side (foo/libbar.so), but I'm not aware of any binaries that
+would contain such an entry in DT_NEEDED.
+
+Bug: https://bugs.gentoo.org/667752
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ install/dracut-install.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/install/dracut-install.c b/install/dracut-install.c
+index 88bca1d44..5f352b360 100644
+--- a/install/dracut-install.c
++++ b/install/dracut-install.c
+@@ -479,11 +479,7 @@ static int resolve_deps(const char *src)
+ if (strstr(buf, destrootdir))
+ break;
+
+- p = strstr(buf, "=>");
+- if (!p)
+- p = buf;
+-
+- p = strchr(p, '/');
++ p = strchr(buf, '/');
+ if (p) {
+ char *q;
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2020-03-10 19:50 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2020-03-10 19:50 UTC (permalink / raw
To: gentoo-commits
commit: a333ac14261e424907cb1531d1983fba9170a533
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Mar 9 23:21:20 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 19:49:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a333ac14
sys-kernel/dracut: Remove old
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14914
sys-kernel/dracut/Manifest | 4 -
sys-kernel/dracut/dracut-044-r1.ebuild | 260 ---------------------
sys-kernel/dracut/dracut-044-r3.ebuild | 246 -------------------
sys-kernel/dracut/dracut-045-r2.ebuild | 164 -------------
sys-kernel/dracut/dracut-046-r1.ebuild | 165 -------------
sys-kernel/dracut/dracut-047-r1.ebuild | 154 ------------
sys-kernel/dracut/dracut-048.ebuild | 148 ------------
sys-kernel/dracut/dracut-049-r1.ebuild | 156 -------------
sys-kernel/dracut/dracut-049-r2.ebuild | 157 -------------
sys-kernel/dracut/dracut-049.ebuild | 158 -------------
...-lib.sh-dev_unit_name-guard-against-dev-b.patch | 32 ---
...temd-initrd-add-initrd-root-device.target.patch | 24 --
...03-50-dracut.install-use-bin-bash-shebang.patch | 23 --
sys-kernel/dracut/files/045-systemdutildir.patch | 45 ----
sys-kernel/dracut/files/046-amd-microcode.patch | 30 ---
.../047-all-fix-issues-found-by-shellcheck.patch | 77 ------
...mouth-fix-detection-of-plymouth-directory.patch | 31 ---
sys-kernel/dracut/files/dracut-044-bash-4.4.patch | 80 -------
.../dracut-044-preserve-xattrs-when-copying.patch | 51 ----
19 files changed, 2005 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index a2441ad9a7f..2435b6db975 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,7 +1,3 @@
-DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d
-DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a
-DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
-DIST dracut-047.tar.xz 305836 BLAKE2B 18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0 SHA512 03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035
DIST dracut-048.tar.xz 308484 BLAKE2B b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7 SHA512 97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0
DIST dracut-049.tar.gz 376857 BLAKE2B e50084164e26aae6de812345cc76782435ec84951b44eea454355d0c65fe84fdd0858733de534bdf018bdfd92922f0be30b74d74be329a918e55d96c5e4d4fb6 SHA512 51489570856538588868a66c7bcc8a3728574592529905484526c523398dc1b8f1416e6b264780303acd08d818417a9668b76f1d64d3194432b5af79dc15c9f7
DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850
diff --git a/sys-kernel/dracut/dracut-044-r1.ebuild b/sys-kernel/dracut/dracut-044-r1.ebuild
deleted file mode 100644
index 32bb71fb537..00000000000
--- a/sys-kernel/dracut/dracut-044-r1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils linux-info multilib systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
-IUSE="debug selinux systemd"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
- systemd? ( >=sys-apps/systemd-199 )
- "
-RDEPEND="${CDEPEND}
- app-arch/cpio
- >=app-shells/bash-4.0
- >sys-apps/kmod-5[tools]
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- >=sys-apps/util-linux-2.21
-
- debug? ( dev-util/strace )
- selinux? (
- sys-libs/libselinux
- sys-libs/libsepol
- sec-policy/selinux-dracut
- )
- !>=app-shells/bash-4.4"
-DEPEND="${CDEPEND}
- app-text/asciidoc
- >=dev-libs/libxslt-1.1.26
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75.2
- virtual/pkgconfig
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-MY_LIBDIR=/usr/lib
-QA_MULTILIB_PATHS="
- usr/lib/dracut/dracut-install
- usr/lib/dracut/skipcpio
- "
-
-PATCHES=(
- "${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
- "${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch
- "${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch
-)
-
-#
-# Helper functions
-#
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
- local force m
- [[ $1 = -f ]] && force=-f
-
- for m in $@; do
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
- rm ${force} --interactive=never -r "${modules_dir}"/$m
- else
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
- fi
- done
-}
-
-src_prepare() {
- local libdirs="/$(get_libdir) /usr/$(get_libdir)"
- if [[ ${SYMLINK_LIB} = yes ]]; then
- # Preserve lib -> lib64 symlinks in initramfs
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib"
- fi
- einfo "Setting libdirs to \"${libdirs}\" ..."
- sed -e "3alibdirs=\"${libdirs}\"" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
- local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
- einfo "Setting udevdir to ${udevdir}..."
- sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
- if use systemd; then
- local systemdutildir="$(systemd_get_utildir)"
- local systemdsystemunitdir="$(systemd_get_unitdir)"
- local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
- --variable=systemdsystemconfdir)"
- [[ ${systemdsystemconfdir} ]] \
- || systemdsystemconfdir=/etc/systemd/system
- einfo "Setting systemdutildir to ${systemdutildir} and ..."
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
- einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
- sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
- einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
- sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
- else
- local systemdutildir="/lib/systemd"
- einfo "Setting systemdutildir for standalone udev to" \
- "${systemdutildir}..."
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
- fi
-
- epatch "${PATCHES[@]}"
-
- epatch_user
-}
-
-src_configure() {
- local myconf=(
- --libdir="${MY_LIBDIR}"
- --bashcompletiondir="$(get_bashcompdir)"
- )
-
- if use systemd; then
- myconf+=( --systemdsystemunitdir="$(systemd_get_unitdir)" )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- tc-export CC
- emake doc install/dracut-install skipcpio/skipcpio
-}
-
-src_install() {
- default
-
- local my_libdir="${MY_LIBDIR}"
- local dracutlibdir="${my_libdir#/}/dracut"
-
- echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
- insinto "${dracutlibdir}/dracut.conf.d/"
- newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- dodir /var/lib/dracut/overlay
-
- dohtml dracut.html
-
- if ! use systemd; then
- # Scripts in kernel/install.d are systemd-specific
- rm -r "${D%/}/${my_libdir}/kernel" || die
- fi
-
- #
- # Modules
- #
- local module
- modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
- use debug || rm_module 95debug
- use selinux || rm_module 98selinux
-
- if use systemd; then
- # With systemd following modules do not make sense
- rm_module 96securityfs 97masterkey 98integrity
- else
- rm_module 00systemd 98dracut-systemd
- # Without systemd following modules do not make sense
- rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
- fi
-
- # Remove modules which won't work for sure
- rm_module 95fcoe # no tools
- # fips module depends on masked app-crypt/hmaccalc
- rm_module 01fips 02fips-aesni
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
- local opt desc
-
- # Generate ERROR_* variables for check_extra_config.
- for opt in ${CONFIG_CHECK}; do
- opt=${opt#\~}
- desc=desc_${opt}
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
- "is missing and REQUIRED'"
- done
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked. Do you have"
- ewarn "/usr/src/linux/.config file there? Please check manually if"
- ewarn "following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
- sys-apps/iproute2
- optfeature \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
- app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-044-r3.ebuild b/sys-kernel/dracut/dracut-044-r3.ebuild
deleted file mode 100644
index 282b0fb417b..00000000000
--- a/sys-kernel/dracut/dracut-044-r3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux systemd"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
- systemd? (
- >=sys-apps/systemd-199
- virtual/pkgconfig
- )
- "
-RDEPEND="${CDEPEND}
- app-arch/cpio
- >=app-shells/bash-4.0
- >sys-apps/kmod-5[tools]
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- >=sys-apps/util-linux-2.21
-
- debug? ( dev-util/strace )
- selinux? (
- sys-libs/libselinux
- sys-libs/libsepol
- sec-policy/selinux-dracut
- )
- "
-DEPEND="${CDEPEND}
- app-text/asciidoc
- >=dev-libs/libxslt-1.1.26
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75.2
- virtual/pkgconfig
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-MY_LIBDIR=/usr/lib
-QA_MULTILIB_PATHS="
- usr/lib/dracut/dracut-install
- usr/lib/dracut/skipcpio
- "
-
-PATCHES=(
- "${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
- "${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch
- "${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch
- "${FILESDIR}"/dracut-044-bash-4.4.patch
- "${FILESDIR}"/dracut-044-preserve-xattrs-when-copying.patch
-)
-
-#
-# Helper functions
-#
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
- local force m
- [[ $1 = -f ]] && force=-f
-
- for m in $@; do
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
- rm ${force} --interactive=never -r "${modules_dir}"/$m
- else
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
- fi
- done
-}
-
-src_prepare() {
- local libdirs="/$(get_libdir) /usr/$(get_libdir)"
- if [[ ${SYMLINK_LIB} = yes ]]; then
- # Preserve lib -> lib64 symlinks in initramfs
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib"
- fi
- einfo "Setting libdirs to \"${libdirs}\" ..."
- sed -e "3alibdirs=\"${libdirs}\"" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
- local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
- einfo "Setting udevdir to ${udevdir}..."
- sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
- if ! use systemd; then
- local systemdutildir="/lib/systemd"
- einfo "Setting systemdutildir for standalone udev to" \
- "${systemdutildir}..."
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die
- fi
-
- default
-}
-
-src_configure() {
- local myconf=(
- --libdir="${MY_LIBDIR}"
- --bashcompletiondir="$(get_bashcompdir)"
- )
-
- if use systemd; then
- myconf+=( --systemdsystemunitdir="$(systemd_get_systemunitdir)" )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- tc-export CC
- emake doc install/dracut-install skipcpio/skipcpio
-}
-
-src_install() {
- default
-
- local my_libdir="${MY_LIBDIR}"
- local dracutlibdir="${my_libdir#/}/dracut"
-
- echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
- insinto "${dracutlibdir}/dracut.conf.d/"
- newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- dodir /var/lib/dracut/overlay
-
- dodoc dracut.html
-
- if ! use systemd; then
- # Scripts in kernel/install.d are systemd-specific
- rm -r "${D%/}/${my_libdir}/kernel" || die
- fi
-
- #
- # Modules
- #
- local module
- modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
- use debug || rm_module 95debug
- use selinux || rm_module 98selinux
-
- if use systemd; then
- # With systemd following modules do not make sense
- rm_module 96securityfs 97masterkey 98integrity
- else
- rm_module 00systemd 98dracut-systemd
- # Without systemd following modules do not make sense
- rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
- fi
-
- # Remove modules which won't work for sure
- rm_module 95fcoe # no tools
- # fips module depends on masked app-crypt/hmaccalc
- rm_module 01fips 02fips-aesni
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
- local opt desc
-
- # Generate ERROR_* variables for check_extra_config.
- for opt in ${CONFIG_CHECK}; do
- opt=${opt#\~}
- desc=desc_${opt}
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
- "is missing and REQUIRED'"
- done
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked. Do you have"
- ewarn "/usr/src/linux/.config file there? Please check manually if"
- ewarn "following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
- sys-apps/iproute2
- optfeature \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
- app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild
deleted file mode 100644
index c8c943b0380..00000000000
--- a/sys-kernel/dracut/dracut-045-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="debug selinux"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
- virtual/pkgconfig
- >=sys-apps/kmod-15[tools]
- "
-RDEPEND="${CDEPEND}
- app-arch/cpio
- >=app-shells/bash-4.0:0
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- sys-apps/coreutils[xattr(-)]
- >=sys-apps/util-linux-2.21
-
- debug? ( dev-util/strace )
- selinux? (
- sys-libs/libselinux
- sys-libs/libsepol
- sec-policy/selinux-dracut
- )
- !net-analyzer/arping
- "
-DEPEND="${CDEPEND}
- app-text/asciidoc
- >=dev-libs/libxslt-1.1.26
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75.2
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}/045-systemdutildir.patch"
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-}
-
-src_install() {
- default
-
- local dracutlibdir="usr/lib/dracut"
-
- local libdirs="/$(get_libdir) /usr/$(get_libdir)"
- if [[ ${SYMLINK_LIB} = yes ]]; then
- # Preserve lib -> lib64 symlinks in initramfs
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib"
- fi
-
- einfo "Setting libdirs to \"${libdirs}\" ..."
- echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf"
- insinto "${dracutlibdir}/dracut.conf.d"
- doins "${T}/gentoo.conf"
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- dodir /var/lib/dracut/overlay
-
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
- local opt desc
-
- # Generate ERROR_* variables for check_extra_config.
- for opt in ${CONFIG_CHECK}; do
- opt=${opt#\~}
- desc=desc_${opt}
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
- "is missing and REQUIRED'"
- done
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked. Do you have"
- ewarn "/usr/src/linux/.config file there? Please check manually if"
- ewarn "following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
- sys-apps/iproute2 "net-misc/iputils[arping]"
- optfeature \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
- app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
deleted file mode 100644
index a3a22b665f1..00000000000
--- a/sys-kernel/dracut/dracut-046-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="debug selinux"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
- virtual/pkgconfig
- >=sys-apps/kmod-15[tools]
- "
-RDEPEND="${CDEPEND}
- app-arch/cpio
- >=app-shells/bash-4.0:0
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- sys-apps/coreutils[xattr(-)]
- >=sys-apps/util-linux-2.21
-
- debug? ( dev-util/strace )
- selinux? (
- sys-libs/libselinux
- sys-libs/libsepol
- sec-policy/selinux-dracut
- )
- !net-analyzer/arping
- "
-DEPEND="${CDEPEND}
- app-text/asciidoc
- >=dev-libs/libxslt-1.1.26
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75.2
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}/045-systemdutildir.patch"
- "${FILESDIR}/046-amd-microcode.patch"
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-}
-
-src_install() {
- default
-
- local dracutlibdir="usr/lib/dracut"
-
- local libdirs="/$(get_libdir) /usr/$(get_libdir)"
- if [[ ${SYMLINK_LIB} = yes ]]; then
- # Preserve lib -> lib64 symlinks in initramfs
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib"
- fi
-
- einfo "Setting libdirs to \"${libdirs}\" ..."
- echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf"
- insinto "${dracutlibdir}/dracut.conf.d"
- doins "${T}/gentoo.conf"
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- dodir /var/lib/dracut/overlay
-
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
- local opt desc
-
- # Generate ERROR_* variables for check_extra_config.
- for opt in ${CONFIG_CHECK}; do
- opt=${opt#\~}
- desc=desc_${opt}
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
- "is missing and REQUIRED'"
- done
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked. Do you have"
- ewarn "/usr/src/linux/.config file there? Please check manually if"
- ewarn "following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
- sys-apps/iproute2 "net-misc/iputils[arping]"
- optfeature \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
- app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-047-r1.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild
deleted file mode 100644
index ffbb944a4c1..00000000000
--- a/sys-kernel/dracut/dracut-047-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/kmod-23[tools]
- virtual/pkgconfig
- virtual/udev
- "
-RDEPEND="${COMMON_DEPEND}
- app-arch/cpio
- >=app-shells/bash-4.0:0
- sys-apps/coreutils[xattr(-)]
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- >=sys-apps/util-linux-2.21
-
- debug? ( dev-util/strace )
- selinux? (
- sec-policy/selinux-dracut
- sys-libs/libselinux
- sys-libs/libsepol
- )
- "
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75.2
- >=dev-libs/libxslt-1.1.26
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}/045-systemdutildir.patch"
- "${FILESDIR}/047-all-fix-issues-found-by-shellcheck.patch"
- "${FILESDIR}/047-plymouth-fix-detection-of-plymouth-directory.patch"
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-}
-
-src_install() {
- default
-
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
- # Preserve lib -> lib64 symlinks in initramfs
- libdirs+=( /lib /usr/lib )
- fi
-
- einfo "Setting libdirs to \"${libdirs[*]}\" ..."
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
- insinto "/usr/lib/dracut/dracut.conf.d"
- doins "${T}/gentoo.conf"
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
- sys-apps/iproute2 "net-misc/iputils[arping]"
- optfeature \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
- app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-048.ebuild b/sys-kernel/dracut/dracut-048.ebuild
deleted file mode 100644
index 85f233b9f58..00000000000
--- a/sys-kernel/dracut/dracut-048.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/kmod-23[tools]
- virtual/pkgconfig
- virtual/udev
- "
-RDEPEND="${COMMON_DEPEND}
- app-arch/cpio
- >=app-shells/bash-4.0:0
- sys-apps/coreutils[xattr(-)]
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- >=sys-apps/util-linux-2.21
-
- debug? ( dev-util/strace )
- selinux? (
- sec-policy/selinux-dracut
- sys-libs/libselinux
- sys-libs/libsepol
- )
- "
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75.2
- >=dev-libs/libxslt-1.1.26
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-}
-
-src_install() {
- default
-
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
- # Preserve lib -> lib64 symlinks in initramfs
- libdirs+=( /lib /usr/lib )
- fi
-
- einfo "Setting libdirs to \"${libdirs[*]}\" ..."
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
- insinto "/usr/lib/dracut/dracut.conf.d"
- doins "${T}/gentoo.conf"
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
- sys-apps/iproute2 "net-misc/iputils[arping]"
- optfeature \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
- app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-049-r1.ebuild b/sys-kernel/dracut/dracut-049-r1.ebuild
deleted file mode 100644
index 05dd8d5ad43..00000000000
--- a/sys-kernel/dracut/dracut-049-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
- SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
- app-arch/cpio
- >=app-shells/bash-4.0:0
- sys-apps/coreutils[xattr(-)]
- >=sys-apps/kmod-23[tools]
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- >=sys-apps/util-linux-2.21
- virtual/pkgconfig
- virtual/udev
-
- selinux? (
- sec-policy/selinux-dracut
- sys-libs/libselinux
- sys-libs/libsepol
- )
- "
-DEPEND=">=sys-apps/kmod-23"
-
-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
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
- "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
- "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_install() {
- default
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-049-r2.ebuild b/sys-kernel/dracut/dracut-049-r2.ebuild
deleted file mode 100644
index 872f2ff3a24..00000000000
--- a/sys-kernel/dracut/dracut-049-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
- SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
- app-arch/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/util-linux-2.21
- virtual/pkgconfig
- virtual/udev
-
- selinux? (
- sec-policy/selinux-dracut
- sys-libs/libselinux
- sys-libs/libsepol
- )
- "
-DEPEND=">=sys-apps/kmod-23"
-
-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
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
- "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
- "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_install() {
- default
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-049.ebuild b/sys-kernel/dracut/dracut-049.ebuild
deleted file mode 100644
index dda60561bf7..00000000000
--- a/sys-kernel/dracut/dracut-049.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
- app-arch/cpio
- >=app-shells/bash-4.0:0
- sys-apps/coreutils[xattr(-)]
- >=sys-apps/kmod-23[tools]
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- >=sys-apps/util-linux-2.21
- virtual/pkgconfig
- virtual/udev
-
- selinux? (
- sec-policy/selinux-dracut
- sys-libs/libselinux
- sys-libs/libsepol
- )
- "
-DEPEND=">=sys-apps/kmod-23"
-
-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
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
- "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
- "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
-}
-
-src_install() {
- default
-
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
- # Preserve lib -> lib64 symlinks in initramfs
- libdirs+=( /lib /usr/lib )
- fi
-
- einfo "Setting libdirs to \"${libdirs[*]}\" ..."
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
- insinto "/usr/lib/dracut/dracut.conf.d"
- doins "${T}/gentoo.conf"
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch b/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
deleted file mode 100644
index fd6f1185945..00000000000
--- a/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c41df7e1db1adc51399ab2c22f251b15eb2065b1 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Tue, 5 Jan 2016 22:11:57 +0300
-Subject: [PATCH] base/dracut-lib.sh:dev_unit_name() guard against $dev
- beginning with "-"
-
-crypt/parse-crypt.sh generate initqueue job which always call
-dev_unit_name() with an argument beginning with "-". This results
-in the following error:
-
-dracut-initqueue[307]: + systemd-escape -p -cfb4aa43-2f02-4c6b-a313-60ea99288087
-dracut-initqueue[307]: systemd-escape: invalid option -- 'c'
----
- modules.d/99base/dracut-lib.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index ad03394..0a0b1b9 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -874,7 +874,7 @@ dev_unit_name()
- local dev="$1"
-
- if command -v systemd-escape >/dev/null; then
-- systemd-escape -p "$dev"
-+ systemd-escape -p -- "$dev"
- return
- fi
-
---
-2.10.2
-
diff --git a/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch b/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch
deleted file mode 100644
index 21cb6792acd..00000000000
--- a/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d4efc0aeeecc470d9a267b7f3c130f472488905c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 25 May 2016 15:06:29 +0200
-Subject: [PATCH] systemd-initrd: add initrd-root-device.target
-
----
- modules.d/01systemd-initrd/module-setup.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/01systemd-initrd/module-setup.sh b/modules.d/01systemd-initrd/module-setup.sh
-index fb6a9ea..c1ccd2a 100755
---- a/modules.d/01systemd-initrd/module-setup.sh
-+++ b/modules.d/01systemd-initrd/module-setup.sh
-@@ -28,6 +28,7 @@ install() {
- inst_multiple -o \
- $systemdsystemunitdir/initrd.target \
- $systemdsystemunitdir/initrd-fs.target \
-+ $systemdsystemunitdir/initrd-root-device.target \
- $systemdsystemunitdir/initrd-root-fs.target \
- $systemdsystemunitdir/initrd-switch-root.target \
- $systemdsystemunitdir/initrd-switch-root.service \
---
-2.10.2
-
diff --git a/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch b/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch
deleted file mode 100644
index 85ebc7e638f..00000000000
--- a/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 69395a528aed99ec04b16c14ebacf4c2e10afd26 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 4 Nov 2016 13:09:28 -0400
-Subject: [PATCH] 50-dracut.install: use /bin/bash shebang
-
-This script utilizes several bash-specific constructs.
----
- 50-dracut.install | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/50-dracut.install b/50-dracut.install
-index 7d081d5..54c71d4 100755
---- a/50-dracut.install
-+++ b/50-dracut.install
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- COMMAND="$1"
- KERNEL_VERSION="$2"
---
-2.10.2
-
diff --git a/sys-kernel/dracut/files/045-systemdutildir.patch b/sys-kernel/dracut/files/045-systemdutildir.patch
deleted file mode 100644
index e56abba3547..00000000000
--- a/sys-kernel/dracut/files/045-systemdutildir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ed5cc98864c28eab2c4cb45ec0f67450699aaaa8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 3 Jul 2017 22:39:42 -0400
-Subject: [PATCH] dracut.sh: improve udevdir and systemdutildir fallback logic
-
-Check for a common binary in systemdutildir. This resolves an issue on
-split-usr systems, where it is common to have both /lib/systemd[/system]
-and /usr/lib/systemd[/user] present.
-
-Check for systemd-udevd specifically, since some distros (Gentoo) allow
-udev to be installed without the rest of the systemd stack.
-
-Similar logic is applied to udevdir simply for consistency.
----
- dracut.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 64d94201..67c12a72 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1266,16 +1266,16 @@ done
- [[ -d $udevdir ]] \
- || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
- if ! [[ -d "$udevdir" ]]; then
-- [[ ! -h /lib ]] && [[ -d /lib/udev ]] && udevdir=/lib/udev
-- [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
-+ [[ -e /lib/udev/collect ]] && udevdir=/lib/udev
-+ [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev
- fi
-
- [[ -d $systemdutildir ]] \
- || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
-
- if ! [[ -d "$systemdutildir" ]]; then
-- [[ ! -h /lib ]] && [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd
-- [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd
-+ [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
-+ [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
- fi
-
- [[ -d $systemdsystemunitdir ]] \
---
-2.13.2
-
diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch
deleted file mode 100644
index c351275dbeb..00000000000
--- a/sys-kernel/dracut/files/046-amd-microcode.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001
-From: Daniel Molkentin <dmolkentin@suse.com>
-Date: Tue, 12 Dec 2017 17:48:36 +0100
-Subject: [PATCH] Simplify microcode lookup for for AMD CPUs
-
----
- dracut-functions.sh | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 112b2434..d7fc5303 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -661,11 +661,8 @@ get_ucode_file ()
- local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //`
-
- if [[ "$(get_cpu_vendor)" == "AMD" ]]; then
-- # If family greater than or equal to 0x16
-- if [[ $family -ge 22 ]]; then
-- printf "microcode_amd_fam16h.bin"
-- elif [[ $family -eq 21 ]]; then
-- printf "microcode_amd_fam15h.bin"
-+ if [[ $family -ge 21 ]]; then
-+ printf "microcode_amd_fam%xh.bin" $family
- else
- printf "microcode_amd.bin"
- fi
---
-2.16.0.rc0
-
diff --git a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch
deleted file mode 100644
index d5cbe042b63..00000000000
--- a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 3aa37cafde734719f2377600a17459fad30edfbc Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Fri, 2 Mar 2018 12:29:46 +0100
-Subject: [PATCH 06/14] all: fix issues found by shellcheck
-To: <initramfs@vger.kernel.org>
-
-Error: SHELLCHECK_WARNING:
-/usr/lib/dracut/dracut-init.sh:939:20: error: Argument to implicit -n is always true due to literal strings. [SC2157]
- 937| dracut_kernel_post() {
- 938| for _f in modules.builtin.bin modules.builtin modules.order; do
- 939|-> [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
- 940| done
- 941|
-
-Error: SHELLCHECK_WARNING:
-/usr/lib/dracut/modules.d/98syslog/parse-syslog-opts.sh:18:12: error: This expression is constant. Did you forget a $ somewhere? [SC2078]
- 16| elif [ -e /sbin/syslogd ]; then
- 17| syslogtype="syslogd"
- 18|-> elif [ /sbin/syslog-ng ]; then
- 19| syslogtype="syslog-ng"
- 20| else
-
-Error: SHELLCHECK_WARNING:
-/usr/lib/dracut/modules.d/90crypt/crypt-lib.sh:15:29: error: Since you double quoted this, it will not word split, and the loop will only run once. [SC2066]
- 13| strstr "$d" "${luks##luks-}" && return 0
- 14| if [ -n "$dev" ]; then
- 15|-> for _dev in "$(devnames $d)"; do
- 16| [ "$dev" -ef "$_dev" ] && return 0
- 17| done
----
- dracut-init.sh | 2 +-
- modules.d/90crypt/crypt-lib.sh | 2 +-
- modules.d/98syslog/parse-syslog-opts.sh | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dracut-init.sh b/dracut-init.sh
-index 53e6f13a..1278c638 100644
---- a/dracut-init.sh
-+++ b/dracut-init.sh
-@@ -942,7 +942,7 @@ for_each_kmod_dep() {
-
- dracut_kernel_post() {
- for _f in modules.builtin.bin modules.builtin modules.order; do
-- [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
-+ [[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
- done
-
- # generate module dependencies for the initrd
-diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
-index 532b9a71..bbf485e0 100755
---- a/modules.d/90crypt/crypt-lib.sh
-+++ b/modules.d/90crypt/crypt-lib.sh
-@@ -12,7 +12,7 @@ crypttab_contains() {
- strstr "${l##luks-}" "${luks##luks-}" && return 0
- strstr "$d" "${luks##luks-}" && return 0
- if [ -n "$dev" ]; then
-- for _dev in "$(devnames $d)"; do
-+ for _dev in $(devnames $d); do
- [ "$dev" -ef "$_dev" ] && return 0
- done
- fi
-diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh
-index 50ec2759..9ec6ad47 100755
---- a/modules.d/98syslog/parse-syslog-opts.sh
-+++ b/modules.d/98syslog/parse-syslog-opts.sh
-@@ -15,7 +15,7 @@ detect_syslog() {
- syslogtype="rsyslogd"
- elif [ -e /sbin/syslogd ]; then
- syslogtype="syslogd"
-- elif [ /sbin/syslog-ng ]; then
-+ elif [ -e /sbin/syslog-ng ]; then
- syslogtype="syslog-ng"
- else
- warn "Could not find any syslog binary although the syslogmodule is selected to be installed. Please check."
---
-2.16.1
-
diff --git a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch
deleted file mode 100644
index 42f877292a7..00000000000
--- a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fe6c7e0f06cde65effb3503a47c31ac39aceefb6 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Fri, 23 Mar 2018 11:52:27 +0300
-Subject: [PATCH 14/14] plymouth: fix detection of plymouth directory
-To: <initramfs@vger.kernel.org>
-
-Some distros have both /usr/lib/plymouth and /usr/libexec/plymouth
-directorirs, so we should check the existance of plymouth-populate-initrd
-script.
-
-Fixes: 421b46f8ae89cfe2b62e880a8a5079ee8c1b3aae
----
- modules.d/50plymouth/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
-index 5fbca8b0..b51913e8 100755
---- a/modules.d/50plymouth/module-setup.sh
-+++ b/modules.d/50plymouth/module-setup.sh
-@@ -6,7 +6,7 @@ pkglib_dir() {
- _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
- fi
- for _dir in $_dirs; do
-- if [ -d $_dir ]; then
-+ if [ -x $_dir/plymouth-populate-initrd ]; then
- echo $_dir
- return
- fi
---
-2.16.1
-
diff --git a/sys-kernel/dracut/files/dracut-044-bash-4.4.patch b/sys-kernel/dracut/files/dracut-044-bash-4.4.patch
deleted file mode 100644
index 3144c8e6b75..00000000000
--- a/sys-kernel/dracut/files/dracut-044-bash-4.4.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -urN dracut-044.orig/modules.d/50drm/module-setup.sh dracut-044/modules.d/50drm/module-setup.sh
---- dracut-044.orig/modules.d/50drm/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/50drm/module-setup.sh 2016-09-28 02:50:08.914967926 +0300
-@@ -24,9 +24,9 @@
- local _fname _fcont
- while read _fname || [ -n "$_fname" ]; do
- case "$_fname" in
-- *.ko) _fcont="$(< $_fname)" ;;
-- *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
-- *.ko.xz) _fcont="$(xz -dc $_fname)" ;;
-+ *.ko) _fcont="$(< $_fname tr -d \\0)" ;;
-+ *.ko.gz) _fcont="$(gzip -dc $_fname | tr -d \\0)" ;;
-+ *.ko.xz) _fcont="$(xz -dc $_fname | tr -d \\0)" ;;
- esac
- [[ $_fcont =~ $_drm_drivers
- && ! $_fcont =~ iw_handler_get_spy ]] \
-diff -urN dracut-044.orig/modules.d/90kernel-modules/module-setup.sh dracut-044/modules.d/90kernel-modules/module-setup.sh
---- dracut-044.orig/modules.d/90kernel-modules/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/90kernel-modules/module-setup.sh 2016-09-28 02:49:11.725390294 +0300
-@@ -10,9 +10,9 @@
- function bmf1() {
- local _f
- while read _f || [ -n "$_f" ]; do case "$_f" in
-- *.ko) [[ $(< $_f) =~ $_blockfuncs ]] && echo "$_f" ;;
-- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
-- *.ko.xz) [[ $(xz -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
-+ *.ko) [[ $(< $_f tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
-+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
-+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
- esac
- done
- return 0
-diff -urN dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh dracut-044/modules.d/90kernel-network-modules/module-setup.sh
---- dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/90kernel-network-modules/module-setup.sh 2016-09-28 02:51:08.202422231 +0300
-@@ -26,9 +26,9 @@
- while read _fname; do
- [[ $_fname =~ $_unwanted_drivers ]] && continue
- case "$_fname" in
-- *.ko) _fcont="$(< $_fname)" ;;
-- *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
-- *.ko.xz) _fcont="$(xz -dc $_fname)" ;;
-+ *.ko) _fcont="$(< $_fname tr -d \\0)" ;;
-+ *.ko.gz) _fcont="$(gzip -dc $_fname | tr -d \\0)" ;;
-+ *.ko.xz) _fcont="$(xz -dc $_fname | tr -d \\0)" ;;
- esac
- [[ $_fcont =~ $_net_drivers
- && ! $_fcont =~ iw_handler_get_spy ]] \
-diff -urN dracut-044.orig/modules.d/90multipath/module-setup.sh dracut-044/modules.d/90multipath/module-setup.sh
---- dracut-044.orig/modules.d/90multipath/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/90multipath/module-setup.sh 2016-09-28 02:49:11.726390235 +0300
-@@ -58,9 +58,9 @@
- local _f
- while read _f || [ -n "$_f" ]; do
- case "$_f" in
-- *.ko) [[ $(< $_f) =~ $_funcs ]] && echo "$_f" ;;
-- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
-- *.ko.xz) [[ $(xz -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
-+ *.ko) [[ $(< $_f tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
- esac
- done
- return 0
-diff -urN dracut-044.orig/modules.d/95iscsi/module-setup.sh dracut-044/modules.d/95iscsi/module-setup.sh
---- dracut-044.orig/modules.d/95iscsi/module-setup.sh 2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/95iscsi/module-setup.sh 2016-09-28 02:49:11.726390235 +0300
-@@ -168,9 +168,9 @@
- local _f
- while read _f || [ -n "$_f" ]; do
- case "$_f" in
-- *.ko) [[ $(< $_f) =~ $_funcs ]] && echo "$_f" ;;
-- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
-- *.ko.xz) [[ $(xz -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
-+ *.ko) [[ $(< $_f tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
- esac
- done
- return 0
diff --git a/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch b/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch
deleted file mode 100644
index 3146d8485a9..00000000000
--- a/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 61c761bc2c35fb244d46fbbde97161f5927071dc Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@us.ibm.com>
-Date: Tue, 25 Oct 2016 15:09:49 -0400
-Subject: [PATCH] dracut-install: preserve extended attributes when copying
- files
-
-Preserve extended attributes when copying files using dracut-install.
-
-The copying of extended attributes avoids file execution denials when
-the Linux Integrity Measurement's Appraisal mode is active. In that mode
-executables need their file signatures copied. In particular, this patch
-solves the problem that dependent libaries are not included in the
-initramfs since the copied programs could not be executed due to missing
-signatures. The following audit record shows the type of failure that
-is now prevented:
-
-type=INTEGRITY_DATA msg=audit(1477409025.492:30065): pid=922 uid=0
- auid=4294967295 ses=4294967295
- subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
- op="appraise_data" cause="IMA-signature-required"
- comm="ld-linux-x86-64"
- name="/var/tmp/dracut.R6ySa4/initramfs/usr/bin/journalctl"
- dev="dm-0" ino=37136 res=0
-
-Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
----
- install/dracut-install.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index fe30bba..c0f1c17 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -294,7 +294,7 @@ static int cp(const char *src, const char *dst)
- normal_copy:
- pid = fork();
- if (pid == 0) {
-- execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst,
-+ execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps,xattr", "-fL", src, dst,
- NULL);
- _exit(EXIT_FAILURE);
- }
-@@ -302,7 +302,7 @@ static int cp(const char *src, const char *dst)
- while (waitpid(pid, &ret, 0) < 0) {
- if (errno != EINTR) {
- ret = -1;
-- log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src,
-+ log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps,xattr -fL %s %s", src,
- dst);
- break;
- }
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2020-08-07 16:59 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2020-08-07 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 0ccf6576c110503b33b71af18649d54568fe208a
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Wed Aug 5 00:18:41 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 16:59:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccf6576
sys-kernel/dracut: Revbump 050, multiple upstream fixes
* fix LVM activation
* workaround for BTRFS mounts on slow machines
* install NetworkManager initque/finished hook
* POSIX shell compatibility fixes
* remove deprecated "syslog" parameter from systemd units
Closes: https://bugs.gentoo.org/724474
Closes: https://bugs.gentoo.org/734166
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17004
sys-kernel/dracut/dracut-050-r2.ebuild | 171 +++++++++++++++
.../050-btrfs-force-preload-btrfs-module.patch | 30 +++
...sh-quote-variables-in-parameter-expansion.patch | 111 ++++++++++
...lvm-fix-removal-of-pvscan-from-udev-rules.patch | 26 +++
...ager-ensure-that-nm-run.sh-is-executed-wh.patch | 48 ++++
...-systemd-remove-obsolete-syslog-parameter.patch | 241 +++++++++++++++++++++
6 files changed, 627 insertions(+)
diff --git a/sys-kernel/dracut/dracut-050-r2.ebuild b/sys-kernel/dracut/dracut-050-r2.ebuild
new file mode 100644
index 00000000000..db03491b7c2
--- /dev/null
+++ b/sys-kernel/dracut/dracut-050-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+ [[ "${PV}" = *_rc* ]] || \
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux"
+
+# Tests need root privileges, bug #298014
+RESTRICT="test"
+
+RDEPEND="
+ app-arch/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/util-linux-2.21
+ virtual/pkgconfig
+ 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
+"
+
+DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules
+ README.testsuite TODO )
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch
+ "${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
+ "${FILESDIR}"/050-Makefile-fix-VERSION-again.patch
+ "${FILESDIR}"/050-btrfs-force-preload-btrfs-module.patch
+ "${FILESDIR}"/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
+ "${FILESDIR}"/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
+ "${FILESDIR}"/050-busybox-module-fix.patch
+ "${FILESDIR}"/050-systemd-remove-obsolete-syslog-parameter.patch
+ "${FILESDIR}"/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
+ "${FILESDIR}"/050-gentoo-ldconfig-paths.patch
+)
+
+src_configure() {
+ local myconf=(
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc"
+ --bashcompletiondir="$(get_bashcompdir)"
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ tc-export CC PKG_CONFIG
+
+ echo ./configure "${myconf[@]}"
+ ./configure "${myconf[@]}" || die
+
+ if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
+ # Source tarball from github doesn't include this file
+ echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
+ fi
+}
+
+src_install() {
+ default
+
+ insinto /etc/logrotate.d
+ newins dracut.logrotate dracut
+
+ docinto html
+ dodoc dracut.html
+}
+
+pkg_postinst() {
+ if linux-info_get_any_version && linux_config_exists; then
+ ewarn ""
+ ewarn "If the following test report contains a missing kernel"
+ ewarn "configuration option, you should reconfigure and rebuild your"
+ ewarn "kernel before booting image generated with this Dracut version."
+ ewarn ""
+
+ local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+ # Kernel configuration options descriptions:
+ local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+ ERROR_DEVTMPFS+='is missing and REQUIRED'
+ local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+ ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
+
+ check_extra_config
+ echo
+ else
+ ewarn ""
+ ewarn "Your kernel configuration couldn't be checked."
+ ewarn "Please check manually if following options are enabled:"
+ ewarn ""
+ ewarn " CONFIG_BLK_DEV_INITRD"
+ ewarn " CONFIG_DEVTMPFS"
+ ewarn ""
+ fi
+
+ elog "To get additional features, a number of optional runtime"
+ elog "dependencies may be installed:"
+ elog ""
+ 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 \
+ "Measure performance of the boot process for later visualisation" \
+ app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+ 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 "Support iSCSI" sys-block/open-iscsi
+ optfeature "Support Logical Volume Manager" sys-fs/lvm2
+ optfeature "Support MD devices, also known as software RAID devices" \
+ sys-fs/mdadm
+ 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" \
+ net-misc/openssh
+ optfeature "Enable logging with rsyslog" app-admin/rsyslog
+ optfeature \
+ "Enable rngd service to help generating entropy early during boot" \
+ sys-apps/rng-tools
+}
diff --git a/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch b/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch
new file mode 100644
index 00000000000..386722c2ae8
--- /dev/null
+++ b/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch
@@ -0,0 +1,30 @@
+From 0402b3777b1c64bd716f588ff7457b905e98489d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 11 Mar 2020 12:56:52 +0100
+Subject: [PATCH] btrfs: force preload btrfs module
+
+fixes https://github.com/dracutdevs/dracut/issues/658
+
+raid6_pq and xor takes time doing benchmarking
+
+[ 3.983009] request_module fs-btrfs succeeded, but still no fs?
+---
+ modules.d/90btrfs/module-setup.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
+index b0d0058b..66a254e1 100755
+--- a/modules.d/90btrfs/module-setup.sh
++++ b/modules.d/90btrfs/module-setup.sh
+@@ -48,5 +48,7 @@ install() {
+
+ inst_multiple -o btrfsck btrfs-zero-log
+ inst $(command -v btrfs) /sbin/btrfs
++ # Hack for slow machines
++ # see https://github.com/dracutdevs/dracut/issues/658
++ echo "rd.driver.pre=btrfs" > ${initdir}/etc/cmdline.d/00-btrfs.conf
+ }
+-
+--
+2.26.2
+
diff --git a/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch b/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
new file mode 100644
index 00000000000..11ca7add6d6
--- /dev/null
+++ b/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
@@ -0,0 +1,111 @@
+From 8e1a4dc5f8a777fc718db490414ffdc9dc755f66 Mon Sep 17 00:00:00 2001
+From: Jonas Witschel <diabonas@archlinux.org>
+Date: Sat, 18 Apr 2020 14:55:41 +0200
+Subject: [PATCH] dracut-lib.sh: quote variables in parameter expansion
+ patterns
+
+According to POSIX.1-2017, 2.6.2 Parameter Expansion:
+
+${parameter%[word]} [...] The word shall be expanded to produce a
+pattern.
+
+This means if word contains variables that itself contain special
+characters like asterisks or backslashes, these are treated as pattern
+characters unless the variable is quoted. Try e.g. the following example
+in bash, dash or (busybox) ash:
+
+i='a\c'; j='\'; echo "${i%$j*}"
+
+This prints "a\c" because "$j*" is expanded to "\*", escaping the
+asterisk. In contrast,
+
+i='a\c'; j='\'; echo "${i%"$j"*}"
+
+produces the expected result "a" because the backslash is not specially
+treated any more after quoting.
+
+The quotes that this commit adds have been previously removed in commit
+f9c96cf56fed390841eac05c43826e62014c9188, citing issues with busybox
+hush without further specifying the actual error. I tested a recent
+busybox build (upstream commit 9aa751b08ab03d6396f86c3df77937a19687981b)
+and couldn't find any problems. Note that the above example always
+produces "a\c" in hush regardless of quoting $j, making hush unsuitable
+for use with dracut, but using quotes in parameter expansions generally
+works.
+
+The unquoted variables break the "rd.luks.uuid/name" kernel command line
+options in dracut 050 because
+
+str_replace "$luksname" '\' '\\'
+
+in modules.d/90crypt/parse-crypt.sh is not able to escape the
+backslashes any more, see GH-723, GH-727: backslashes in the
+systemd-cryptsetup@.service unit name stay unescaped for use in udev
+(cf. commit 0f6d93eb9d63695a64002ec8b0421fbc9fc8a7a3), leading to
+failures in starting the unit.
+
+This partially reverts commit f9c96cf56fed390841eac05c43826e62014c9188.
+---
+ modules.d/99base/dracut-lib.sh | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
+index c53cd13b..c57523d3 100755
+--- a/modules.d/99base/dracut-lib.sh
++++ b/modules.d/99base/dracut-lib.sh
+@@ -24,7 +24,7 @@ debug_on() {
+
+ # returns OK if $1 contains literal string $2 (and isn't empty)
+ strstr() {
+- [ "${1##*$2*}" != "$1" ]
++ [ "${1##*"$2"*}" != "$1" ]
+ }
+
+ # returns OK if $1 matches (completely) glob pattern $2
+@@ -43,18 +43,18 @@ strglobin() {
+
+ # returns OK if $1 contains literal string $2 at the beginning, and isn't empty
+ str_starts() {
+- [ "${1#$2*}" != "$1" ]
++ [ "${1#"$2"*}" != "$1" ]
+ }
+
+ # returns OK if $1 contains literal string $2 at the end, and isn't empty
+ str_ends() {
+- [ "${1%*$2}" != "$1" ]
++ [ "${1%*"$2"}" != "$1" ]
+ }
+
+ trim() {
+ local var="$*"
+- var="${var#${var%%[![:space:]]*}}" # remove leading whitespace characters
+- var="${var%${var##*[![:space:]]}}" # remove trailing whitespace characters
++ var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
++ var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
+ printf "%s" "$var"
+ }
+
+@@ -108,9 +108,9 @@ str_replace() {
+ local out=''
+
+ while strstr "${in}" "$s"; do
+- chop="${in%%$s*}"
++ chop="${in%%"$s"*}"
+ out="${out}${chop}$r"
+- in="${in#*$s}"
++ in="${in#*"$s"}"
+ done
+ echo "${out}${in}"
+ }
+@@ -396,7 +396,7 @@ splitsep() {
+ while [ -n "$str" -a "$#" -gt 1 ]; do
+ tmp="${str%%$sep*}"
+ eval "$1='${tmp}'"
+- str="${str#$tmp}"
++ str="${str#"$tmp"}"
+ str="${str#$sep}"
+ shift
+ done
+--
+2.26.2
+
diff --git a/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch b/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
new file mode 100644
index 00000000000..8b93afc358e
--- /dev/null
+++ b/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
@@ -0,0 +1,26 @@
+From 07417b7fc5cb261187519c916e4735189f20f4c6 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Sat, 23 May 2020 18:03:47 +0300
+Subject: [PATCH] lvm: fix removal of pvscan from udev rules
+
+udev rules provided by lvm 2.02.128 and newer uses '+=' instead of '='.
+---
+ modules.d/90lvm/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
+index d6d2c185..52c803f7 100755
+--- a/modules.d/90lvm/module-setup.sh
++++ b/modules.d/90lvm/module-setup.sh
+@@ -101,7 +101,7 @@ install() {
+ sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' \
+ ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
+ sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
+- sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
++ sed -i -e 's/^ENV{SYSTEMD_WANTS}+\?=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
+ else
+ sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' \
+ ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
+--
+2.26.2
+
diff --git a/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch b/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
new file mode 100644
index 00000000000..d97193c9b13
--- /dev/null
+++ b/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
@@ -0,0 +1,48 @@
+From 3dcaa97ca4dcfa8092252a22df62c60941e59ce3 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Wed, 11 Mar 2020 09:40:50 +0100
+Subject: [PATCH] network-manager: ensure that nm-run.sh is executed when
+ needed
+
+The network-manager command line hook must install a
+initqueue/finished hook to ensure that nm-run.sh is executed when
+there are network connections to activate.
+
+Fixes: #694
+---
+ modules.d/35network-manager/nm-config.sh | 11 +++++++++++
+ modules.d/35network-manager/nm-run.sh | 2 ++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/modules.d/35network-manager/nm-config.sh b/modules.d/35network-manager/nm-config.sh
+index 1efa737c..39a1c8bd 100755
+--- a/modules.d/35network-manager/nm-config.sh
++++ b/modules.d/35network-manager/nm-config.sh
+@@ -5,3 +5,14 @@ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
+ fi
+
+ /usr/libexec/nm-initrd-generator -- $(getcmdline)
++
++if getargbool 0 rd.neednet; then
++ for i in /usr/lib/NetworkManager/system-connections/* \
++ /run/NetworkManager/system-connections/* \
++ /etc/NetworkManager/system-connections/* \
++ /etc/sysconfig/network-scripts/ifcfg-*; do
++ [ -f "$i" ] || continue
++ echo '[ -f /tmp/nm.done ]' >$hookdir/initqueue/finished/nm.sh
++ break
++ done
++fi
+diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
+index 4079b735..fc5280a1 100755
+--- a/modules.d/35network-manager/nm-run.sh
++++ b/modules.d/35network-manager/nm-run.sh
+@@ -22,3 +22,5 @@ do
+ source_hook initqueue/online $ifname
+ /sbin/netroot $ifname
+ done
++
++> /tmp/nm.done
+--
+2.26.2
+
diff --git a/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch b/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch
new file mode 100644
index 00000000000..f24cf11b37b
--- /dev/null
+++ b/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch
@@ -0,0 +1,241 @@
+From 265f696b532f63f0ac1f9f341e0469a6eafe2fdd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:26:00 +0000
+Subject: [PATCH 01/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/90stratis/stratisd-init.service | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/modules.d/90stratis/stratisd-init.service b/modules.d/90stratis/stratisd-init.service
+index 318e8c27..1be2e33b 100644
+--- a/modules.d/90stratis/stratisd-init.service
++++ b/modules.d/90stratis/stratisd-init.service
+@@ -8,8 +8,6 @@ DefaultDependencies=no
+ Type=simple
+ ExecStart=/sbin/stratisd-init --debug
+ KillSignal=SIGINT
+-StandardOutput=syslog
+-StandardError=syslog
+
+ [Install]
+ WantedBy=sysinit.target
+--
+2.26.2
+
+From 38ba90bf88b38228e128c65be40a2da287c0b1ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:29:34 +0000
+Subject: [PATCH 02/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/99squash/squash-mnt-clear.service | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/99squash/squash-mnt-clear.service b/modules.d/99squash/squash-mnt-clear.service
+index 84441f60..9d94c524 100644
+--- a/modules.d/99squash/squash-mnt-clear.service
++++ b/modules.d/99squash/squash-mnt-clear.service
+@@ -12,6 +12,6 @@ ConditionPathExists=/squash/root
+ Type=oneshot
+ RemainAfterExit=no
+ StandardInput=null
+-StandardOutput=syslog+console
+-StandardError=syslog+console
++StandardOutput=journal+console
++StandardError=journal+console
+ ExecStart=/squash/clear-squash.sh
+--
+2.26.2
+
+From 5cb2a4004d18e4b96ddc18f221fae922350a9000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:31:17 +0000
+Subject: [PATCH 03/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/98dracut-systemd/dracut-pre-trigger.service | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/98dracut-systemd/dracut-pre-trigger.service b/modules.d/98dracut-systemd/dracut-pre-trigger.service
+index 7bf16167..6f1ba521 100644
+--- a/modules.d/98dracut-systemd/dracut-pre-trigger.service
++++ b/modules.d/98dracut-systemd/dracut-pre-trigger.service
+@@ -20,8 +20,7 @@ Environment=NEWROOT=/sysroot
+ Type=oneshot
+ ExecStart=-/bin/dracut-pre-trigger
+ StandardInput=null
+-StandardOutput=syslog
+-StandardError=syslog+console
++StandardError=journal+console
+ KillMode=process
+ RemainAfterExit=yes
+
+--
+2.26.2
+
+From 317d841c788e841d3533515ceda5597a099eb64e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:31:59 +0000
+Subject: [PATCH 04/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/98dracut-systemd/dracut-initqueue.service | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service
+index 207d545d..3a8679a5 100644
+--- a/modules.d/98dracut-systemd/dracut-initqueue.service
++++ b/modules.d/98dracut-systemd/dracut-initqueue.service
+@@ -21,8 +21,7 @@ Environment=NEWROOT=/sysroot
+ Type=oneshot
+ ExecStart=-/bin/dracut-initqueue
+ StandardInput=null
+-StandardOutput=syslog
+-StandardError=syslog+console
++StandardError=journal+console
+ KillMode=process
+ RemainAfterExit=yes
+
+--
+2.26.2
+
+From 0c1bd016ecfb9c6d194c4356199b509d90db4071 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:32:44 +0000
+Subject: [PATCH 05/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/98dracut-systemd/dracut-pre-pivot.service | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.service b/modules.d/98dracut-systemd/dracut-pre-pivot.service
+index 9a1f0854..e893d1dd 100644
+--- a/modules.d/98dracut-systemd/dracut-pre-pivot.service
++++ b/modules.d/98dracut-systemd/dracut-pre-pivot.service
+@@ -27,8 +27,7 @@ Environment=NEWROOT=/sysroot
+ Type=oneshot
+ ExecStart=-/bin/dracut-pre-pivot
+ StandardInput=null
+-StandardOutput=syslog
+-StandardError=syslog+console
++StandardError=journal+console
+ KillMode=process
+ RemainAfterExit=yes
+
+--
+2.26.2
+
+From e1130a83405648777210fdc99f7eee087eebaadc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:33:33 +0000
+Subject: [PATCH 06/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/98dracut-systemd/dracut-pre-udev.service | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service
+index 570ec02d..e4092e35 100644
+--- a/modules.d/98dracut-systemd/dracut-pre-udev.service
++++ b/modules.d/98dracut-systemd/dracut-pre-udev.service
+@@ -24,8 +24,7 @@ Environment=NEWROOT=/sysroot
+ Type=oneshot
+ ExecStart=-/bin/dracut-pre-udev
+ StandardInput=null
+-StandardOutput=syslog
+-StandardError=syslog+console
++StandardError=journal+console
+ KillMode=process
+ RemainAfterExit=yes
+
+--
+2.26.2
+
+From c437933cb0490e800e776cb7695d2ea0e95056a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:34:17 +0000
+Subject: [PATCH 07/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/98dracut-systemd/dracut-pre-mount.service | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/98dracut-systemd/dracut-pre-mount.service b/modules.d/98dracut-systemd/dracut-pre-mount.service
+index d3909689..18c9730c 100644
+--- a/modules.d/98dracut-systemd/dracut-pre-mount.service
++++ b/modules.d/98dracut-systemd/dracut-pre-mount.service
+@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot
+ Type=oneshot
+ ExecStart=-/bin/dracut-pre-mount
+ StandardInput=null
+-StandardOutput=syslog
+-StandardError=syslog+console
++StandardError=journal+console
+ KillMode=process
+ RemainAfterExit=yes
+
+--
+2.26.2
+
+From d9149c6ca7c52c204c1b346e9b6a32bbadd0b2ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:35:02 +0000
+Subject: [PATCH 08/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/98dracut-systemd/dracut-cmdline.service | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/98dracut-systemd/dracut-cmdline.service b/modules.d/98dracut-systemd/dracut-cmdline.service
+index e577ec88..a8078bd2 100644
+--- a/modules.d/98dracut-systemd/dracut-cmdline.service
++++ b/modules.d/98dracut-systemd/dracut-cmdline.service
+@@ -23,8 +23,7 @@ Environment=NEWROOT=/sysroot
+ Type=oneshot
+ ExecStart=-/bin/dracut-cmdline
+ StandardInput=null
+-StandardOutput=syslog
+-StandardError=syslog+console
++StandardError=journal+console
+ KillMode=process
+ RemainAfterExit=yes
+
+--
+2.26.2
+
+From 8cb5ac1b30be458df9497911ba601d90e68f4d5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
+Date: Wed, 15 Jul 2020 14:35:38 +0000
+Subject: [PATCH 09/10] As of v246 of systemd "syslog" and "syslog-console"
+ switches have been deprecated
+
+---
+ modules.d/98dracut-systemd/dracut-mount.service | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules.d/98dracut-systemd/dracut-mount.service b/modules.d/98dracut-systemd/dracut-mount.service
+index 77d34f62..c88e6d84 100644
+--- a/modules.d/98dracut-systemd/dracut-mount.service
++++ b/modules.d/98dracut-systemd/dracut-mount.service
+@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot
+ Type=oneshot
+ ExecStart=-/bin/dracut-mount
+ StandardInput=null
+-StandardOutput=syslog
+-StandardError=syslog+console
++StandardError=journal+console
+ KillMode=process
+ RemainAfterExit=yes
+
+--
+2.26.2
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2020-12-15 20:49 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2020-12-15 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 212cdc360c3d1a61eeb1527cad0dc15aef2e5428
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 20:32:25 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 20:37:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212cdc36
sys-kernel/dracut: remove version number from gentoo-specific patch
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/dracut-050-r2.ebuild | 2 +-
sys-kernel/dracut/dracut-9999.ebuild | 2 +-
.../{050-gentoo-ldconfig-paths.patch => gentoo-ldconfig-paths.patch} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/dracut/dracut-050-r2.ebuild b/sys-kernel/dracut/dracut-050-r2.ebuild
index c5676baf309..7f2011e1f24 100644
--- a/sys-kernel/dracut/dracut-050-r2.ebuild
+++ b/sys-kernel/dracut/dracut-050-r2.ebuild
@@ -73,7 +73,7 @@ PATCHES=(
"${FILESDIR}"/050-busybox-module-fix.patch
"${FILESDIR}"/050-systemd-remove-obsolete-syslog-parameter.patch
"${FILESDIR}"/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
- "${FILESDIR}"/050-gentoo-ldconfig-paths.patch
+ "${FILESDIR}"/gentoo-ldconfig-paths.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 62193b227a5..69b97ddb7c4 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -64,7 +64,7 @@ DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.module
QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
- "${FILESDIR}"/050-gentoo-ldconfig-paths.patch
+ "${FILESDIR}"/gentoo-ldconfig-paths.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch b/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch
similarity index 100%
rename from sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch
rename to sys-kernel/dracut/files/gentoo-ldconfig-paths.patch
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2020-12-15 20:49 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2020-12-15 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 6c9f3b580d02254794ce66acce40bc18d3ace645
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 20:34:16 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 20:37:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9f3b58
sys-kernel/dracut: remove old
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/Manifest | 2 -
sys-kernel/dracut/dracut-048-r1.ebuild | 152 ------------------
sys-kernel/dracut/dracut-049-r3.ebuild | 176 ---------------------
sys-kernel/dracut/dracut-050-r1.ebuild | 166 -------------------
sys-kernel/dracut/dracut-050.ebuild | 165 -------------------
...dracut-install-simplify-ldd-parsing-logic.patch | 41 -----
...etwork-Don-t-include-40network-by-default.patch | 34 ----
...gure-find-cflags-and-libs-for-fts-on-musl.patch | 97 ------------
...t-create-locking-directory-run-cryptsetup.patch | 32 ----
...all-Support-the-compressed-firmware-files.patch | 63 --------
.../049-dracut.sh-Fix-udevdir-detection.patch | 38 -----
.../dracut/files/049-fs-lib-drop-a-bashism.patch | 99 ------------
...cut-install.c-install-module-dependencies.patch | 79 ---------
...ing_hash_func-should-not-be-fed-with-NULL.patch | 38 -----
...g-the-systemdutildir-variable-before-it-s.patch | 55 -------
...ager-call-the-online-hook-for-connected-d.patch | 32 ----
...ager-fix-getting-of-ifname-from-the-sysfs.patch | 37 -----
...rk-manager-remove-useless-use-of-basename.patch | 26 ---
...49-remove-bashism-in-various-boot-scripts.patch | 89 -----------
...dule-running-early-during-boot-to-help-ge.patch | 88 -----------
sys-kernel/dracut/metadata.xml | 4 -
21 files changed, 1513 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 2435b6db975..64f093283b5 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,3 +1 @@
-DIST dracut-048.tar.xz 308484 BLAKE2B b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7 SHA512 97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0
-DIST dracut-049.tar.gz 376857 BLAKE2B e50084164e26aae6de812345cc76782435ec84951b44eea454355d0c65fe84fdd0858733de534bdf018bdfd92922f0be30b74d74be329a918e55d96c5e4d4fb6 SHA512 51489570856538588868a66c7bcc8a3728574592529905484526c523398dc1b8f1416e6b264780303acd08d818417a9668b76f1d64d3194432b5af79dc15c9f7
DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850
diff --git a/sys-kernel/dracut/dracut-048-r1.ebuild b/sys-kernel/dracut/dracut-048-r1.ebuild
deleted file mode 100644
index 937662bdf28..00000000000
--- a/sys-kernel/dracut/dracut-048-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="debug selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/kmod-23[tools]
- virtual/pkgconfig
- virtual/udev
- "
-RDEPEND="${COMMON_DEPEND}
- app-arch/cpio
- >=app-shells/bash-4.0:0
- sys-apps/coreutils[xattr(-)]
- || (
- >=sys-apps/sysvinit-2.87-r3
- sys-apps/systemd[sysv-utils]
- )
- >=sys-apps/util-linux-2.21
-
- debug? ( dev-util/strace )
- selinux? (
- sec-policy/selinux-dracut
- sys-libs/libselinux
- sys-libs/libsepol
- )
- "
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75.2
- >=dev-libs/libxslt-1.1.26
- "
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-}
-
-src_install() {
- default
-
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
- # Preserve lib -> lib64 symlinks in initramfs
- libdirs+=( /lib /usr/lib )
- fi
-
- einfo "Setting libdirs to \"${libdirs[*]}\" ..."
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
- insinto "/usr/lib/dracut/dracut.conf.d"
- doins "${T}/gentoo.conf"
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \
- sys-apps/iproute2 "net-misc/iputils[arping]"
- optfeature \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
- app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-049-r3.ebuild b/sys-kernel/dracut/dracut-049-r3.ebuild
deleted file mode 100644
index 97d2e729b35..00000000000
--- a/sys-kernel/dracut/dracut-049-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
- SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
- app-arch/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/util-linux-2.21
- virtual/pkgconfig
- 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
-"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
- "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
- "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
- "${FILESDIR}"/049-network-manager-call-the-online-hook-for-connected-d.patch
- "${FILESDIR}"/049-install-dracut-install.c-install-module-dependencies.patch
- "${FILESDIR}"/049-install-string_hash_func-should-not-be-fed-with-NULL.patch
- "${FILESDIR}"/049-dracut.sh-Fix-udevdir-detection.patch
- "${FILESDIR}"/049-rngd-new-module-running-early-during-boot-to-help-ge.patch
- "${FILESDIR}"/049-fs-lib-drop-a-bashism.patch
- "${FILESDIR}"/049-network-manager-remove-useless-use-of-basename.patch
- "${FILESDIR}"/049-move-setting-the-systemdutildir-variable-before-it-s.patch
- "${FILESDIR}"/049-dracut-install-Support-the-compressed-firmware-files.patch
- "${FILESDIR}"/049-crypt-create-locking-directory-run-cryptsetup.patch
- "${FILESDIR}"/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch
- "${FILESDIR}"/049-configure-find-cflags-and-libs-for-fts-on-musl.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_install() {
- default
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
- optfeature \
- "Enable rngd service to help generating entropy early during boot" \
- sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/dracut-050-r1.ebuild b/sys-kernel/dracut/dracut-050-r1.ebuild
deleted file mode 100644
index 50c43bc6a86..00000000000
--- a/sys-kernel/dracut/dracut-050-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
- app-arch/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/util-linux-2.21
- virtual/pkgconfig
- 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
-"
-
-DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch
- "${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
- "${FILESDIR}"/050-Makefile-fix-VERSION-again.patch
- "${FILESDIR}"/050-busybox-module-fix.patch
- "${FILESDIR}"/050-gentoo-ldconfig-paths.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_install() {
- default
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
- optfeature \
- "Enable rngd service to help generating entropy early during boot" \
- sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/dracut-050.ebuild b/sys-kernel/dracut/dracut-050.ebuild
deleted file mode 100644
index 4c140a62789..00000000000
--- a/sys-kernel/dracut/dracut-050.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
- app-arch/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/util-linux-2.21
- virtual/pkgconfig
- 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
-"
-
-DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch
- "${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
- "${FILESDIR}"/050-Makefile-fix-VERSION-again.patch
- "${FILESDIR}"/050-gentoo-ldconfig-paths.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_install() {
- default
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- elog "To get additional features, a number of optional runtime"
- elog "dependencies may be installed:"
- elog ""
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
- optfeature \
- "Enable rngd service to help generating entropy early during boot" \
- sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch b/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch
deleted file mode 100644
index aa9c543fdce..00000000000
--- a/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6d886bb74d1608e4565d926aa259ea5afc9df7b9 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 4 Oct 2018 16:45:47 -0400
-Subject: [PATCH] dracut-install: simplify ldd parsing logic
-
-The previous logic would not handle absolute paths on the left side of
-the "=>" properly. For example, on Gentoo ARM64, ldd outputs this:
-
- /lib/ld-linux-aarch64.so.1 => /lib64/ld-linux-aarch64.so.1
-
-At runtime, the kernel tries to load the file from /lib, and fails if we
-only provide it in /lib64.
-
-Instead of looking for the first slash after the "=>", just look for the
-first slash, period. This would fail if we somehow had a relative path
-on the left side (foo/libbar.so), but I'm not aware of any binaries that
-would contain such an entry in DT_NEEDED.
-
-Bug: https://bugs.gentoo.org/667752
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- install/dracut-install.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 88bca1d44..5f352b360 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -479,11 +479,7 @@ static int resolve_deps(const char *src)
- if (strstr(buf, destrootdir))
- break;
-
-- p = strstr(buf, "=>");
-- if (!p)
-- p = buf;
--
-- p = strchr(p, '/');
-+ p = strchr(buf, '/');
- if (p) {
- char *q;
-
diff --git a/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch b/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch
deleted file mode 100644
index 0d537941f1d..00000000000
--- a/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 83cbc06ab91288e2d931b4f36935bfdb79a99b0e Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Fri, 12 Oct 2018 13:07:13 +0800
-Subject: [PATCH] 40network: Don't include 40network by default
-To: <initramfs@vger.kernel.org>
-
-commit 7347391 ('network-legacy: split off from network module')
-splitted network function to network-legacy and removed check() function
-of 40network. This caused 40network to be included even if network is
-not needed.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
----
- modules.d/40network/module-setup.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 57c0a45e..e8541636 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -1,5 +1,10 @@
- #!/bin/bash
-
-+# called by dracut
-+check() {
-+ return 255
-+}
-+
- # called by dracut
- depends() {
- echo -n "kernel-network-modules "
---
-2.19.2
-
diff --git a/sys-kernel/dracut/files/049-configure-find-cflags-and-libs-for-fts-on-musl.patch b/sys-kernel/dracut/files/049-configure-find-cflags-and-libs-for-fts-on-musl.patch
deleted file mode 100644
index cd74564adb5..00000000000
--- a/sys-kernel/dracut/files/049-configure-find-cflags-and-libs-for-fts-on-musl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 62f27ee6f145b5f8ca571887602cd9b0715b9e9d Mon Sep 17 00:00:00 2001
-From: Doan Tran Cong Danh <congdanhqx@gmail.com>
-Date: Wed, 6 Nov 2019 18:35:12 +0700
-Subject: [PATCH] configure: find cflags and libs for fts on musl
-To: <initramfs@vger.kernel.org>
-
-Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
----
- Makefile | 2 +-
- configure | 44 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 31545899..f9b42b96 100644
---- a/Makefile
-+++ b/Makefile
-@@ -62,7 +62,7 @@ install/util.o: install/util.c install/util.h install/macro.h install/log.h
- install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h
-
- install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
-- $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(FTS_LIBS) $(KMOD_LIBS)
-
- logtee: logtee.c
- $(CC) $(LDFLAGS) -o $@ $<
-diff --git a/configure b/configure
-index b55fb609..3f724ef2 100755
---- a/configure
-+++ b/configure
-@@ -7,6 +7,7 @@ prefix=/usr
-
- enable_documentation=yes
-
-+CC="${CC:-cc}"
- PKG_CONFIG="${PKG_CONFIG:-pkg-config}"
-
- # Little helper function for reading args from the commandline.
-@@ -57,6 +58,48 @@ if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 23 "; then
- exit 1
- fi
-
-+cat <<EOF >conftest.c
-+#include <fts.h>
-+int main() {
-+ return 0;
-+}
-+EOF
-+
-+${CC} $CFLAGS $LDFLAGS conftest.c >/dev/null 2>&1
-+ret=$?
-+rm -f conftest.c a.out
-+
-+# musl doesn't have fts.h included
-+if test $ret -ne 0; then
-+ echo "dracut needs fts development files." >&2
-+ exit 1
-+fi
-+
-+cat <<EOF >conftest.c
-+#include <fts.h>
-+int main(void) {
-+ fts_open(0, 0, 0);
-+ return 0;
-+}
-+EOF
-+
-+found=no
-+for lib in "-lc" "-lfts"; do
-+ ${CC} $CFLAGS -Wl,$lib $LDFLAGS conftest.c >/dev/null 2>&1
-+ ret=$?
-+ if test $ret -eq 0; then
-+ FTS_LIBS="$lib"
-+ found=yes
-+ break;
-+ fi
-+done
-+rm -f conftest.c a.out
-+
-+if test $found = no; then
-+ echo "dracut couldn't find usable fts library" >&2
-+ exit 1
-+fi
-+
- cat > Makefile.inc.$$ <<EOF
- prefix ?= ${prefix}
- libdir ?= ${libdir:-${prefix}/lib}
-@@ -68,6 +111,7 @@ enable_documentation ?= ${enable_documentation:-yes}
- bindir ?= ${bindir:-${prefix}/bin}
- KMOD_CFLAGS ?= $(${PKG_CONFIG} --cflags " libkmod >= 23 ")
- KMOD_LIBS ?= $(${PKG_CONFIG} --libs " libkmod >= 23 ")
-+FTS_LIBS ?= ${FTS_LIBS}
- EOF
-
- {
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-crypt-create-locking-directory-run-cryptsetup.patch b/sys-kernel/dracut/files/049-crypt-create-locking-directory-run-cryptsetup.patch
deleted file mode 100644
index be964c03746..00000000000
--- a/sys-kernel/dracut/files/049-crypt-create-locking-directory-run-cryptsetup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f39aa529c59c533ce5e75e31be1b0cce4513b3d7 Mon Sep 17 00:00:00 2001
-From: Jonas Witschel <diabonas@gmx.de>
-Date: Sat, 31 Aug 2019 17:45:11 +0200
-Subject: [PATCH] crypt: create locking directory /run/cryptsetup
-To: <initramfs@vger.kernel.org>
-
-For LUKS2 partitions cryptsetup needs a locking directory. If it does
-not exist, cryptsetup will create it, but produce a warning
-
-WARNING: Locking directory /run/cryptsetup is missing!
-
-in the process that we do not want to see in the dracut output.
----
- modules.d/90crypt/cryptroot-ask.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
-index 33a823c7..e1f17975 100755
---- a/modules.d/90crypt/cryptroot-ask.sh
-+++ b/modules.d/90crypt/cryptroot-ask.sh
-@@ -8,6 +8,8 @@ NEWROOT=${NEWROOT:-"/sysroot"}
-
- . /lib/dracut-lib.sh
-
-+mkdir -m 0700 /run/cryptsetup
-+
- # if device name is /dev/dm-X, convert to /dev/mapper/name
- if [ "${1##/dev/dm-}" != "$1" ]; then
- device="/dev/mapper/$(dmsetup info -c --noheadings -o name "$1")"
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-dracut-install-Support-the-compressed-firmware-files.patch b/sys-kernel/dracut/files/049-dracut-install-Support-the-compressed-firmware-files.patch
deleted file mode 100644
index 85c0ea09972..00000000000
--- a/sys-kernel/dracut/files/049-dracut-install-Support-the-compressed-firmware-files.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 999cfa84582ab4ce4cc602242cb71d0af0b7d4ac Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 22 Aug 2019 12:37:56 +0200
-Subject: [PATCH] dracut-install: Support the compressed firmware files
- correctly
-To: <initramfs@vger.kernel.org>
-
-The compressed firmware support was supposed to be already
-implemented, but it didn't work as expected in the end, because dracut
-moved to use dracut-install binary. This patch adds the support of
-XZ-compressed firmware installation to dracut-install for fixing the
-missing piece.
-
-At best the firmware files should be uncompressed in initrd, but this
-patch simply copies the compressed file as-is, as a quick workaround.
-
-BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1146769
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- install/dracut-install.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 9e415b5e..7cda499d 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -1151,6 +1151,8 @@ static int install_firmware(struct kmod_module *mod)
- ret = -1;
- STRV_FOREACH(q, firmwaredirs) {
- _cleanup_free_ char *fwpath = NULL;
-+ _cleanup_free_ char *fwpath_xz = NULL;
-+ const char *fw;
- struct stat sb;
- int r;
-
-@@ -1160,12 +1162,21 @@ static int install_firmware(struct kmod_module *mod)
- exit(EXIT_FAILURE);
- }
-
-+ fw = fwpath;
- if (stat(fwpath, &sb) != 0) {
-- log_debug("stat(%s) != 0", fwpath);
-- continue;
-+ r = asprintf(&fwpath_xz, "%s.xz", fwpath);
-+ if (r < 0) {
-+ log_error("Out of memory!");
-+ exit(EXIT_FAILURE);
-+ }
-+ if (stat(fwpath_xz, &sb) != 0) {
-+ log_debug("stat(%s) != 0", fwpath);
-+ continue;
-+ }
-+ fw = fwpath_xz;
- }
-
-- ret = dracut_install(fwpath, fwpath, false, false, true);
-+ ret = dracut_install(fw, fw, false, false, true);
- if (ret == 0)
- log_debug("dracut_install '%s' OK", fwpath);
- }
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-dracut.sh-Fix-udevdir-detection.patch b/sys-kernel/dracut/files/049-dracut.sh-Fix-udevdir-detection.patch
deleted file mode 100644
index ec7d4802370..00000000000
--- a/sys-kernel/dracut/files/049-dracut.sh-Fix-udevdir-detection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From dddcb809459b7a75906d4b90cf7a5ac291dc74c1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 3 Apr 2019 15:24:47 +0800
-Subject: [PATCH] dracut.sh: Fix udevdir detection
-To: <initramfs@vger.kernel.org>
-
-In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir
-fallback logic] , it checked a common binary `collect' to location
-udevdir.
-
-But upstream systemd drop binary `collect' since systemd v240
-[https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb]
-
-So check binary `ata_id' to instead.
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 9098571d..fd9903b6 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1311,8 +1311,8 @@ done
- [[ -d $udevdir ]] \
- || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
- if ! [[ -d "$udevdir" ]]; then
-- [[ -e /lib/udev/collect ]] && udevdir=/lib/udev
-- [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev
-+ [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev
-+ [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
- fi
-
- [[ -d $systemdutildir ]] \
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-fs-lib-drop-a-bashism.patch b/sys-kernel/dracut/files/049-fs-lib-drop-a-bashism.patch
deleted file mode 100644
index a44b8f31651..00000000000
--- a/sys-kernel/dracut/files/049-fs-lib-drop-a-bashism.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 43c8c4ce0471abbb8c0fc4b8be2515cebc636030 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Fri, 21 Jun 2019 18:39:48 +0200
-Subject: [PATCH] fs-lib: drop a bashism
-To: <initramfs@vger.kernel.org>
-
-Bash 5 apparently longer propagates variable assignments to local variables
-in front of function calls when in POSIX mode:
-
- [lkundrak@demiurge ~]$ cat feh.sh
- print_VAR () {
- echo "$VAR";
- }
-
- testfunc () {
- local VAR="OLD"
- VAR=NEW print_VAR
- }
-
- testfunc
- [lkundrak@demiurge ~]$ bash4 --posix feh.sh
- NEW
- [lkundrak@demiurge ~]$ bash5 --posix feh.sh
- OLD
- [lkundrak@demiurge ~]$ bash5 feh.sh
- NEW
- [lkundrak@demiurge ~]$
-
-It works the way it did in Bash 4 in non-POSIX mode, for external programs,
-or for non-local variables. Don't ask me why -- it's probably some
-compatibility thing for some sad old people.
-
-However, this precisely happens when fsck_single() is calling into the
-fsck_drv_com(), assigned to _drv by fsck_able(). That ruins the
-TEST-70-BONDBRIDGETEAMVLAN test's server and probably more.
-
-Let's pass the fsck driver binary via the function argument instead. It's
-less messy anyway.
----
- modules.d/99fs-lib/fs-lib.sh | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index d39ca1b7..11e795d9 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -44,22 +44,22 @@ fsck_able() {
- ;;
- ext?)
- type e2fsck >/dev/null 2>&1 &&
-- _drv="_drv=e2fsck fsck_drv_com" &&
-+ _drv="fsck_drv_com e2fsck" &&
- return 0
- ;;
- f2fs)
- type fsck.f2fs >/dev/null 2>&1 &&
-- _drv="_drv=fsck.f2fs fsck_drv_com" &&
-+ _drv="fsck_drv_com fsck.f2fs" &&
- return 0
- ;;
- jfs)
- type jfs_fsck >/dev/null 2>&1 &&
-- _drv="_drv=jfs_fsck fsck_drv_com" &&
-+ _drv="fsck_drv_com jfs_fsck" &&
- return 0
- ;;
- reiserfs)
- type reiserfsck >/dev/null 2>&1 &&
-- _drv="_drv=reiserfsck fsck_drv_com" &&
-+ _drv="fsck_drv_com reiserfsck" &&
- return 0
- ;;
- btrfs)
-@@ -70,12 +70,12 @@ fsck_able() {
- ;;
- nfs*)
- # nfs can be a nop, returning success
-- _drv="_drv=none :" &&
-+ _drv=":" &&
- return 0
- ;;
- *)
- type fsck >/dev/null 2>&1 &&
-- _drv="_drv=fsck fsck_drv_std" &&
-+ _drv="fsck_drv_std fsck" &&
- return 0
- ;;
- esac
-@@ -97,6 +97,7 @@ fsck_drv_btrfs() {
-
- # common code for checkers that follow usual subset of options and return codes
- fsck_drv_com() {
-+ local _drv="$1"
- local _ret
- local _out
-
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-install-dracut-install.c-install-module-dependencies.patch b/sys-kernel/dracut/files/049-install-dracut-install.c-install-module-dependencies.patch
deleted file mode 100644
index ec3e903765a..00000000000
--- a/sys-kernel/dracut/files/049-install-dracut-install.c-install-module-dependencies.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From c38f9e980c1ee03151dd1c6602907c6228b78d30 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 4 Dec 2018 10:02:45 +0100
-Subject: [PATCH] install/dracut-install.c: install module dependencies of
- dependencies
-To: <initramfs@vger.kernel.org>
-
----
- install/dracut-install.c | 28 +++++++++++++++++++++++++---
- 1 file changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index 5f352b36..d64de545 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -84,6 +84,11 @@ static bool arg_mod_filter_noname = false;
- static int dracut_install(const char *src, const char *dst, bool isdir, bool resolvedeps, bool hashdst);
-
-
-+static inline void kmod_module_unrefp(struct kmod_module **p) {
-+ if (*p)
-+ kmod_module_unref(*p);
-+}
-+#define _cleanup_kmod_module_unref_ _cleanup_(kmod_module_unrefp)
-
- static inline void kmod_module_unref_listp(struct kmod_list **p) {
- if (*p)
-@@ -1230,28 +1235,45 @@ static bool check_module_path(const char *path)
- static int install_dependent_modules(struct kmod_list *modlist)
- {
- struct kmod_list *itr;
-- struct kmod_module *mod;
- const char *path = NULL;
- const char *name = NULL;
- int ret = 0;
-
- kmod_list_foreach(itr, modlist) {
-+ _cleanup_kmod_module_unref_ struct kmod_module *mod = NULL;
- mod = kmod_module_get_module(itr);
- path = kmod_module_get_path(mod);
-
-+ if (check_hashmap(items_failed, path))
-+ return -1;
-+
-+ if (check_hashmap(items, path)) {
-+ continue;
-+ }
-+
- name = kmod_module_get_name(mod);
-+
- if ((path == NULL) || (arg_mod_filter_noname && (regexec(&mod_filter_noname, name, 0, NULL, 0) == 0))) {
-- kmod_module_unref(mod);
- continue;
- }
-+
- ret = dracut_install(path, &path[kerneldirlen], false, false, true);
- if (ret == 0) {
-+ _cleanup_kmod_module_unref_list_ struct kmod_list *modlist = NULL;
-+ _cleanup_kmod_module_unref_list_ struct kmod_list *modpre = NULL;
-+ _cleanup_kmod_module_unref_list_ struct kmod_list *modpost = NULL;
- log_debug("dracut_install '%s' '%s' OK", path, &path[kerneldirlen]);
- install_firmware(mod);
-+ modlist = kmod_module_get_dependencies(mod);
-+ ret = install_dependent_modules(modlist);
-+ if (ret == 0) {
-+ ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
-+ if (ret == 0)
-+ ret = install_dependent_modules(modpre);
-+ }
- } else {
- log_error("dracut_install '%s' '%s' ERROR", path, &path[kerneldirlen]);
- }
-- kmod_module_unref(mod);
- }
-
- return ret;
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-install-string_hash_func-should-not-be-fed-with-NULL.patch b/sys-kernel/dracut/files/049-install-string_hash_func-should-not-be-fed-with-NULL.patch
deleted file mode 100644
index 80f0c2b0186..00000000000
--- a/sys-kernel/dracut/files/049-install-string_hash_func-should-not-be-fed-with-NULL.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From fc141f22869bad2e5409d1cc555c1a42ea738343 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Thu, 14 Feb 2019 20:18:04 +0100
-Subject: [PATCH] install: string_hash_func should not be fed with NULL
-To: <initramfs@vger.kernel.org>
-
-If kmod_module_get_path returns NULL, we should skip that entry,
-the hash function does not like NULL pointers.
----
- install/dracut-install.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index d64de545..9e415b5e 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -1244,6 +1244,9 @@ static int install_dependent_modules(struct kmod_list *modlist)
- mod = kmod_module_get_module(itr);
- path = kmod_module_get_path(mod);
-
-+ if (path == NULL)
-+ continue;
-+
- if (check_hashmap(items_failed, path))
- return -1;
-
-@@ -1253,7 +1256,7 @@ static int install_dependent_modules(struct kmod_list *modlist)
-
- name = kmod_module_get_name(mod);
-
-- if ((path == NULL) || (arg_mod_filter_noname && (regexec(&mod_filter_noname, name, 0, NULL, 0) == 0))) {
-+ if (arg_mod_filter_noname && (regexec(&mod_filter_noname, name, 0, NULL, 0) == 0)) {
- continue;
- }
-
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-move-setting-the-systemdutildir-variable-before-it-s.patch b/sys-kernel/dracut/files/049-move-setting-the-systemdutildir-variable-before-it-s.patch
deleted file mode 100644
index 585f47add02..00000000000
--- a/sys-kernel/dracut/files/049-move-setting-the-systemdutildir-variable-before-it-s.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From c8b35bf96af1859c0c254db34a16b9cc5a2aa46b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?=
- =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
- <gdamjan@gmail.com>
-Date: Mon, 27 May 2019 18:22:14 +0200
-Subject: [PATCH] move setting the "systemdutildir" variable before it's used
-To: <initramfs@vger.kernel.org>
-
-on line 1086 it's used to check for the uefi_stub:
-"${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
-
-so it needs to be defined before that
----
- dracut.sh | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 183b892f..a3618f89 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1009,6 +1009,16 @@ esac
-
- abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
-
-+
-+[[ -d $systemdutildir ]] \
-+ || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
-+
-+if ! [[ -d "$systemdutildir" ]]; then
-+ [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
-+ [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
-+fi
-+
-+
- if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then
- if ! [[ -f $srcmods/modules.dep ]]; then
- if [[ -n "$(find "$srcmods" -name '*.ko*')" ]]; then
-@@ -1325,14 +1335,6 @@ if ! [[ -d "$udevdir" ]]; then
- [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
- fi
-
--[[ -d $systemdutildir ]] \
-- || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
--
--if ! [[ -d "$systemdutildir" ]]; then
-- [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
-- [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
--fi
--
- [[ -d $systemdsystemunitdir ]] \
- || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2>/dev/null)
-
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-network-manager-call-the-online-hook-for-connected-d.patch b/sys-kernel/dracut/files/049-network-manager-call-the-online-hook-for-connected-d.patch
deleted file mode 100644
index 7f5fc6a0385..00000000000
--- a/sys-kernel/dracut/files/049-network-manager-call-the-online-hook-for-connected-d.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 79a17b0112995eb60c85c64d15070c52f213b28d Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Tue, 27 Nov 2018 15:30:48 +0100
-Subject: [PATCH] network-manager: call the online hook for connected devices
-To: <initramfs@vger.kernel.org>
-
-Look for "connection-uuid" instead of "managed" to determine the devices
-that are actually activated with a connection and call the online hook.
-
-This fixes the anaconda-net root mount, which utilizes the online hook.
----
- modules.d/35network-manager/nm-run.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
-index f6defa99..0f943631 100755
---- a/modules.d/35network-manager/nm-run.sh
-+++ b/modules.d/35network-manager/nm-run.sh
-@@ -9,8 +9,9 @@ fi
- for _i in /sys/class/net/*/
- do
- state=/run/NetworkManager/devices/$(cat $_i/ifindex)
-- grep -q managed=true $state 2>/dev/null || continue
-+ grep -q connection-uuid= $state 2>/dev/null || continue
- ifname=$(basename $_i)
- sed -n 's/root-path/new_root_path/p' <$state >/tmp/dhclient.$ifname.dhcpopts
-+ source_hook initqueue/online $ifname
- /sbin/netroot $ifname
- done
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch b/sys-kernel/dracut/files/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch
deleted file mode 100644
index 430b93f93de..00000000000
--- a/sys-kernel/dracut/files/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 687e17aa7f2f40d21717be9a04302c749e139d4a Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 30 Oct 2019 19:25:51 +0100
-Subject: [PATCH] network-manager: fix getting of ifname from the sysfs path
-To: <initramfs@vger.kernel.org>
-
-commit 5e0f8c8a4ced ('network-manager: remove useless use of basename')
-somewhat carelessly didn't take into account that $_i has a slash at
-the end which made the result of the ## substitution be just an empty
-string.
-
-The slash was put to the end of /sys/class/net/*/ to make sure we're only
-iterating directories, but it's not strictly necessary. In an unlikely case
-something else than a directory appears in /sys/class/net/, we'll already deal
-with it gracefully. Remove it.
-
-This fixes the TEST-30-ISCSI test.
----
- modules.d/35network-manager/nm-run.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
-index a539d5b2..b33e0992 100755
---- a/modules.d/35network-manager/nm-run.sh
-+++ b/modules.d/35network-manager/nm-run.sh
-@@ -6,7 +6,7 @@ else
- /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
- fi
-
--for _i in /sys/class/net/*/
-+for _i in /sys/class/net/*
- do
- state=/run/NetworkManager/devices/$(cat $_i/ifindex)
- grep -q connection-uuid= $state 2>/dev/null || continue
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-network-manager-remove-useless-use-of-basename.patch b/sys-kernel/dracut/files/049-network-manager-remove-useless-use-of-basename.patch
deleted file mode 100644
index 1650c9a767e..00000000000
--- a/sys-kernel/dracut/files/049-network-manager-remove-useless-use-of-basename.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5e0f8c8a4ced36268d0077acafa1db2402776fa6 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 17 Jun 2019 10:07:38 +0200
-Subject: [PATCH] network-manager: remove useless use of basename
-To: <initramfs@vger.kernel.org>
-
----
- modules.d/35network-manager/nm-run.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
-index 0f943631..5f4b38ca 100755
---- a/modules.d/35network-manager/nm-run.sh
-+++ b/modules.d/35network-manager/nm-run.sh
-@@ -10,7 +10,7 @@ for _i in /sys/class/net/*/
- do
- state=/run/NetworkManager/devices/$(cat $_i/ifindex)
- grep -q connection-uuid= $state 2>/dev/null || continue
-- ifname=$(basename $_i)
-+ ifname=${_i##*/}
- sed -n 's/root-path/new_root_path/p' <$state >/tmp/dhclient.$ifname.dhcpopts
- source_hook initqueue/online $ifname
- /sbin/netroot $ifname
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch b/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch
deleted file mode 100644
index 93e3ed5bed8..00000000000
--- a/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 09d2a1605b1b2663e3c25f1d9950b23a2bf4ad89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sun, 6 Jan 2019 11:48:02 +0700
-Subject: [PATCH] remove bashism in various boot scripts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-To: <initramfs@vger.kernel.org>
-
-When using dash as initramfs shell, the boot process is broken.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- modules.d/90crypt/crypt-lib.sh | 2 +-
- modules.d/90crypt/parse-keydev.sh | 2 +-
- modules.d/91crypt-gpg/crypt-gpg-lib.sh | 2 +-
- modules.d/95dcssblk/parse-dcssblk.sh | 2 +-
- modules.d/98syslog/rsyslogd-start.sh | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
-index bbf485e0..688ea251 100755
---- a/modules.d/90crypt/crypt-lib.sh
-+++ b/modules.d/90crypt/crypt-lib.sh
-@@ -191,7 +191,7 @@ readkey() {
- local device="$3"
-
- # No mounting needed if the keyfile resides inside the initrd
-- if [ "/" == "$keydev" ]; then
-+ if [ "/" = "$keydev" ]; then
- local mntp=/
- else
- # This creates a unique single mountpoint for *, or several for explicitly
-diff --git a/modules.d/90crypt/parse-keydev.sh b/modules.d/90crypt/parse-keydev.sh
-index a45b2fb5..04813414 100755
---- a/modules.d/90crypt/parse-keydev.sh
-+++ b/modules.d/90crypt/parse-keydev.sh
-@@ -18,7 +18,7 @@ if getargbool 1 rd.luks -n rd_NO_LUKS && \
- fi
-
- # A keydev of '/' is treated as the initrd itself
-- if [ "/" == "$keydev" ]; then
-+ if [ "/" = "$keydev" ]; then
- [ -z "$luksdev" ] && luksdev='*'
- echo "$luksdev:$keydev:$keypath" >> /tmp/luks.keys
- continue
-diff --git a/modules.d/91crypt-gpg/crypt-gpg-lib.sh b/modules.d/91crypt-gpg/crypt-gpg-lib.sh
-index b85ed2b8..c051b430 100755
---- a/modules.d/91crypt-gpg/crypt-gpg-lib.sh
-+++ b/modules.d/91crypt-gpg/crypt-gpg-lib.sh
-@@ -53,7 +53,7 @@ gpg_decrypt() {
- --tries 3 --tty-echo-off
-
- # Clean up the smartcard gpg-agent
-- if [ "${useSmartcard}" == "1" ]; then
-+ if [ "${useSmartcard}" = "1" ]; then
- GNUPGHOME="$gpghome" gpg-connect-agent 1>/dev/null killagent /bye
- fi
-
-diff --git a/modules.d/95dcssblk/parse-dcssblk.sh b/modules.d/95dcssblk/parse-dcssblk.sh
-index 8f174408..27ac1d8d 100644
---- a/modules.d/95dcssblk/parse-dcssblk.sh
-+++ b/modules.d/95dcssblk/parse-dcssblk.sh
-@@ -2,7 +2,7 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- dcssblk_arg=$(getarg rd.dcssblk=)
--if [ $? == 0 ];then
-+if [ $? = 0 ];then
- info "Loading dcssblk segments=$dcssblk_arg"
- modprobe dcssblk segments=$dcssblk_arg
- fi
-diff --git a/modules.d/98syslog/rsyslogd-start.sh b/modules.d/98syslog/rsyslogd-start.sh
-index c64f2121..86ad50ea 100755
---- a/modules.d/98syslog/rsyslogd-start.sh
-+++ b/modules.d/98syslog/rsyslogd-start.sh
-@@ -38,7 +38,7 @@ rsyslog_config() {
- [ -f /tmp/syslog.conf ] && read conf < /tmp/syslog.conf
- [ -z "$conf" ] && conf="/etc/rsyslog.conf" && echo "$conf" > /tmp/syslog.conf
-
--if [ $type == "rsyslogd" ]; then
-+if [ $type = "rsyslogd" ]; then
- template=/etc/templates/rsyslog.conf
- if [ -n "$server" ]; then
- rsyslog_config "$server" "$template" "$filters" > $conf
---
-2.19.2
-
diff --git a/sys-kernel/dracut/files/049-rngd-new-module-running-early-during-boot-to-help-ge.patch b/sys-kernel/dracut/files/049-rngd-new-module-running-early-during-boot-to-help-ge.patch
deleted file mode 100644
index 5ea342df78a..00000000000
--- a/sys-kernel/dracut/files/049-rngd-new-module-running-early-during-boot-to-help-ge.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From adee5b97bc5418b6e357342bb3be20568668aa55 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
-Date: Thu, 11 Jul 2019 10:50:40 +0200
-Subject: [PATCH] rngd: new module running early during boot to help generating
- entropy when system's default entropy sources are poor (e.g. use of SSD disks
- or UEFI RNG not available)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-To: <initramfs@vger.kernel.org>
-
-On systems with low entropy at boot, the boot can take up to several
-hours, specially when NBDE is used (e.g. clevis) which makes use of
-the random number generator.
-
-Enabling rngd service at boot early, because dracut-initqueue runs,
-enables to initialize the random number generator in a couple of seconds
-instead of minutes or hours.
-
-Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
----
- modules.d/06rngd/module-setup.sh | 39 ++++++++++++++++++++++++++++++++
- modules.d/06rngd/rngd.service | 7 ++++++
- 2 files changed, 46 insertions(+)
- create mode 100644 modules.d/06rngd/module-setup.sh
- create mode 100644 modules.d/06rngd/rngd.service
-
-diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh
-new file mode 100644
-index 00000000..43d5c2d3
---- /dev/null
-+++ b/modules.d/06rngd/module-setup.sh
-@@ -0,0 +1,39 @@
-+#!/bin/bash
-+# vim: set tabstop=8 shiftwidth=4 softtabstop=4 expandtab smarttab colorcolumn=80:
-+#
-+# Copyright (c) 2019 Red Hat, Inc.
-+# Author: Renaud Métrich <rmetrich@redhat.com>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+depends() {
-+ echo systemd
-+ return 0
-+}
-+
-+check() {
-+ # if there's no rngd binary, no go.
-+ require_binaries rngd || return 1
-+
-+ return 0
-+}
-+
-+install() {
-+ inst rngd
-+ inst_simple "${moddir}/rngd.service" "${systemdsystemunitdir}/rngd.service"
-+ mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants"
-+ ln -rfs "${initdir}${systemdsystemunitdir}/rngd.service" \
-+ "${initdir}${systemdsystemunitdir}/sysinit.target.wants/rngd.service"
-+}
-diff --git a/modules.d/06rngd/rngd.service b/modules.d/06rngd/rngd.service
-new file mode 100644
-index 00000000..570fbedb
---- /dev/null
-+++ b/modules.d/06rngd/rngd.service
-@@ -0,0 +1,7 @@
-+[Unit]
-+Description=Hardware RNG Entropy Gatherer Daemon
-+DefaultDependencies=no
-+Before=systemd-udevd.service
-+
-+[Service]
-+ExecStart=/usr/sbin/rngd -f
---
-2.24.1
-
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
index a3674ec5f5e..39e56c08ac4 100644
--- a/sys-kernel/dracut/metadata.xml
+++ b/sys-kernel/dracut/metadata.xml
@@ -13,8 +13,4 @@
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
- <use>
- <flag name="debug">Module installing additional tools like strace, file
- editor, ssh and more</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2020-12-20 17:27 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2020-12-20 17:27 UTC (permalink / raw
To: gentoo-commits
commit: ba41bafca7f0dfb4420984b96775ebefe0e7406a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 17:26:50 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 17:27:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba41bafc
sys-kernel/dracut: apply patch to resolve error loading libgcc.so.1
Closes: https://bugs.gentoo.org/760249
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{dracut-051.ebuild => dracut-051-r1.ebuild} | 1 +
.../dracut/files/051-dracut.sh-move-ldconfig.patch | 60 ++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/sys-kernel/dracut/dracut-051.ebuild b/sys-kernel/dracut/dracut-051-r1.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-051.ebuild
rename to sys-kernel/dracut/dracut-051-r1.ebuild
index 69b97ddb7c4..60a9ba03892 100644
--- a/sys-kernel/dracut/dracut-051.ebuild
+++ b/sys-kernel/dracut/dracut-051-r1.ebuild
@@ -64,6 +64,7 @@ DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.module
QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
+ "${FILESDIR}"/051-dracut.sh-move-ldconfig.patch
"${FILESDIR}"/gentoo-ldconfig-paths.patch
)
diff --git a/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch b/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch
new file mode 100644
index 00000000000..d6d97f7bb94
--- /dev/null
+++ b/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch
@@ -0,0 +1,60 @@
+From 48258fae9fa58046d7d1a246ea3d821530180643 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Fri, 18 Dec 2020 00:01:32 +0300
+Subject: [PATCH] dracut.sh: Move ldconfig after library workaround
+
+This fixes boot failures when libgcc_s.so.1 is in a non-standard
+directory.
+
+Bug: https://bugs.gentoo.org/760249
+Fixes: de3cb0e3214c (dracut.sh: Move the library workaround after squash)
+---
+ dracut.sh | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 0f4648397..c6c361acc 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1724,20 +1724,6 @@ for ((i=0; i < ${#include_src[@]}; i++)); do
+ fi
+ done
+
+-if [[ $kernel_only != yes ]]; then
+- # make sure that library links are correct and up to date
+- for f in $dracutsysrootdir/etc/ld.so.conf $dracutsysrootdir/etc/ld.so.conf.d/*; do
+- [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
+- done
+- if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
+- if [[ $EUID = 0 ]]; then
+- derror "ldconfig exited ungracefully"
+- else
+- derror "ldconfig might need uid=0 (root) for chroot()"
+- fi
+- fi
+-fi
+-
+ if [[ $do_hardlink = yes ]] && command -v hardlink >/dev/null; then
+ dinfo "*** Hardlinking files ***"
+ hardlink "$initdir" 2>&1
+@@ -1920,6 +1906,20 @@ if [[ $kernel_only != yes ]]; then
+ fi
+ fi
+
++if [[ $kernel_only != yes ]]; then
++ # make sure that library links are correct and up to date
++ for f in $dracutsysrootdir/etc/ld.so.conf $dracutsysrootdir/etc/ld.so.conf.d/*; do
++ [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
++ done
++ if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
++ if [[ $EUID = 0 ]]; then
++ derror "ldconfig exited ungracefully"
++ else
++ derror "ldconfig might need uid=0 (root) for chroot()"
++ fi
++ fi
++fi
++
+ if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
+ dinfo "*** Stripping files ***"
+ find "$initdir" -type f \
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2021-06-17 15:02 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2021-06-17 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 1e5c3786ee37ebca4e26bc2df7ce32541a46146a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 15:01:51 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 15:01:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5c3786
sys-kernel/dracut: backport fix for Network Manager
Closes: https://bugs.gentoo.org/775671
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{dracut-053.ebuild => dracut-053-r1.ebuild} | 1 +
sys-kernel/dracut/files/053-network-manager.patch | 24 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/sys-kernel/dracut/dracut-053.ebuild b/sys-kernel/dracut/dracut-053-r1.ebuild
similarity index 99%
rename from sys-kernel/dracut/dracut-053.ebuild
rename to sys-kernel/dracut/dracut-053-r1.ebuild
index 670c8599df8..aabffa07bfb 100644
--- a/sys-kernel/dracut/dracut-053.ebuild
+++ b/sys-kernel/dracut/dracut-053-r1.ebuild
@@ -63,6 +63,7 @@ DOCS=( AUTHORS README.md README.generic README.kernel )
QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
+ "${FILESDIR}"/053-network-manager.patch
"${FILESDIR}"/gentoo-ldconfig-paths.patch
)
diff --git a/sys-kernel/dracut/files/053-network-manager.patch b/sys-kernel/dracut/files/053-network-manager.patch
new file mode 100644
index 00000000000..c3b337733b7
--- /dev/null
+++ b/sys-kernel/dracut/files/053-network-manager.patch
@@ -0,0 +1,24 @@
+From ba4bcf5f4f11ad624c647ddf4f566997186135e7 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 31 Mar 2021 16:11:41 +0200
+Subject: [PATCH] fix(network-manager): no default deps for nm-run.service
+
+Otherwise nm-run.service will run only in basic.target, which is too
+late in the initramfs.
+---
+ modules.d/35network-manager/nm-run.service | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules.d/35network-manager/nm-run.service b/modules.d/35network-manager/nm-run.service
+index 63fe7564d0..f3493c41a3 100644
+--- a/modules.d/35network-manager/nm-run.service
++++ b/modules.d/35network-manager/nm-run.service
+@@ -2,6 +2,8 @@
+ # SPDX-License-Identifier: GPL-2.0-or-later
+
+ [Unit]
++DefaultDependencies=no
++
+ #make sure all devices showed up
+ Wants=systemd-udev-settle.service
+ After=systemd-udev-settle.service
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2021-07-23 19:16 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2021-07-23 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 87385084a1b4dbbfd193713515de8c6213075970
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 19:16:04 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 19:16:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87385084
sys-kernel/dracut: drop 050-r2, 051-r1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/Manifest | 2 -
sys-kernel/dracut/dracut-050-r2.ebuild | 168 --------------
sys-kernel/dracut/dracut-051-r1.ebuild | 160 --------------
.../files/050-Makefile-fix-VERSION-again.patch | 34 ---
...erge-main-version-and-git-version-earlier.patch | 78 -------
.../050-btrfs-force-preload-btrfs-module.patch | 30 ---
.../dracut/files/050-busybox-module-fix.patch | 102 ---------
...sh-quote-variables-in-parameter-expansion.patch | 111 ----------
...on-t-call-fsfreeze-on-subvol-of-root-file.patch | 75 -------
...lvm-fix-removal-of-pvscan-from-udev-rules.patch | 26 ---
...ager-ensure-that-nm-run.sh-is-executed-wh.patch | 48 ----
...-systemd-remove-obsolete-syslog-parameter.patch | 241 ---------------------
.../dracut/files/051-dracut.sh-move-ldconfig.patch | 60 -----
13 files changed, 1135 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 6aa82815479..e4058c6c0c5 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,4 +1,2 @@
-DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850
-DIST dracut-051.tar.xz 346500 BLAKE2B 38129b6b713b3338bbb2554fffd611f80216969eebac9fca7fb72df2db2036d4fbe66ebd54e646e562e24801e61064e54b62f066bab9e77ca88814100ebdd8ff SHA512 f3533430e479bc91c538e0a198ca97450ec449a7d661d876ecd0ad3e417e22f7e4abf0a384fc676a63a4d3479f25d717c8acdcd1bdec7d0a5714298c5c4ea6b8
DIST dracut-053.tar.xz 354668 BLAKE2B d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3 SHA512 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a
DIST dracut-055.tar.xz 361752 BLAKE2B 9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680 SHA512 2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866
diff --git a/sys-kernel/dracut/dracut-050-r2.ebuild b/sys-kernel/dracut/dracut-050-r2.ebuild
deleted file mode 100644
index 4eb3b1db06d..00000000000
--- a/sys-kernel/dracut/dracut-050-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
- app-arch/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/util-linux-2.21
- virtual/pkgconfig
- 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
-"
-
-DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch
- "${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
- "${FILESDIR}"/050-Makefile-fix-VERSION-again.patch
- "${FILESDIR}"/050-btrfs-force-preload-btrfs-module.patch
- "${FILESDIR}"/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
- "${FILESDIR}"/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
- "${FILESDIR}"/050-busybox-module-fix.patch
- "${FILESDIR}"/050-systemd-remove-obsolete-syslog-parameter.patch
- "${FILESDIR}"/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
- "${FILESDIR}"/gentoo-ldconfig-paths.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_install() {
- default
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
- optfeature \
- "Enable rngd service to help generating entropy early during boot" \
- sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/dracut-051-r1.ebuild b/sys-kernel/dracut/dracut-051-r1.ebuild
deleted file mode 100644
index 4c6865f5577..00000000000
--- a/sys-kernel/dracut/dracut-051-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
- app-arch/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/util-linux-2.21
- virtual/pkgconfig
- 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
-"
-
-DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules
- README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/051-dracut.sh-move-ldconfig.patch
- "${FILESDIR}"/gentoo-ldconfig-paths.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_install() {
- default
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
- optfeature \
- "Enable rngd service to help generating entropy early during boot" \
- sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch b/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch
deleted file mode 100644
index a091e4c9fac..00000000000
--- a/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a76aa8e39016a8564adb0f18f93bbf2e15d3243f Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Sun, 8 Mar 2020 05:47:50 +0300
-Subject: [PATCH] Makefile: fix VERSION again
-
-The variable is not undefined anymore after the first assignment, so
-we should check if variable is empty instead.
----
- Makefile | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c69e2dfc..02e2c4b5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,13 @@
- -include dracut-version.sh
-
- DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
--DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
-+ifeq ($(DRACUT_MAIN_VERSION),)
-+DRACUT_MAIN_VERSION = $(DRACUT_VERSION)
-+endif
- DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
--DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
-+ifeq ($(DRACUT_FULL_VERSION),)
-+DRACUT_FULL_VERSION = $(DRACUT_VERSION)
-+endif
-
- -include Makefile.inc
-
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch b/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch
deleted file mode 100644
index 49c532b9299..00000000000
--- a/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From eb8a7a96351b6e1cfd9dc34f1e854333a8f4a4e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Fri, 6 Mar 2020 08:46:36 +0700
-Subject: [PATCH] Makefile: merge main-version and git-version earlier
-
-With GNU Make 4.3 on both ArchLinux, and VoidLinux,
-GITVERION is always empty because of bad substitution.
-Change '\#' to simply '#' can fix it,
-but we don't need that complation.
-
-We can merge DRACUT_MAIN_VERSION and GITVERSION into DRACUT_FULL_VERSION.
-Because, GITVERSION will be attached back to DRACUT_MAIN_VERSION in all
-situation.
-
-While we're at it, detect if we're in git worktree by:
-limiting GIT_CEILING_DIRECTORIES to parent directory of
-dracut's top level directory; instead of checking for .git directory,
-in order to support git-worktree, in such case, .git will be a file, see
-gitrepository-layout(5)
----
- Makefile | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 22b584f1..c69e2dfc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,9 @@
- -include dracut-version.sh
-
--DRACUT_MAIN_VERSION ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags --always 2>/dev/null || :)
-+DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
- DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
--GITVERSION ?= $(shell [ -d .git ] && { v=$$(git describe --tags --always 2>/dev/null); [ -n "$$v" ] && [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
-+DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
-+DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
-
- -include Makefile.inc
-
-@@ -92,14 +93,14 @@ endif
-
- %.xml: %.asc
- @rm -f -- "$@"
-- asciidoc -a "version=$(DRACUT_MAIN_VERSION)$(GITVERSION)" -d manpage -b docbook -o "$@" $<
-+ asciidoc -a "version=$(DRACUT_FULL_VERSION)" -d manpage -b docbook -o "$@" $<
-
- dracut.8: dracut.usage.asc dracut.8.asc
-
- dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
- @rm -f -- dracut.xml
- asciidoc -a "mainversion=$(DRACUT_MAIN_VERSION)" \
-- -a "version=$(DRACUT_MAIN_VERSION)$(GITVERSION)" \
-+ -a "version=$(DRACUT_FULL_VERSION)" \
- -a numbered \
- -d book -b docbook -o dracut.xml dracut.asc
- @rm -f -- dracut.html
-@@ -112,7 +113,7 @@ dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
- dracut.pc: Makefile.inc Makefile
- @echo "Name: dracut" > dracut.pc
- @echo "Description: dracut" >> dracut.pc
-- @echo "Version: $(DRACUT_MAIN_VERSION)$(GITVERSION)" >> dracut.pc
-+ @echo "Version: $(DRACUT_FULL_VERSION)" >> dracut.pc
- @echo "dracutdir=$(pkglibdir)" >> dracut.pc
- @echo "dracutmodulesdir=$(pkglibdir)/modules.d" >> dracut.pc
- @echo "dracutconfdir=$(pkglibdir)/dracut.conf.d" >> dracut.pc
-@@ -182,7 +183,7 @@ endif
-
- dracut-version.sh:
- @rm -f dracut-version.sh
-- @echo "DRACUT_VERSION=$(DRACUT_MAIN_VERSION)$(GITVERSION)" > dracut-version.sh
-+ @echo "DRACUT_VERSION=$(DRACUT_FULL_VERSION)" > dracut-version.sh
-
- clean:
- $(RM) *~
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch b/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch
deleted file mode 100644
index 386722c2ae8..00000000000
--- a/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0402b3777b1c64bd716f588ff7457b905e98489d Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 11 Mar 2020 12:56:52 +0100
-Subject: [PATCH] btrfs: force preload btrfs module
-
-fixes https://github.com/dracutdevs/dracut/issues/658
-
-raid6_pq and xor takes time doing benchmarking
-
-[ 3.983009] request_module fs-btrfs succeeded, but still no fs?
----
- modules.d/90btrfs/module-setup.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
-index b0d0058b..66a254e1 100755
---- a/modules.d/90btrfs/module-setup.sh
-+++ b/modules.d/90btrfs/module-setup.sh
-@@ -48,5 +48,7 @@ install() {
-
- inst_multiple -o btrfsck btrfs-zero-log
- inst $(command -v btrfs) /sbin/btrfs
-+ # Hack for slow machines
-+ # see https://github.com/dracutdevs/dracut/issues/658
-+ echo "rd.driver.pre=btrfs" > ${initdir}/etc/cmdline.d/00-btrfs.conf
- }
--
---
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-busybox-module-fix.patch b/sys-kernel/dracut/files/050-busybox-module-fix.patch
deleted file mode 100644
index faaf026e536..00000000000
--- a/sys-kernel/dracut/files/050-busybox-module-fix.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From f769154bccf22d2b5caf5e4888f88bf7edde2662 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 25 May 2020 19:02:05 +0300
-Subject: [PATCH 1/2] dracut-functions: fix find_binary() to return full path
-
-Fixes: a01204202b30 (Allow running on a cross-compiled rootfs)
----
- dracut-functions.sh | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 3cb9c7af..b5c28248 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -41,31 +41,36 @@ str_ends() { [ "${1%*"$2"}" != "$1" ]; }
- # search in the usual places to find the binary.
- find_binary() {
- local _delim
-+ local _path
- local l
- local p
- [[ -z ${1##/*} ]] || _delim="/"
-
- if [[ "$1" == *.so* ]]; then
- for l in libdirs ; do
-- if { $DRACUT_LDD "$dracutsysrootdir$l$_delim$1" &>/dev/null; }; then
-- printf "%s\n" "$1"
-+ _path="${l}${_delim}${1}"
-+ if { $DRACUT_LDD "${dracutsysrootdir}${_path}" &>/dev/null; }; then
-+ printf "%s\n" "${_path}"
- return 0
- fi
- done
-- if { $DRACUT_LDD "$dracutsysrootdir$_delim$1" &>/dev/null; }; then
-- printf "%s\n" "$1"
-+ _path="${_delim}${1}"
-+ if { $DRACUT_LDD "${dracutsysrootdir}${_path}" &>/dev/null; }; then
-+ printf "%s\n" "${_path}"
- return 0
- fi
- fi
- if [[ "$1" == */* ]]; then
-- if [[ -L $dracutsysrootdir$_delim$1 ]] || [[ -x $dracutsysrootdir$_delim$1 ]]; then
-- printf "%s\n" "$1"
-+ _path="${_delim}${1}"
-+ if [[ -L ${dracutsysrootdir}${_path} ]] || [[ -x ${dracutsysrootdir}${_path} ]]; then
-+ printf "%s\n" "${_path}"
- return 0
- fi
- fi
- for p in $DRACUT_PATH ; do
-- if [[ -L $dracutsysrootdir$p$_delim$1 ]] || [[ -x $dracutsysrootdir$p$_delim$1 ]]; then
-- printf "%s\n" "$1"
-+ _path="${p}${_delim}${1}"
-+ if [[ -L ${dracutsysrootdir}${_path} ]] || [[ -x ${dracutsysrootdir}${_path} ]]; then
-+ printf "%s\n" "${_path}"
- return 0
- fi
- done
---
-2.26.2
-
-From 50cc23ba32b0fda63eff7623b529dbeb4e6a38c6 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 25 May 2020 17:49:20 +0300
-Subject: [PATCH 2/2] busybox: simplify listing of supported utilities
-
-'--list' option is supported since busybox-1.20.0, which was released
-in 2010.
----
- modules.d/05busybox/module-setup.sh | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/modules.d/05busybox/module-setup.sh b/modules.d/05busybox/module-setup.sh
-index ecbd6a13..5d88c5d1 100755
---- a/modules.d/05busybox/module-setup.sh
-+++ b/modules.d/05busybox/module-setup.sh
-@@ -14,15 +14,16 @@ depends() {
-
- # called by dracut
- install() {
-- local _i _progs _path _busybox
-+ local _i _path _busybox
-+ local _progs=()
- _busybox=$(type -P busybox)
- inst $_busybox /usr/bin/busybox
-- for _i in $($_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}')
-- do
-- _progs="$_progs $_i"
-+ for _i in $($_busybox --list); do
-+ [[ ${_i} == busybox ]] && continue
-+ _progs+=("${_i}")
- done
-
-- for _i in $_progs; do
-+ for _i in "${_progs[@]}"; do
- _path=$(find_binary "$_i")
- [ -z "$_path" ] && continue
- ln_r /usr/bin/busybox $_path
---
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch b/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
deleted file mode 100644
index 11ca7add6d6..00000000000
--- a/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 8e1a4dc5f8a777fc718db490414ffdc9dc755f66 Mon Sep 17 00:00:00 2001
-From: Jonas Witschel <diabonas@archlinux.org>
-Date: Sat, 18 Apr 2020 14:55:41 +0200
-Subject: [PATCH] dracut-lib.sh: quote variables in parameter expansion
- patterns
-
-According to POSIX.1-2017, 2.6.2 Parameter Expansion:
-
-${parameter%[word]} [...] The word shall be expanded to produce a
-pattern.
-
-This means if word contains variables that itself contain special
-characters like asterisks or backslashes, these are treated as pattern
-characters unless the variable is quoted. Try e.g. the following example
-in bash, dash or (busybox) ash:
-
-i='a\c'; j='\'; echo "${i%$j*}"
-
-This prints "a\c" because "$j*" is expanded to "\*", escaping the
-asterisk. In contrast,
-
-i='a\c'; j='\'; echo "${i%"$j"*}"
-
-produces the expected result "a" because the backslash is not specially
-treated any more after quoting.
-
-The quotes that this commit adds have been previously removed in commit
-f9c96cf56fed390841eac05c43826e62014c9188, citing issues with busybox
-hush without further specifying the actual error. I tested a recent
-busybox build (upstream commit 9aa751b08ab03d6396f86c3df77937a19687981b)
-and couldn't find any problems. Note that the above example always
-produces "a\c" in hush regardless of quoting $j, making hush unsuitable
-for use with dracut, but using quotes in parameter expansions generally
-works.
-
-The unquoted variables break the "rd.luks.uuid/name" kernel command line
-options in dracut 050 because
-
-str_replace "$luksname" '\' '\\'
-
-in modules.d/90crypt/parse-crypt.sh is not able to escape the
-backslashes any more, see GH-723, GH-727: backslashes in the
-systemd-cryptsetup@.service unit name stay unescaped for use in udev
-(cf. commit 0f6d93eb9d63695a64002ec8b0421fbc9fc8a7a3), leading to
-failures in starting the unit.
-
-This partially reverts commit f9c96cf56fed390841eac05c43826e62014c9188.
----
- modules.d/99base/dracut-lib.sh | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index c53cd13b..c57523d3 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -24,7 +24,7 @@ debug_on() {
-
- # returns OK if $1 contains literal string $2 (and isn't empty)
- strstr() {
-- [ "${1##*$2*}" != "$1" ]
-+ [ "${1##*"$2"*}" != "$1" ]
- }
-
- # returns OK if $1 matches (completely) glob pattern $2
-@@ -43,18 +43,18 @@ strglobin() {
-
- # returns OK if $1 contains literal string $2 at the beginning, and isn't empty
- str_starts() {
-- [ "${1#$2*}" != "$1" ]
-+ [ "${1#"$2"*}" != "$1" ]
- }
-
- # returns OK if $1 contains literal string $2 at the end, and isn't empty
- str_ends() {
-- [ "${1%*$2}" != "$1" ]
-+ [ "${1%*"$2"}" != "$1" ]
- }
-
- trim() {
- local var="$*"
-- var="${var#${var%%[![:space:]]*}}" # remove leading whitespace characters
-- var="${var%${var##*[![:space:]]}}" # remove trailing whitespace characters
-+ var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
-+ var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
- printf "%s" "$var"
- }
-
-@@ -108,9 +108,9 @@ str_replace() {
- local out=''
-
- while strstr "${in}" "$s"; do
-- chop="${in%%$s*}"
-+ chop="${in%%"$s"*}"
- out="${out}${chop}$r"
-- in="${in#*$s}"
-+ in="${in#*"$s"}"
- done
- echo "${out}${in}"
- }
-@@ -396,7 +396,7 @@ splitsep() {
- while [ -n "$str" -a "$#" -gt 1 ]; do
- tmp="${str%%$sep*}"
- eval "$1='${tmp}'"
-- str="${str#$tmp}"
-+ str="${str#"$tmp"}"
- str="${str#$sep}"
- shift
- done
---
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch b/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
deleted file mode 100644
index cf54cabb5eb..00000000000
--- a/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 0386e4627779cb51f4292b3c642d90586d5e71b4 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck@suse.com>
-Date: Wed, 29 Jan 2020 23:53:29 +0100
-Subject: [PATCH] dracut.sh: don't call fsfreeze on subvol of root file system
-
-dracut.sh already doesn't call fsfreeze if the output file is on
-the root file system. For btrfs, however, this is not sufficient.
-Because fsfreeze is a superblock operation, and all btrfs subvolumes
-share the same superblock, fsfreeze may freeze the entire system
-if the subvolume on which the output file is written and / are
-subvolumes of the same file system. Avoid this by comparing file
-system UUIDs for btrfs.
-
-Fixes: de576db3c225 ("call fsfreeze(8) on /boot to flush initramfs data & metadata to media")
----
- dracut.sh | 36 +++++++++++++++++++++++++++++++++++-
- 1 file changed, 35 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index af346f3a..c14f6c0b 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2075,6 +2075,40 @@ fi
-
- command -v restorecon &>/dev/null && restorecon -- "$outfile"
-
-+btrfs_uuid() {
-+ btrfs filesystem show "$1" | sed -n '1s/^.*uuid: //p'
-+}
-+
-+freeze_ok_for_btrfs() {
-+ local mnt uuid1 uuid2
-+ # If the output file is on btrfs, we need to make sure that it's
-+ # not on a subvolume of the same file system as the root FS.
-+ # Otherwise, fsfreeze() might freeze the entire system.
-+ # This is most conveniently checked by comparing the FS uuid.
-+
-+ [[ "$(stat -f -c %T -- "/")" == "btrfs" ]] || return 0
-+ mnt=$(stat -c %m -- "$1")
-+ uuid1=$(btrfs_uuid "$mnt")
-+ uuid2=$(btrfs_uuid "/")
-+ [[ "$uuid1" && "$uuid2" && "$uuid1" != "$uuid2" ]]
-+}
-+
-+freeze_ok_for_fstype() {
-+ local outfile=$1
-+ local fstype
-+
-+ [[ "$(stat -c %m -- "$outfile")" == "/" ]] && return 1
-+ fstype=$(stat -f -c %T -- "$outfile")
-+ case $fstype in
-+ msdos)
-+ return 1;;
-+ btrfs)
-+ freeze_ok_for_btrfs "$outfile";;
-+ *)
-+ return 0;;
-+ esac
-+}
-+
- # We sync/fsfreeze only if we're operating on a live booted system.
- # It's possible for e.g. `kernel` to be installed as an RPM BuildRequires or equivalent,
- # and there's no reason to sync, and *definitely* no reason to fsfreeze.
-@@ -2087,7 +2121,7 @@ if test -d $dracutsysrootdir/run/systemd/system; then
- fi
-
- # use fsfreeze only if we're not writing to /
-- if [[ "$(stat -c %m -- "$outfile")" != "/" && "$(stat -f -c %T -- "$outfile")" != "msdos" ]]; then
-+ if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
- if ! $(fsfreeze -f $(dirname "$outfile") 2>/dev/null && fsfreeze -u $(dirname "$outfile") 2>/dev/null); then
- dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")"
- fi
---
-2.24.1
-
diff --git a/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch b/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
deleted file mode 100644
index 8b93afc358e..00000000000
--- a/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 07417b7fc5cb261187519c916e4735189f20f4c6 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Sat, 23 May 2020 18:03:47 +0300
-Subject: [PATCH] lvm: fix removal of pvscan from udev rules
-
-udev rules provided by lvm 2.02.128 and newer uses '+=' instead of '='.
----
- modules.d/90lvm/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index d6d2c185..52c803f7 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -101,7 +101,7 @@ install() {
- sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' \
- ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
- sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
-- sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
-+ sed -i -e 's/^ENV{SYSTEMD_WANTS}+\?=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
- else
- sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' \
- ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
---
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch b/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
deleted file mode 100644
index d97193c9b13..00000000000
--- a/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3dcaa97ca4dcfa8092252a22df62c60941e59ce3 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Wed, 11 Mar 2020 09:40:50 +0100
-Subject: [PATCH] network-manager: ensure that nm-run.sh is executed when
- needed
-
-The network-manager command line hook must install a
-initqueue/finished hook to ensure that nm-run.sh is executed when
-there are network connections to activate.
-
-Fixes: #694
----
- modules.d/35network-manager/nm-config.sh | 11 +++++++++++
- modules.d/35network-manager/nm-run.sh | 2 ++
- 2 files changed, 13 insertions(+)
-
-diff --git a/modules.d/35network-manager/nm-config.sh b/modules.d/35network-manager/nm-config.sh
-index 1efa737c..39a1c8bd 100755
---- a/modules.d/35network-manager/nm-config.sh
-+++ b/modules.d/35network-manager/nm-config.sh
-@@ -5,3 +5,14 @@ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
- fi
-
- /usr/libexec/nm-initrd-generator -- $(getcmdline)
-+
-+if getargbool 0 rd.neednet; then
-+ for i in /usr/lib/NetworkManager/system-connections/* \
-+ /run/NetworkManager/system-connections/* \
-+ /etc/NetworkManager/system-connections/* \
-+ /etc/sysconfig/network-scripts/ifcfg-*; do
-+ [ -f "$i" ] || continue
-+ echo '[ -f /tmp/nm.done ]' >$hookdir/initqueue/finished/nm.sh
-+ break
-+ done
-+fi
-diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
-index 4079b735..fc5280a1 100755
---- a/modules.d/35network-manager/nm-run.sh
-+++ b/modules.d/35network-manager/nm-run.sh
-@@ -22,3 +22,5 @@ do
- source_hook initqueue/online $ifname
- /sbin/netroot $ifname
- done
-+
-+> /tmp/nm.done
---
-2.26.2
-
diff --git a/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch b/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch
deleted file mode 100644
index f24cf11b37b..00000000000
--- a/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 265f696b532f63f0ac1f9f341e0469a6eafe2fdd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:26:00 +0000
-Subject: [PATCH 01/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/90stratis/stratisd-init.service | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/modules.d/90stratis/stratisd-init.service b/modules.d/90stratis/stratisd-init.service
-index 318e8c27..1be2e33b 100644
---- a/modules.d/90stratis/stratisd-init.service
-+++ b/modules.d/90stratis/stratisd-init.service
-@@ -8,8 +8,6 @@ DefaultDependencies=no
- Type=simple
- ExecStart=/sbin/stratisd-init --debug
- KillSignal=SIGINT
--StandardOutput=syslog
--StandardError=syslog
-
- [Install]
- WantedBy=sysinit.target
---
-2.26.2
-
-From 38ba90bf88b38228e128c65be40a2da287c0b1ed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:29:34 +0000
-Subject: [PATCH 02/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/99squash/squash-mnt-clear.service | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/99squash/squash-mnt-clear.service b/modules.d/99squash/squash-mnt-clear.service
-index 84441f60..9d94c524 100644
---- a/modules.d/99squash/squash-mnt-clear.service
-+++ b/modules.d/99squash/squash-mnt-clear.service
-@@ -12,6 +12,6 @@ ConditionPathExists=/squash/root
- Type=oneshot
- RemainAfterExit=no
- StandardInput=null
--StandardOutput=syslog+console
--StandardError=syslog+console
-+StandardOutput=journal+console
-+StandardError=journal+console
- ExecStart=/squash/clear-squash.sh
---
-2.26.2
-
-From 5cb2a4004d18e4b96ddc18f221fae922350a9000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:31:17 +0000
-Subject: [PATCH 03/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-pre-trigger.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-pre-trigger.service b/modules.d/98dracut-systemd/dracut-pre-trigger.service
-index 7bf16167..6f1ba521 100644
---- a/modules.d/98dracut-systemd/dracut-pre-trigger.service
-+++ b/modules.d/98dracut-systemd/dracut-pre-trigger.service
-@@ -20,8 +20,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-trigger
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
-
---
-2.26.2
-
-From 317d841c788e841d3533515ceda5597a099eb64e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:31:59 +0000
-Subject: [PATCH 04/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-initqueue.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service
-index 207d545d..3a8679a5 100644
---- a/modules.d/98dracut-systemd/dracut-initqueue.service
-+++ b/modules.d/98dracut-systemd/dracut-initqueue.service
-@@ -21,8 +21,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-initqueue
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
-
---
-2.26.2
-
-From 0c1bd016ecfb9c6d194c4356199b509d90db4071 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:32:44 +0000
-Subject: [PATCH 05/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-pre-pivot.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.service b/modules.d/98dracut-systemd/dracut-pre-pivot.service
-index 9a1f0854..e893d1dd 100644
---- a/modules.d/98dracut-systemd/dracut-pre-pivot.service
-+++ b/modules.d/98dracut-systemd/dracut-pre-pivot.service
-@@ -27,8 +27,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-pivot
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
-
---
-2.26.2
-
-From e1130a83405648777210fdc99f7eee087eebaadc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:33:33 +0000
-Subject: [PATCH 06/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-pre-udev.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service
-index 570ec02d..e4092e35 100644
---- a/modules.d/98dracut-systemd/dracut-pre-udev.service
-+++ b/modules.d/98dracut-systemd/dracut-pre-udev.service
-@@ -24,8 +24,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-udev
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
-
---
-2.26.2
-
-From c437933cb0490e800e776cb7695d2ea0e95056a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:34:17 +0000
-Subject: [PATCH 07/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-pre-mount.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-pre-mount.service b/modules.d/98dracut-systemd/dracut-pre-mount.service
-index d3909689..18c9730c 100644
---- a/modules.d/98dracut-systemd/dracut-pre-mount.service
-+++ b/modules.d/98dracut-systemd/dracut-pre-mount.service
-@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-pre-mount
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
-
---
-2.26.2
-
-From d9149c6ca7c52c204c1b346e9b6a32bbadd0b2ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:35:02 +0000
-Subject: [PATCH 08/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-cmdline.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-cmdline.service b/modules.d/98dracut-systemd/dracut-cmdline.service
-index e577ec88..a8078bd2 100644
---- a/modules.d/98dracut-systemd/dracut-cmdline.service
-+++ b/modules.d/98dracut-systemd/dracut-cmdline.service
-@@ -23,8 +23,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-cmdline
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
-
---
-2.26.2
-
-From 8cb5ac1b30be458df9497911ba601d90e68f4d5b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Wed, 15 Jul 2020 14:35:38 +0000
-Subject: [PATCH 09/10] As of v246 of systemd "syslog" and "syslog-console"
- switches have been deprecated
-
----
- modules.d/98dracut-systemd/dracut-mount.service | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/modules.d/98dracut-systemd/dracut-mount.service b/modules.d/98dracut-systemd/dracut-mount.service
-index 77d34f62..c88e6d84 100644
---- a/modules.d/98dracut-systemd/dracut-mount.service
-+++ b/modules.d/98dracut-systemd/dracut-mount.service
-@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot
- Type=oneshot
- ExecStart=-/bin/dracut-mount
- StandardInput=null
--StandardOutput=syslog
--StandardError=syslog+console
-+StandardError=journal+console
- KillMode=process
- RemainAfterExit=yes
-
---
-2.26.2
-
diff --git a/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch b/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch
deleted file mode 100644
index d6d97f7bb94..00000000000
--- a/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 48258fae9fa58046d7d1a246ea3d821530180643 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Fri, 18 Dec 2020 00:01:32 +0300
-Subject: [PATCH] dracut.sh: Move ldconfig after library workaround
-
-This fixes boot failures when libgcc_s.so.1 is in a non-standard
-directory.
-
-Bug: https://bugs.gentoo.org/760249
-Fixes: de3cb0e3214c (dracut.sh: Move the library workaround after squash)
----
- dracut.sh | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 0f4648397..c6c361acc 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1724,20 +1724,6 @@ for ((i=0; i < ${#include_src[@]}; i++)); do
- fi
- done
-
--if [[ $kernel_only != yes ]]; then
-- # make sure that library links are correct and up to date
-- for f in $dracutsysrootdir/etc/ld.so.conf $dracutsysrootdir/etc/ld.so.conf.d/*; do
-- [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
-- done
-- if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
-- if [[ $EUID = 0 ]]; then
-- derror "ldconfig exited ungracefully"
-- else
-- derror "ldconfig might need uid=0 (root) for chroot()"
-- fi
-- fi
--fi
--
- if [[ $do_hardlink = yes ]] && command -v hardlink >/dev/null; then
- dinfo "*** Hardlinking files ***"
- hardlink "$initdir" 2>&1
-@@ -1920,6 +1906,20 @@ if [[ $kernel_only != yes ]]; then
- fi
- fi
-
-+if [[ $kernel_only != yes ]]; then
-+ # make sure that library links are correct and up to date
-+ for f in $dracutsysrootdir/etc/ld.so.conf $dracutsysrootdir/etc/ld.so.conf.d/*; do
-+ [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
-+ done
-+ if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
-+ if [[ $EUID = 0 ]]; then
-+ derror "ldconfig exited ungracefully"
-+ else
-+ derror "ldconfig might need uid=0 (root) for chroot()"
-+ fi
-+ fi
-+fi
-+
- if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
- dinfo "*** Stripping files ***"
- find "$initdir" -type f \
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2022-05-29 1:39 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2022-05-29 1:39 UTC (permalink / raw
To: gentoo-commits
commit: cb3ba27d18d207d560ce25bbe0ef8cb714238002
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 01:39:03 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 29 01:39:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb3ba27d
sys-kernel/dracut: fix build on musl
Closes: https://bugs.gentoo.org/847919
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/dracut-056.ebuild | 1 +
sys-kernel/dracut/files/056-musl.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/sys-kernel/dracut/dracut-056.ebuild b/sys-kernel/dracut/dracut-056.ebuild
index 35a294f43e10..2b3d51d97aec 100644
--- a/sys-kernel/dracut/dracut-056.ebuild
+++ b/sys-kernel/dracut/dracut-056.ebuild
@@ -61,6 +61,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/056-musl.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/056-musl.patch b/sys-kernel/dracut/files/056-musl.patch
new file mode 100644
index 000000000000..ded188889755
--- /dev/null
+++ b/sys-kernel/dracut/files/056-musl.patch
@@ -0,0 +1,33 @@
+From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+Date: Sun, 20 Feb 2022 22:23:49 -0500
+Subject: [PATCH] fix(install): restore musl support
+
+__GLIBC_PREREQ is only defined in glibc.
+---
+ src/install/util.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/install/util.c b/src/install/util.c
+index 5721de89e..0af387c27 100644
+--- a/src/install/util.c
++++ b/src/install/util.c
+@@ -24,17 +24,15 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
++#include <sys/syscall.h>
+
+ #include "util.h"
+
+-#if __GLIBC_PREREQ(2, 30) == 0
+-#include <sys/syscall.h>
+ #ifndef SYS_gettid
+ #error "SYS_gettid unavailable on this system"
+ #endif
+
+ #define gettid() ((pid_t) syscall(SYS_gettid))
+-#endif /*__GLIBC_PREREQ */
+
+ size_t page_size(void)
+ {
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2022-06-07 23:47 Sam James
0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2022-06-07 23:47 UTC (permalink / raw
To: gentoo-commits
commit: 99dfdcacc7c6b094d5e8d4c5c8ace4edbeb5a0f9
Author: Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Sun Jun 5 07:19:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 23:46:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99dfdcac
sys-kernel/dracut: Add missing grep to lvm module
Includes upstream fix to add missing grep binary required
by lvm module.
https://github.com/dracutdevs/dracut/pull/1782/commits
https://github.com/dracutdevs/dracut/commit/79f9d9e1c29a9c8fc046ab20765e5bde2aaa3428
Closes: https://bugs.gentoo.org/849764
Signed-off-by: Branko Grubic <bitlord0xff <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25762
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/dracut/dracut-056-r1.ebuild | 175 +++++++++++++++++++++
.../056-fix-lvm-add-missing-grep-requirement.patch | 36 +++++
2 files changed, 211 insertions(+)
diff --git a/sys-kernel/dracut/dracut-056-r1.ebuild b/sys-kernel/dracut/dracut-056-r1.ebuild
new file mode 100644
index 000000000000..312710f43e05
--- /dev/null
+++ b/sys-kernel/dracut/dracut-056-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+ [[ "${PV}" = *_rc* ]] || \
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/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/util-linux-2.21
+ virtual/pkgconfig
+ 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
+"
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/056-musl.patch
+ "${FILESDIR}"/056-fix-lvm-add-missing-grep-requirement.patch
+)
+
+src_configure() {
+ local myconf=(
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc"
+ --bashcompletiondir="$(get_bashcompdir)"
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ tc-export CC PKG_CONFIG
+
+ echo ./configure "${myconf[@]}"
+ ./configure "${myconf[@]}" || die
+
+ if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
+ # Source tarball from github doesn't include this file
+ echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
+ fi
+}
+
+src_test() {
+ if [[ ${EUID} != 0 ]]; then
+ # Tests need root privileges, bug #298014
+ ewarn "Skipping tests: Not running as root."
+ elif [[ ! -w /dev/kvm ]]; then
+ ewarn "Skipping tests: Unable to access /dev/kvm."
+ else
+ emake -C test check
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ NEWS.md
+ README.md
+ docs/README.cross
+ docs/README.generic
+ docs/README.kernel
+ docs/SECURITY.md
+ )
+
+ default
+
+ docinto html
+ dodoc dracut.html
+}
+
+pkg_postinst() {
+ if linux-info_get_any_version && linux_config_exists; then
+ ewarn ""
+ ewarn "If the following test report contains a missing kernel"
+ ewarn "configuration option, you should reconfigure and rebuild your"
+ ewarn "kernel before booting image generated with this Dracut version."
+ ewarn ""
+
+ local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+ # Kernel configuration options descriptions:
+ local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+ ERROR_DEVTMPFS+='is missing and REQUIRED'
+ local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+ ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
+
+ check_extra_config
+ echo
+ else
+ ewarn ""
+ ewarn "Your kernel configuration couldn't be checked."
+ ewarn "Please check manually if following options are enabled:"
+ ewarn ""
+ ewarn " CONFIG_BLK_DEV_INITRD"
+ ewarn " CONFIG_DEVTMPFS"
+ ewarn ""
+ fi
+
+ 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 \
+ "Measure performance of the boot process for later visualisation" \
+ app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+ 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 "Support iSCSI" sys-block/open-iscsi
+ optfeature "Support Logical Volume Manager" sys-fs/lvm2
+ optfeature "Support MD devices, also known as software RAID devices" \
+ sys-fs/mdadm
+ 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" \
+ net-misc/openssh
+ optfeature "Enable logging with rsyslog" app-admin/rsyslog
+ optfeature \
+ "Enable rngd service to help generating entropy early during boot" \
+ sys-apps/rng-tools
+}
diff --git a/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch b/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch
new file mode 100644
index 000000000000..ca24180fd689
--- /dev/null
+++ b/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch
@@ -0,0 +1,36 @@
+From 79f9d9e1c29a9c8fc046ab20765e5bde2aaa3428 Mon Sep 17 00:00:00 2001
+From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+Date: Mon, 11 Apr 2022 08:33:17 +0200
+Subject: [PATCH] fix(lvm): add missing grep requirement
+
+Since commit https://github.com/dracutdevs/dracut/commit/7ffc5e38
+lvm_scan.sh needs grep.
+---
+ modules.d/90lvm/module-setup.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
+index 25be0133..aa8c6db8 100755
+--- a/modules.d/90lvm/module-setup.sh
++++ b/modules.d/90lvm/module-setup.sh
+@@ -3,7 +3,7 @@
+ # called by dracut
+ check() {
+ # No point trying to support lvm if the binaries are missing
+- require_binaries lvm || return 1
++ require_binaries lvm grep || return 1
+
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
+ for fs in "${host_fs_types[@]}"; do
+@@ -48,7 +48,7 @@ installkernel() {
+
+ # called by dracut
+ install() {
+- inst lvm
++ inst_multiple lvm grep
+
+ if [[ $hostonly_cmdline == "yes" ]]; then
+ local _lvmconf
+--
+2.35.1
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2022-07-04 23:29 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2022-07-04 23:29 UTC (permalink / raw
To: gentoo-commits
commit: 41fe3ce6f1b34ad62c4672fc0146b2268b813711
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 23:18:40 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 23:28:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fe3ce6
sys-kernel/dracut: add 057
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/Manifest | 1 +
.../{dracut-9999.ebuild => dracut-057.ebuild} | 8 ++--
sys-kernel/dracut/dracut-9999.ebuild | 7 ++--
.../dracut/files/057-virtiofs-split-usr.patch | 43 ++++++++++++++++++++++
4 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 8f585a4e1527..7633cae497de 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,3 +1,4 @@
DIST dracut-053.tar.xz 354668 BLAKE2B d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3 SHA512 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a
DIST dracut-055.tar.xz 361752 BLAKE2B 9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680 SHA512 2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866
DIST dracut-056.tar.xz 384196 BLAKE2B e3e4fa3024b401cc954ba6069c54e95912691ff68a838e3c43bfc6a5b284bdee1669c782b30503c0246b7146c545ee8825febefcff93bae76ec46067cb7b87e1 SHA512 19268763e128984d20cab766bbdf2de12fe534ce2562fc688203099ef9b4cf83d0ccd2129499c70cdc6dd4ad53f0ffc2f3378eff5b8a15fda27c23b20f903df2
+DIST dracut-057.tar.gz 481345 BLAKE2B dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901 SHA512 8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-057.ebuild
similarity index 94%
copy from sys-kernel/dracut/dracut-9999.ebuild
copy to sys-kernel/dracut/dracut-057.ebuild
index 35a294f43e10..2e0def4acdca 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-057.ebuild
@@ -9,9 +9,10 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
+ if [[ "${PV}" != *_rc* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+ SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
fi
DESCRIPTION="Generic initramfs generation tool"
@@ -61,6 +62,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/057-virtiofs-split-usr.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 35a294f43e10..3721fec06569 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -9,9 +9,10 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
+ if [[ "${PV}" != *_rc* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+ SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
fi
DESCRIPTION="Generic initramfs generation tool"
diff --git a/sys-kernel/dracut/files/057-virtiofs-split-usr.patch b/sys-kernel/dracut/files/057-virtiofs-split-usr.patch
new file mode 100644
index 000000000000..5bb51a9b3535
--- /dev/null
+++ b/sys-kernel/dracut/files/057-virtiofs-split-usr.patch
@@ -0,0 +1,43 @@
+From dd63cc0a25f9fb34a2f28306c06a668d66564463 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 4 Jul 2022 19:08:45 -0400
+Subject: [PATCH] fix(virtiofs): make shebangs work on split-usr systems
+
+Fixes: c29325a982013a315418cdb2318e90cf77e387b5
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ modules.d/95virtiofs/module-setup.sh | 2 +-
+ modules.d/95virtiofs/mount-virtiofs.sh | 2 +-
+ modules.d/95virtiofs/parse-virtiofs.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/95virtiofs/module-setup.sh b/modules.d/95virtiofs/module-setup.sh
+index e5f209e0a..70c10584a 100755
+--- a/modules.d/95virtiofs/module-setup.sh
++++ b/modules.d/95virtiofs/module-setup.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/bin/bash
+
+ # called by dracut
+ check() {
+diff --git a/modules.d/95virtiofs/mount-virtiofs.sh b/modules.d/95virtiofs/mount-virtiofs.sh
+index 507911cf5..c7e31d041 100755
+--- a/modules.d/95virtiofs/mount-virtiofs.sh
++++ b/modules.d/95virtiofs/mount-virtiofs.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#!/bin/sh
+
+ if [ "${fstype}" = "virtiofs" -o "${root%%:*}" = "virtiofs" ]; then
+ if ! { modprobe virtiofs || strstr "$(cat /proc/filesystems)" virtiofs; }; then
+diff --git a/modules.d/95virtiofs/parse-virtiofs.sh b/modules.d/95virtiofs/parse-virtiofs.sh
+index 8b8cf760d..760e41385 100755
+--- a/modules.d/95virtiofs/parse-virtiofs.sh
++++ b/modules.d/95virtiofs/parse-virtiofs.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#!/bin/sh
+ # Accepted formats:
+ # rootfstype=virtiofs root=<tag>
+ # root=virtiofs:<tag>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2022-07-05 14:30 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2022-07-05 14:30 UTC (permalink / raw
To: gentoo-commits
commit: c3f71cf8081924f8cb0a4f2d2a2ba630fe9056a1
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 14:27:31 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 14:30:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f71cf8
sys-kernel/dracut: fix issue with keymaps
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{dracut-057.ebuild => dracut-057-r1.ebuild} | 1 +
sys-kernel/dracut/files/057-i18n-keymaps.patch | 28 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/sys-kernel/dracut/dracut-057.ebuild b/sys-kernel/dracut/dracut-057-r1.ebuild
similarity index 99%
rename from sys-kernel/dracut/dracut-057.ebuild
rename to sys-kernel/dracut/dracut-057-r1.ebuild
index 2e0def4acdca..fd44dcda247d 100644
--- a/sys-kernel/dracut/dracut-057.ebuild
+++ b/sys-kernel/dracut/dracut-057-r1.ebuild
@@ -63,6 +63,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
"${FILESDIR}"/057-virtiofs-split-usr.patch
+ "${FILESDIR}"/057-i18n-keymaps.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/057-i18n-keymaps.patch b/sys-kernel/dracut/files/057-i18n-keymaps.patch
new file mode 100644
index 000000000000..77ac6078fb07
--- /dev/null
+++ b/sys-kernel/dracut/files/057-i18n-keymaps.patch
@@ -0,0 +1,28 @@
+From bef99c5120809cc5603e51dcc1987767205f241f Mon Sep 17 00:00:00 2001
+From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+Date: Mon, 27 Jun 2022 13:19:41 +0200
+Subject: [PATCH] fix(i18n): add required includes for keymaps
+
+Commit https://github.com/dracutdevs/dracut/commit/f3441cc7 removed shell
+options but didn't adapt all the code that requires nullglob and globstar.
+This caused the initrd to be generated without the required includes for
+keymaps.
+---
+ modules.d/10i18n/module-setup.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index 35bda36fb..6fd5fd433 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -63,7 +63,9 @@ install() {
+ readarray -t INCLUDES < <("$CMD" '^include ' "$MAP" | while read -r _ a _ || [ -n "$a" ]; do echo "${a//\"/}"; done)
+
+ for INCL in "${INCLUDES[@]}"; do
+- for FN in "$dracutsysrootdir""${kbddir}"/keymaps/**/"$INCL"*; do
++ local -a FNS
++ mapfile -t -d '' FNS < <(find "${dracutsysrootdir}${kbddir}"/keymaps/ -type f -name "${INCL}*" -print0)
++ for FN in "${FNS[@]}"; do
+ [[ -f $FN ]] || continue
+ [[ -v KEYMAPS["$FN"] ]] || findkeymap "$FN"
+ done
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2022-12-23 23:21 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2022-12-23 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 9343c4b2c895f8fa3812a4aebebf5ead1a5db609
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 23:20:19 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 23:21:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9343c4b2
sys-kernel/dracut: drop 055-r4, 056, 056-r2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/Manifest | 2 -
sys-kernel/dracut/dracut-055-r4.ebuild | 178 ---------------------
sys-kernel/dracut/dracut-056-r2.ebuild | 176 --------------------
sys-kernel/dracut/dracut-056.ebuild | 174 --------------------
sys-kernel/dracut/files/055-add-blockfuncs.patch | 25 ---
...ase-do-not-quote-initargs-for-switch_root.patch | 32 ----
...x-crypt-remove-quotes-from-cryptsetupopts.patch | 39 -----
...5-fix-usrmount-do-not-empty-_dev-variable.patch | 36 -----
sys-kernel/dracut/files/055-tpm2-tss-typo.patch | 23 ---
.../056-fix-lvm-add-missing-grep-requirement.patch | 36 -----
sys-kernel/dracut/files/056-musl.patch | 33 ----
11 files changed, 754 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index b62dc908356f..85f48f8a238f 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,3 +1 @@
-DIST dracut-055.tar.xz 361752 BLAKE2B 9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680 SHA512 2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866
-DIST dracut-056.tar.xz 384196 BLAKE2B e3e4fa3024b401cc954ba6069c54e95912691ff68a838e3c43bfc6a5b284bdee1669c782b30503c0246b7146c545ee8825febefcff93bae76ec46067cb7b87e1 SHA512 19268763e128984d20cab766bbdf2de12fe534ce2562fc688203099ef9b4cf83d0ccd2129499c70cdc6dd4ad53f0ffc2f3378eff5b8a15fda27c23b20f903df2
DIST dracut-057.tar.gz 481345 BLAKE2B dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901 SHA512 8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089
diff --git a/sys-kernel/dracut/dracut-055-r4.ebuild b/sys-kernel/dracut/dracut-055-r4.ebuild
deleted file mode 100644
index 51c5114175d3..000000000000
--- a/sys-kernel/dracut/dracut-055-r4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/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/util-linux-2.21
- virtual/pkgconfig
- 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
-"
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
- "${FILESDIR}"/055-fix-base-do-not-quote-initargs-for-switch_root.patch
- "${FILESDIR}"/055-fix-usrmount-do-not-empty-_dev-variable.patch
- "${FILESDIR}"/055-tpm2-tss-typo.patch
- "${FILESDIR}"/055-add-blockfuncs.patch
- "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_test() {
- if [[ ${EUID} != 0 ]]; then
- # Tests need root privileges, bug #298014
- ewarn "Skipping tests: Not running as root."
- elif [[ ! -w /dev/kvm ]]; then
- ewarn "Skipping tests: Unable to access /dev/kvm."
- else
- emake -C test check
- fi
-}
-
-src_install() {
- local DOCS=(
- AUTHORS
- NEWS.md
- README.md
- docs/README.cross
- docs/README.generic
- docs/README.kernel
- docs/SECURITY.md
- )
-
- default
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
- optfeature \
- "Enable rngd service to help generating entropy early during boot" \
- sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/dracut-056-r2.ebuild b/sys-kernel/dracut/dracut-056-r2.ebuild
deleted file mode 100644
index 608284d33398..000000000000
--- a/sys-kernel/dracut/dracut-056-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/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
- 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
-"
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
- "${FILESDIR}"/056-musl.patch
- "${FILESDIR}"/056-fix-lvm-add-missing-grep-requirement.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_test() {
- if [[ ${EUID} != 0 ]]; then
- # Tests need root privileges, bug #298014
- ewarn "Skipping tests: Not running as root."
- elif [[ ! -w /dev/kvm ]]; then
- ewarn "Skipping tests: Unable to access /dev/kvm."
- else
- emake -C test check
- fi
-}
-
-src_install() {
- local DOCS=(
- AUTHORS
- NEWS.md
- README.md
- docs/README.cross
- docs/README.generic
- docs/README.kernel
- docs/SECURITY.md
- )
-
- default
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
- optfeature \
- "Enable rngd service to help generating entropy early during boot" \
- sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/dracut-056.ebuild b/sys-kernel/dracut/dracut-056.ebuild
deleted file mode 100644
index 2b3d51d97aec..000000000000
--- a/sys-kernel/dracut/dracut-056.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
- SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/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/util-linux-2.21
- virtual/pkgconfig
- 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
-"
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
- "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
- "${FILESDIR}"/056-musl.patch
-)
-
-src_configure() {
- local myconf=(
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc"
- --bashcompletiondir="$(get_bashcompdir)"
- --systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- tc-export CC PKG_CONFIG
-
- echo ./configure "${myconf[@]}"
- ./configure "${myconf[@]}" || die
-
- if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
- # Source tarball from github doesn't include this file
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
- fi
-}
-
-src_test() {
- if [[ ${EUID} != 0 ]]; then
- # Tests need root privileges, bug #298014
- ewarn "Skipping tests: Not running as root."
- elif [[ ! -w /dev/kvm ]]; then
- ewarn "Skipping tests: Unable to access /dev/kvm."
- else
- emake -C test check
- fi
-}
-
-src_install() {
- local DOCS=(
- AUTHORS
- NEWS.md
- README.md
- docs/README.cross
- docs/README.generic
- docs/README.kernel
- docs/SECURITY.md
- )
-
- default
-
- docinto html
- dodoc dracut.html
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
- # Kernel configuration options descriptions:
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
- ERROR_DEVTMPFS+='is missing and REQUIRED'
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked."
- ewarn "Please check manually if following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn ""
- fi
-
- 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 \
- "Measure performance of the boot process for later visualisation" \
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
- 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 "Support iSCSI" sys-block/open-iscsi
- optfeature "Support Logical Volume Manager" sys-fs/lvm2
- optfeature "Support MD devices, also known as software RAID devices" \
- sys-fs/mdadm
- 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" \
- net-misc/openssh
- optfeature "Enable logging with rsyslog" app-admin/rsyslog
- optfeature \
- "Enable rngd service to help generating entropy early during boot" \
- sys-apps/rng-tools
-}
diff --git a/sys-kernel/dracut/files/055-add-blockfuncs.patch b/sys-kernel/dracut/files/055-add-blockfuncs.patch
deleted file mode 100644
index 56724e0c73aa..000000000000
--- a/sys-kernel/dracut/files/055-add-blockfuncs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a91dcfeb54b8c6c810020f77124f6eaf6ef5baa9 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Thu, 12 Aug 2021 11:46:35 +0200
-Subject: [PATCH] fix(kernel-modules): add blk_mq_alloc_disk and
- blk_cleanup_disk to blockfuncs
-
-Since kernel 5-14 those are used by many drivers for example:
-xen-blkfront, loop, nbd, pd
----
- modules.d/90kernel-modules/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
-index 8b06893ae..69dc18b59 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -2,7 +2,7 @@
-
- # called by dracut
- installkernel() {
-- local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma'
-+ local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma|blk_mq_alloc_disk|blk_cleanup_disk'
- local -A _hostonly_drvs
-
- find_kernel_modules_external() {
diff --git a/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch b/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch
deleted file mode 100644
index 5568c22aede6..000000000000
--- a/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 285e2ad01035743ff51005a74e486e09fcbb0a0d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 23 Jul 2021 14:35:07 -0400
-Subject: [PATCH] fix(base): do not quote $initargs for switch_root
-
-We want word splitting to occur so that the arguments are passed
-separately, and we don't end up passing an empty string if no arguments
-are specified.
-
-Bug: https://bugs.gentoo.org/803548
-Fixes: 2fabaaa62dcfd31e593ca45e1374e55adae29d6b
----
- modules.d/99base/init.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 978adb6f..ab62bb44 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -387,7 +387,8 @@ if [ -f /etc/capsdrop ]; then
- }
- else
- unset RD_DEBUG
-- exec "$SWITCH_ROOT" "$NEWROOT" "$INIT" "$initargs" || {
-+ # shellcheck disable=SC2086
-+ exec "$SWITCH_ROOT" "$NEWROOT" "$INIT" $initargs || {
- warn "Something went very badly wrong in the initramfs. Please "
- warn "file a bug against dracut."
- emergency_shell
---
-2.32.0
-
diff --git a/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch b/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
deleted file mode 100644
index 355cdc461abc..000000000000
--- a/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e0abf88a15d23fbf793cf872397016ad86aeaaa8 Mon Sep 17 00:00:00 2001
-From: lapseofreason <lapseofreason0@gmail.com>
-Date: Tue, 8 Jun 2021 16:01:58 +0200
-Subject: [PATCH] fix(crypt): remove quotes from cryptsetupopts
-
-Fixes #1528.
----
- modules.d/90crypt/cryptroot-ask.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
-index 37a4deea..b1f8df81 100755
---- a/modules.d/90crypt/cryptroot-ask.sh
-+++ b/modules.d/90crypt/cryptroot-ask.sh
-@@ -138,8 +138,9 @@ unset allowdiscards
- ask_passphrase=1
-
- if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then
-+ # shellcheck disable=SC2086
- if readkey "$luksfile" / "$device" \
-- | cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname"; then
-+ | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname"; then
- ask_passphrase=0
- fi
- elif [ "$is_keysource" -ne 0 ]; then
-@@ -164,8 +165,9 @@ else
- unset tmp
-
- info "Using '$keypath' on '$keydev'"
-+ # shellcheck disable=SC2086
- readkey "$keypath" "$keydev" "$device" \
-- | cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname" \
-+ | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname" \
- && ask_passphrase=0
- unset keypath keydev
- break
---
-2.32.0
-
diff --git a/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch b/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch
deleted file mode 100644
index e46f8bb25db9..000000000000
--- a/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4afdcba212793f136aea012b30dd7bdb5b641a5a Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 16 Aug 2021 18:54:34 +0300
-Subject: [PATCH] fix(usrmount): do not empty _dev variable
-
-Currently $_dev is always overridden with the value returned by
-label_uuid_to_dev(). This results in an empty value if $_dev is a
-device path. Fix this by calling label_uuid_to_dev() conditionally.
-
-Bug: https://bugs.gentoo.org/807971
-Fixes: d3532978de04c78f53664dad7b37705a49a7ee54
----
- modules.d/98usrmount/mount-usr.sh | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index 23ed06aa..c8e1893b 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -55,7 +55,12 @@ mount_usr() {
- while read -r _dev _mp _fs _opts _freq _passno || [ -n "$_dev" ]; do
- [ "${_dev%%#*}" != "$_dev" ] && continue
- if [ "$_mp" = "/usr" ]; then
-- _dev="$(label_uuid_to_dev "$_dev")"
-+ case "$_dev" in
-+ LABEL=* | UUID=* | PARTUUID=* | PARTLABEL=*)
-+ _dev="$(label_uuid_to_dev "$_dev")"
-+ ;;
-+ *) ;;
-+ esac
-
- if strstr "$_opts" "subvol=" \
- && [ "${root#block:}" -ef "$_dev" ] \
---
-2.31.1
-
diff --git a/sys-kernel/dracut/files/055-tpm2-tss-typo.patch b/sys-kernel/dracut/files/055-tpm2-tss-typo.patch
deleted file mode 100644
index a04496a29ca8..000000000000
--- a/sys-kernel/dracut/files/055-tpm2-tss-typo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8b17105bed69ed90582a13d97d95ee19e6581365 Mon Sep 17 00:00:00 2001
-From: Matthias Berndt <matthias_berndt@gmx.de>
-Date: Tue, 1 Jun 2021 19:32:48 +0200
-Subject: [PATCH] fix(tpm2-tss): typo in depends()
-
-There is no systemd-udev module, only systemd-udevd
----
- modules.d/91tpm2-tss/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh
-index 28af22a31..361131d66 100755
---- a/modules.d/91tpm2-tss/module-setup.sh
-+++ b/modules.d/91tpm2-tss/module-setup.sh
-@@ -17,7 +17,7 @@ check() {
- depends() {
-
- # This module has external dependency on other module(s).
-- echo systemd-sysusers systemd-udev
-+ echo systemd-sysusers systemd-udevd
- # Return 0 to include the dependent module(s) in the initramfs.
- return 0
-
diff --git a/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch b/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch
deleted file mode 100644
index ca24180fd689..000000000000
--- a/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 79f9d9e1c29a9c8fc046ab20765e5bde2aaa3428 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 11 Apr 2022 08:33:17 +0200
-Subject: [PATCH] fix(lvm): add missing grep requirement
-
-Since commit https://github.com/dracutdevs/dracut/commit/7ffc5e38
-lvm_scan.sh needs grep.
----
- modules.d/90lvm/module-setup.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index 25be0133..aa8c6db8 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -3,7 +3,7 @@
- # called by dracut
- check() {
- # No point trying to support lvm if the binaries are missing
-- require_binaries lvm || return 1
-+ require_binaries lvm grep || return 1
-
- [[ $hostonly ]] || [[ $mount_needs ]] && {
- for fs in "${host_fs_types[@]}"; do
-@@ -48,7 +48,7 @@ installkernel() {
-
- # called by dracut
- install() {
-- inst lvm
-+ inst_multiple lvm grep
-
- if [[ $hostonly_cmdline == "yes" ]]; then
- local _lvmconf
---
-2.35.1
-
diff --git a/sys-kernel/dracut/files/056-musl.patch b/sys-kernel/dracut/files/056-musl.patch
deleted file mode 100644
index ded188889755..000000000000
--- a/sys-kernel/dracut/files/056-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sun, 20 Feb 2022 22:23:49 -0500
-Subject: [PATCH] fix(install): restore musl support
-
-__GLIBC_PREREQ is only defined in glibc.
----
- src/install/util.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/install/util.c b/src/install/util.c
-index 5721de89e..0af387c27 100644
---- a/src/install/util.c
-+++ b/src/install/util.c
-@@ -24,17 +24,15 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/types.h>
-+#include <sys/syscall.h>
-
- #include "util.h"
-
--#if __GLIBC_PREREQ(2, 30) == 0
--#include <sys/syscall.h>
- #ifndef SYS_gettid
- #error "SYS_gettid unavailable on this system"
- #endif
-
- #define gettid() ((pid_t) syscall(SYS_gettid))
--#endif /*__GLIBC_PREREQ */
-
- size_t page_size(void)
- {
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2023-05-26 20:27 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2023-05-26 20:27 UTC (permalink / raw
To: gentoo-commits
commit: bf4a09fa9787fab26223f3b5bb0619219f3ec6c9
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 20:26:45 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May 26 20:27:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4a09fa
sys-kernel/dracut: add fallback in case systemd.pc is not installed
Bug: https://bugs.gentoo.org/765208
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../dracut/{dracut-059-r1.ebuild => dracut-059-r2.ebuild} | 0
sys-kernel/dracut/files/059-uefi-split-usr.patch | 14 ++++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/sys-kernel/dracut/dracut-059-r1.ebuild b/sys-kernel/dracut/dracut-059-r2.ebuild
similarity index 100%
rename from sys-kernel/dracut/dracut-059-r1.ebuild
rename to sys-kernel/dracut/dracut-059-r2.ebuild
diff --git a/sys-kernel/dracut/files/059-uefi-split-usr.patch b/sys-kernel/dracut/files/059-uefi-split-usr.patch
index 1b1f1348a223..8adb88076130 100644
--- a/sys-kernel/dracut/files/059-uefi-split-usr.patch
+++ b/sys-kernel/dracut/files/059-uefi-split-usr.patch
@@ -1,6 +1,6 @@
https://github.com/dracutdevs/dracut/pull/2365
-From afb2019ddc6ffe6e59df3d3dc9929a840bd09bc8 Mon Sep 17 00:00:00 2001
+From 3462e0ac6f3562a5247bbeda2dc41eaf4e4ebf5e Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Fri, 26 May 2023 15:56:45 -0400
Subject: [PATCH] Fix path to UEFI stub on split-usr systems
@@ -15,24 +15,26 @@ Instead, grab 'prefix' from systemd.pc and store it in 'systemd_prefix'.
Bug: https://bugs.gentoo.org/765208
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
- dracut.sh | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ dracut.sh | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dracut.sh b/dracut.sh
-index bbb34697..9da59561 100755
+index bbb34697..52a83061 100755
--- a/dracut.sh
+++ b/dracut.sh
-@@ -1389,6 +1389,9 @@ esac
+@@ -1389,6 +1389,11 @@ esac
abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
+[[ -n $systemd_prefix ]] \
+ || systemd_prefix=$(pkg-config systemd --variable=prefix 2> /dev/null)
++
++[[ -n $systemd_prefix ]] || systemd_prefix=/usr
+
[[ -d $dracutsysrootdir$systemdutildir ]] \
|| systemdutildir=$(pkg-config systemd --variable=systemdutildir 2> /dev/null)
-@@ -1467,7 +1470,7 @@ if [[ ! $print_cmdline ]]; then
+@@ -1467,7 +1472,7 @@ if [[ ! $print_cmdline ]]; then
esac
if ! [[ -s $uefi_stub ]]; then
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2023-11-09 2:37 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2023-11-09 2:37 UTC (permalink / raw
To: gentoo-commits
commit: 803a7e0b95164ddb661dee1448a4b19eceb09cc2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 15:00:13 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 02:27:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=803a7e0b
sys-kernel/dracut: fix resume module in hostonly mode
Closes: https://bugs.gentoo.org/917000
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/dracut-060_pre20231030.ebuild | 1 +
.../files/dracut-060-fix-resume-hostonly.patch | 65 ++++++++++++++++++++++
2 files changed, 66 insertions(+)
diff --git a/sys-kernel/dracut/dracut-060_pre20231030.ebuild b/sys-kernel/dracut/dracut-060_pre20231030.ebuild
index f6149bdc6877..25b978da1b87 100644
--- a/sys-kernel/dracut/dracut-060_pre20231030.ebuild
+++ b/sys-kernel/dracut/dracut-060_pre20231030.ebuild
@@ -68,6 +68,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/dracut-060-fix-resume-hostonly.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-060-fix-resume-hostonly.patch b/sys-kernel/dracut/files/dracut-060-fix-resume-hostonly.patch
new file mode 100644
index 000000000000..3563f85293fd
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-060-fix-resume-hostonly.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/917000
+https://github.com/dracutdevs/dracut/pull/2494
+
+From b88d0bab791bdc4ca75d13802f0391caf537650d Mon Sep 17 00:00:00 2001
+From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+Date: Sun, 20 Aug 2023 11:47:22 +0200
+Subject: [PATCH] fix(resume): include in hostonly mode if resume= on cmdline
+
+The grep introduced in commit e3a7112bef794e2f2dd741ec2c74fa9cb9117651
+does not work as intended. The resume module is always excluded in hostonly
+mode.
+
+Made this a bit more explicit with if/else so it is more clear what is going
+on. The in-line ||/&& makes the line really long and makes it more difficult
+to understand what is going on.
+
+Bug: https://github.com/dracutdevs/dracut/issues/924
+Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+---
+ modules.d/95resume/module-setup.sh | 32 +++++++++++++++++++++++-------
+ 1 file changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
+index d255103366..2d48043827 100755
+--- a/modules.d/95resume/module-setup.sh
++++ b/modules.d/95resume/module-setup.sh
+@@ -10,13 +10,31 @@ check() {
+ return 1
+ }
+
+- # Only support resume if hibernation is currently on
+- # and no swap is mounted on a net device
+- [[ $hostonly ]] || [[ $mount_needs ]] && {
+- swap_on_netdevice || [[ -f /sys/power/resume && "$(< /sys/power/resume)" == "0:0" ]] || grep -rq '^\|[[:space:]]resume=' /proc/cmdline /etc/cmdline /etc/cmdline.d /etc/kernel/cmdline /usr/lib/kernel/cmdline 2> /dev/null && return 255
+- }
+-
+- return 0
++ # If hostonly check if we want to include the resume module
++ if [[ $hostonly ]] || [[ $mount_needs ]]; then
++ # Resuming won't work if swap is on a netdevice
++ swap_on_netdevice && return 255
++ if grep -rq 'resume=' /proc/cmdline /etc/cmdline /etc/cmdline.d /etc/kernel/cmdline /usr/lib/kernel/cmdline 2> /dev/null; then
++ # hibernation support requested on kernel command line
++ return 0
++ else
++ # resume= not set on kernel command line
++ if [[ -f /sys/power/resume ]]; then
++ if [[ "$(< /sys/power/resume)" == "0:0" ]]; then
++ # hibernation supported by the kernel, but not enabled
++ return 255
++ else
++ # hibernation supported by the kernel and enabled
++ return 0
++ fi
++ else
++ # resume file doesn't exist, hibernation not supported by kernel
++ return 255
++ fi
++ fi
++ else
++ return 0
++ fi
+ }
+
+ # called by dracut
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2023-11-09 16:09 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2023-11-09 16:09 UTC (permalink / raw
To: gentoo-commits
commit: ea72d909cb0b44f958dad051494396fc0154983d
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 9 16:09:02 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 16:09:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea72d909
sys-kernel/dracut: backport dmsquash-live fix
Closes: https://bugs.gentoo.org/917069
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{dracut-059-r4.ebuild => dracut-059-r5.ebuild} | 1 +
.../dracut/files/dracut-059-dmsquash-live.patch | 26 ++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/sys-kernel/dracut/dracut-059-r4.ebuild b/sys-kernel/dracut/dracut-059-r5.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-059-r4.ebuild
rename to sys-kernel/dracut/dracut-059-r5.ebuild
index 444537fc6276..2ca8c742b3cb 100644
--- a/sys-kernel/dracut/dracut-059-r4.ebuild
+++ b/sys-kernel/dracut/dracut-059-r5.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}"/059-uefi-split-usr.patch
"${FILESDIR}"/059-uki-systemd-254.patch
"${FILESDIR}"/059-gawk.patch
+ "${FILESDIR}"/dracut-059-dmsquash-live.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch b/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch
new file mode 100644
index 000000000000..8061d686788b
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch
@@ -0,0 +1,26 @@
+From 19e4839ab70a691f95a0284aa0152a247eb5c63d Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+Date: Fri, 24 Feb 2023 01:57:19 +0000
+Subject: [PATCH] fix(dmsquash-live): restore compatibility with earlier
+ releases
+
+Follow-up to 40dd5c90e0efcb9ebaa9abb42a38c7316e9706bd .
+---
+ modules.d/90dmsquash-live/dmsquash-live-root.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+index 62d1b5e7cd..a98e258c26 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+@@ -403,6 +403,10 @@ fi
+
+ ROOTFLAGS="$(getarg rootflags)"
+
++if [ "$overlayfs" = required ]; then
++ echo "rd.live.overlay.overlayfs=1" > /etc/cmdline.d/dmsquash-need-overlay.conf
++fi
++
+ if [ -n "$overlayfs" ]; then
+ if [ -n "$FSIMG" ]; then
+ mkdir -m 0755 -p /run/rootfsbase
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2023-12-12 19:07 Mike Gilbert
0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2023-12-12 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 0cbe0df916052f45afd23abf3a134b01a3d32c0f
Author: Brian Harring <ferringb <AT> gmail <DOT> com>
AuthorDate: Tue Dec 12 00:52:08 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 19:07:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cbe0df9
sys-kernel/dracut: 059-r6 revbump for systemd 255 incompatibility
changes:
- fix pcr{phrase -> extend} rename and reduction.
Renamed patch isn't yet merged, PR is at:
https://github.com/dracutdevs/dracut/pull/2586
- add systemd-executor (systemd flat out fails without it)
This was already merged upstream.
Closes: https://bugs.gentoo.org/919766
Signed-off-by: Brian Harring <ferringb <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34246
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-kernel/dracut/dracut-059-r6.ebuild | 161 +++++++++++++++++++++
sys-kernel/dracut/files/059-systemd-executor.patch | 31 ++++
sys-kernel/dracut/files/059-systemd-pcrphase.patch | 91 ++++++++++++
3 files changed, 283 insertions(+)
diff --git a/sys-kernel/dracut/dracut-059-r6.ebuild b/sys-kernel/dracut/dracut-059-r6.ebuild
new file mode 100644
index 000000000000..4ef85771f79c
--- /dev/null
+++ b/sys-kernel/dracut/dracut-059-r6.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 optfeature systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+ if [[ "${PV}" != *_rc* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+ SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/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
+ 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
+"
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/gentoo-network-r1.patch
+ "${FILESDIR}"/059-kernel-install-uki.patch
+ "${FILESDIR}"/059-uefi-split-usr.patch
+ "${FILESDIR}"/059-uki-systemd-254.patch
+ "${FILESDIR}"/059-gawk.patch
+ "${FILESDIR}"/dracut-059-dmsquash-live.patch
+ "${FILESDIR}"/059-systemd-pcrphase.patch
+ "${FILESDIR}"/059-systemd-executor.patch
+)
+
+src_configure() {
+ local myconf=(
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc"
+ --bashcompletiondir="$(get_bashcompdir)"
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ tc-export CC PKG_CONFIG
+
+ echo ./configure "${myconf[@]}"
+ ./configure "${myconf[@]}" || die
+
+ if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
+ # Source tarball from github doesn't include this file
+ echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
+ fi
+}
+
+src_test() {
+ if [[ ${EUID} != 0 ]]; then
+ # Tests need root privileges, bug #298014
+ ewarn "Skipping tests: Not running as root."
+ elif [[ ! -w /dev/kvm ]]; then
+ ewarn "Skipping tests: Unable to access /dev/kvm."
+ else
+ emake -C test check
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ NEWS.md
+ README.md
+ docs/README.cross
+ docs/README.generic
+ docs/README.kernel
+ 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
+ optfeature \
+ "Enable rngd service to help generating entropy early during boot" \
+ sys-apps/rng-tools
+}
diff --git a/sys-kernel/dracut/files/059-systemd-executor.patch b/sys-kernel/dracut/files/059-systemd-executor.patch
new file mode 100644
index 000000000000..5ec1a1386136
--- /dev/null
+++ b/sys-kernel/dracut/files/059-systemd-executor.patch
@@ -0,0 +1,31 @@
+From bee1c4824a8cd47ce6c01892a548bdc07b1fa678 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <frantisek@sumsal.cz>
+Date: Sat, 14 Oct 2023 23:45:57 +0200
+Subject: [PATCH] feat(systemd): install systemd-executor
+
+In [0] systemd gained a new binary - systemd-executor - that's used to
+spawn processes forked off systemd. Let's copy it into the initrd if
+it's available.
+
+[0] https://github.com/systemd/systemd/pull/27890
+
+Signed-off-by: Brian Harring <ferringb@gmail.com>
+---
+ modules.d/00systemd/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
+index 554c25a08..9a13a1dbb 100755
+--- a/modules.d/00systemd/module-setup.sh
++++ b/modules.d/00systemd/module-setup.sh
+@@ -34,6 +34,7 @@ install() {
+ "$systemdutildir"/systemd \
+ "$systemdutildir"/systemd-coredump \
+ "$systemdutildir"/systemd-cgroups-agent \
++ "$systemdutildir"/systemd-executor \
+ "$systemdutildir"/systemd-shutdown \
+ "$systemdutildir"/systemd-reply-password \
+ "$systemdutildir"/systemd-fsck \
+--
+2.41.0
+
diff --git a/sys-kernel/dracut/files/059-systemd-pcrphase.patch b/sys-kernel/dracut/files/059-systemd-pcrphase.patch
new file mode 100644
index 000000000000..f653cdd5907e
--- /dev/null
+++ b/sys-kernel/dracut/files/059-systemd-pcrphase.patch
@@ -0,0 +1,91 @@
+https://github.com/dracutdevs/dracut/pull/2586
+
+From cd6f683d634970112a29867137431d0d57f8c957 Mon Sep 17 00:00:00 2001
+From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+Date: Thu, 9 Feb 2023 13:55:47 +0100
+Subject: [PATCH] fix(systemd-pcrphase): only include
+ systemd-pcrphase-initrd.service
+
+The only systemd-pcrphase related unit configured to run in the initrd is
+systemd-pcrphase-initrd.service.
+Both systemd-pcrphase.service and systemd-pcrphase-sysinit.service contain
+`ConditionPathExists=!/etc/initrd-release`.
+
+Signed-off-by: Brian Harring <ferringb@gmail.com>
+---
+ modules.d/01systemd-pcrphase/module-setup.sh | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh
+index 3dbb4974..fa960a42 100755
+--- a/modules.d/01systemd-pcrphase/module-setup.sh
++++ b/modules.d/01systemd-pcrphase/module-setup.sh
+@@ -28,10 +28,6 @@ install() {
+
+ inst_multiple -o \
+ "$systemdutildir"/systemd-pcrphase \
+- "$systemdsystemunitdir"/systemd-pcrphase.service \
+- "$systemdsystemunitdir/systemd-pcrphase.service.d/*.conf" \
+- "$systemdsystemunitdir"/systemd-pcrphase-sysinit.service \
+- "$systemdsystemunitdir/systemd-pcrphase-sysinit.service/*.conf" \
+ "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \
+ "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \
+ "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service
+@@ -39,10 +35,6 @@ install() {
+ # Install the hosts local user configurations if enabled.
+ if [[ $hostonly ]]; then
+ inst_multiple -H -o \
+- "$systemdsystemconfdir"/systemd-pcrphase.service \
+- "$systemdsystemconfdir/systemd-pcrphase.service.d/*.conf" \
+- "$systemdsystemconfdir"/systemd-pcrphase-sysinit.service \
+- "$systemdsystemconfdir/systemd-pcrphase-sysinit.service.d/*.conf" \
+ "$systemdsystemconfdir"/systemd-pcrphase-initrd.service \
+ "$systemdsystemconfdir/systemd-pcrphase-initrd.service.d/*.conf" \
+ "$systemdsystemconfdir"/initrd.target.wants/systemd-pcrphase-initrd.service
+--
+2.41.0
+
+From cd93aaa2e096a8cbd1f1789dcce06857067b35c9 Mon Sep 17 00:00:00 2001
+From: Brian Harring <ferringb@gmail.com>
+Date: Mon, 11 Dec 2023 17:10:20 -0800
+Subject: [PATCH] fix(systemd-255): handle systemd-pcr{phase -> extend} rename
+
+The binary systemd-pcrphase was renamed to systemd-pcrextend
+in systemd 255, but the backing units were all left named
+systemd-pcrphase.
+
+Fixes: #2583
+
+Signed-off-by: Brian Harring <ferringb@gmail.com>
+---
+ modules.d/01systemd-pcrphase/module-setup.sh | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh
+index fa960a42c..87efd0c1a 100755
+--- a/modules.d/01systemd-pcrphase/module-setup.sh
++++ b/modules.d/01systemd-pcrphase/module-setup.sh
+@@ -6,7 +6,11 @@
+ check() {
+
+ # If the binary(s) requirements are not fulfilled the module can't be installed.
+- require_binaries "$systemdutildir"/systemd-pcrphase || return 1
++ # systemd-255 renamed the binary, check for old and new location.
++ if ! require_binaries "$systemdutildir"/systemd-pcrphase && \
++ ! require_binaries "$systemdutildir"/systemd-pcrextend; then
++ return 1
++ fi
+
+ # Return 255 to only include the module, if another module requires it.
+ return 255
+@@ -28,6 +32,7 @@ install() {
+
+ inst_multiple -o \
+ "$systemdutildir"/systemd-pcrphase \
++ "$systemdutildir"/systemd-pcrextend \
+ "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \
+ "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \
+ "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service
+--
+2.41.0
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2023-12-20 7:43 Florian Schmaus
0 siblings, 0 replies; 30+ messages in thread
From: Florian Schmaus @ 2023-12-20 7:43 UTC (permalink / raw
To: gentoo-commits
commit: ef10f91888cf81071ccdfc6fbedaa27be33ef29f
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 07:41:25 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 07:43:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef10f918
sys-kernel/dracut: add patch to fix resume with systemd 255
Apply the patch from https://github.com/dracutdevs/dracut/pull/2527 to
include the new systemd-hibernate-resume service file of systemd 255 in
the initrd image.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sys-kernel/dracut/dracut-059-r7.ebuild | 162 +++++++++++++++++++++
sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild | 155 ++++++++++++++++++++
...tall-new-systemd-hibernate-resume.service.patch | 21 +++
3 files changed, 338 insertions(+)
diff --git a/sys-kernel/dracut/dracut-059-r7.ebuild b/sys-kernel/dracut/dracut-059-r7.ebuild
new file mode 100644
index 000000000000..4f5443dcf287
--- /dev/null
+++ b/sys-kernel/dracut/dracut-059-r7.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 optfeature systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+ if [[ "${PV}" != *_rc* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+ SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/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
+ 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
+"
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/gentoo-network-r1.patch
+ "${FILESDIR}"/059-kernel-install-uki.patch
+ "${FILESDIR}"/059-uefi-split-usr.patch
+ "${FILESDIR}"/059-uki-systemd-254.patch
+ "${FILESDIR}"/059-gawk.patch
+ "${FILESDIR}"/dracut-059-dmsquash-live.patch
+ "${FILESDIR}"/059-systemd-pcrphase.patch
+ "${FILESDIR}"/059-systemd-executor.patch
+ "${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.patch
+)
+
+src_configure() {
+ local myconf=(
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc"
+ --bashcompletiondir="$(get_bashcompdir)"
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ tc-export CC PKG_CONFIG
+
+ echo ./configure "${myconf[@]}"
+ ./configure "${myconf[@]}" || die
+
+ if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
+ # Source tarball from github doesn't include this file
+ echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
+ fi
+}
+
+src_test() {
+ if [[ ${EUID} != 0 ]]; then
+ # Tests need root privileges, bug #298014
+ ewarn "Skipping tests: Not running as root."
+ elif [[ ! -w /dev/kvm ]]; then
+ ewarn "Skipping tests: Unable to access /dev/kvm."
+ else
+ emake -C test check
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ NEWS.md
+ README.md
+ docs/README.cross
+ docs/README.generic
+ docs/README.kernel
+ 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
+ optfeature \
+ "Enable rngd service to help generating entropy early during boot" \
+ sys-apps/rng-tools
+}
diff --git a/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild b/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild
new file mode 100644
index 000000000000..913136a6862b
--- /dev/null
+++ b/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 edo optfeature systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+ if [[ ${PV} == *_p* ]] ; then
+ EGIT_COMMIT="856e7acdb1462803c2517c8d64afb2e34c73c735"
+ SRC_URI="https://github.com/dracutdevs/dracut/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${EGIT_COMMIT}
+ else
+ SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ fi
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ "${PV}" != *_rc* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/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
+ 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
+"
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/dracut-060-fix-resume-hostonly.patch
+ "${FILESDIR}"/dracut-060-systemd-255.patch
+ "${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.patch
+)
+
+src_configure() {
+ local myconf=(
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc"
+ --bashcompletiondir="$(get_bashcompdir)"
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ tc-export CC PKG_CONFIG
+
+ edo ./configure "${myconf[@]}"
+}
+
+src_test() {
+ if [[ ${EUID} != 0 ]]; then
+ # Tests need root privileges, bug #298014
+ ewarn "Skipping tests: Not running as root."
+ elif [[ ! -w /dev/kvm ]]; then
+ ewarn "Skipping tests: Unable to access /dev/kvm."
+ else
+ emake -C test check
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ NEWS.md
+ README.md
+ docs/README.cross
+ docs/README.generic
+ docs/README.kernel
+ 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
+}
diff --git a/sys-kernel/dracut/files/dracut-059-install-new-systemd-hibernate-resume.service.patch b/sys-kernel/dracut/files/dracut-059-install-new-systemd-hibernate-resume.service.patch
new file mode 100644
index 000000000000..124bd6a99440
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-059-install-new-systemd-hibernate-resume.service.patch
@@ -0,0 +1,21 @@
+From https://github.com/dracutdevs/dracut/pull/2527
+From a2fe89116db4b286fbf515f26bd1773b5e6ee8ad Mon Sep 17 00:00:00 2001
+From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+Date: Tue, 26 Sep 2023 09:43:37 +0200
+Subject: [PATCH] fix(resume): add new systemd-hibernate-resume.service
+
+Since https://github.com/systemd/systemd/commit/a628d933, the generator only
+does the initial validation of the system info and then enables the new
+`systemd-hibernate-resume.service`.
+
+Fixes #2513
+--- a/modules.d/95resume/module-setup.sh
++++ b/modules.d/95resume/module-setup.sh
+@@ -44,6 +44,7 @@ install() {
+ if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
+ inst_multiple -o \
+ "$systemdutildir"/system-generators/systemd-hibernate-resume-generator \
++ "$systemdsystemunitdir"/systemd-hibernate-resume.service \
+ "$systemdsystemunitdir"/systemd-hibernate-resume@.service \
+ "$systemdutildir"/systemd-hibernate-resume
+ return 0
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2024-01-15 9:46 Andrew Ammerlaan
0 siblings, 0 replies; 30+ messages in thread
From: Andrew Ammerlaan @ 2024-01-15 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 65715009f5bb805b0c8e029a08c953084be24151
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 09:43:06 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 09:46:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65715009
sys-kernel/dracut: add 060_pre20240104
Add patch to explicitly support grub layout in 50-dracut.install
Ensures that the generated initrd is installed in the "new" way via the
staging area in the grub layout. This prevents accidentally creating
an UKI named initrd, and also ensures that BOOT_ROOT and
KERNEL_INSTALL_INITRD_GENERATOR are respected when the layout is set to grub.
Downstream only since the grub layout for using grub with systemd's
kernel-install is not supported by systemd upstream and therefore this
patch is unlikely to be accepted by dracut upstream.
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/dracut/Manifest | 1 +
sys-kernel/dracut/dracut-060_pre20240104.ebuild | 156 +++++++++++++++++++++
.../dracut/files/dracut-060-grub-layout.patch | 22 +++
3 files changed, 179 insertions(+)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 42415227bfcb..53fa66f5619a 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,3 +1,4 @@
DIST dracut-059.tar.gz 486487 BLAKE2B 86bbe18875cd3507e187b724cab212dc82e1daca7cedf79aeef13c34601adfff72bf2c0ba4c652e715b43c9a16f7be6a4a2b29dc75bef014640e1ec07c8d455b SHA512 196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d
DIST dracut-059_p20231027.tar.gz 491099 BLAKE2B 02c5de4577bc5fc87fd11b7b9760b0f1a4a83ed7ef1fc2de22ea3f9588e9b03b347c1be4f26965d26ab8b88736b0da70e01ecb4a50c2951d1ec4009222aaa97a SHA512 da26c798f8c3856f7b9488278f26f1f392e6f6e1863bd6bb590f940854cde6633a45cf60acf52a2a184a1a47250a23e6ee53cb3f5fa759eb0146a4c0d172c07e
DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cbcb03d33d69b9c3e87a4e2e2d30fa837b3b36949462cec9b06125e824ad82db45bd7516c22a1c84ec6884790b37e9c65ab1 SHA512 0cd2fefcd624758063c77836989260a3d5b0d533004c2395124c8200c31602f5d7d0b8c9491de37ce4afb2c5009b2cf944ddd3bb9e0e11120d84176cb1e7423c
+DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
diff --git a/sys-kernel/dracut/dracut-060_pre20240104.ebuild b/sys-kernel/dracut/dracut-060_pre20240104.ebuild
new file mode 100644
index 000000000000..2cb041b55c0f
--- /dev/null
+++ b/sys-kernel/dracut/dracut-060_pre20240104.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 edo optfeature systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+ if [[ ${PV} == *_p* ]] ; then
+ EGIT_COMMIT="4980bad34775da715a2639b736cba5e65a8a2604"
+ SRC_URI="https://github.com/dracutdevs/dracut/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${EGIT_COMMIT}
+ else
+ SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ fi
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ "${PV}" != *_rc* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+
+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
+ 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
+"
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+ "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/dracut-060-fix-resume-hostonly.patch
+ "${FILESDIR}"/dracut-060-grub-layout.patch
+ "${FILESDIR}"/dracut-060-systemd-255.patch
+ "${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.patch
+)
+
+src_configure() {
+ local myconf=(
+ --prefix="${EPREFIX}/usr"
+ --sysconfdir="${EPREFIX}/etc"
+ --bashcompletiondir="$(get_bashcompdir)"
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ tc-export CC PKG_CONFIG
+
+ edo ./configure "${myconf[@]}"
+}
+
+src_test() {
+ if [[ ${EUID} != 0 ]]; then
+ # Tests need root privileges, bug #298014
+ ewarn "Skipping tests: Not running as root."
+ elif [[ ! -w /dev/kvm ]]; then
+ ewarn "Skipping tests: Unable to access /dev/kvm."
+ else
+ emake -C test check
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ NEWS.md
+ README.md
+ docs/README.cross
+ docs/README.generic
+ docs/README.kernel
+ 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
+}
diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
new file mode 100644
index 000000000000..5d8e9a9fcf9d
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
@@ -0,0 +1,22 @@
+Ensures that the generated initrd is installed in the "new" way via the
+staging area in the grub layout. This prevents accidentally creating
+an UKI named initrd, and also ensures that BOOT_ROOT and
+KERNEL_INSTALL_INITRD_GENERATOR are respected when the layout is set to grub.
+
+Downstream only since the grub layout for using grub with systemd's
+kernel-install is not supported by systemd upstream and therefore this
+patch is unlikely to be accepted by dracut upstream.
+
+diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
+index 441414a..cfd4fe7 100755
+--- a/install.d/50-dracut.install
++++ b/install.d/50-dracut.install
+@@ -30,7 +30,7 @@ if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n $KERNEL_INSTALL_STAGING_AREA ]]; the
+ else
+ exit 0
+ fi
+-elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
++elif [[ $KERNEL_INSTALL_LAYOUT == "bls" || $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
+ BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
+ if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
+ IMAGE="initrd"
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2024-02-02 13:11 Andrew Ammerlaan
0 siblings, 0 replies; 30+ messages in thread
From: Andrew Ammerlaan @ 2024-02-02 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 52477a9c5cfaf1a05816dcb2227e66c8727e6f5c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 2 13:09:10 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 13:11:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52477a9c
sys-kernel/dracut: allow building ukis in the grub layout
do not force --no-uefi just because layout is grub
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...104.ebuild => dracut-060_pre20240104-r1.ebuild} | 0
.../dracut/files/dracut-060-grub-layout.patch | 23 +++++++++++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/sys-kernel/dracut/dracut-060_pre20240104.ebuild b/sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild
similarity index 100%
rename from sys-kernel/dracut/dracut-060_pre20240104.ebuild
rename to sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild
diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
index 5d8e9a9fcf9d..cf292b7168c4 100644
--- a/sys-kernel/dracut/files/dracut-060-grub-layout.patch
+++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
@@ -8,15 +8,24 @@ kernel-install is not supported by systemd upstream and therefore this
patch is unlikely to be accepted by dracut upstream.
diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
-index 441414a..cfd4fe7 100755
+index 441414ac..a98449fe 100755
--- a/install.d/50-dracut.install
+++ b/install.d/50-dracut.install
-@@ -30,7 +30,7 @@ if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n $KERNEL_INSTALL_STAGING_AREA ]]; the
+@@ -38,6 +38,17 @@ elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; t
else
exit 0
fi
--elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
-+elif [[ $KERNEL_INSTALL_LAYOUT == "bls" || $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
- BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
- if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
- IMAGE="initrd"
++elif [[ $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
++ BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
++ if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
++ IMAGE="uki.efi"
++ UEFI_OPTS="--uefi"
++ elif [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
++ IMAGE="initrd"
++ UEFI_OPTS="--no-uefi"
++ else
++ exit 0
++ fi
+ else
+ # No layout information, use users --uefi/--no-uefi preference
+ UEFI_OPTS=""
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2024-02-03 7:43 Andrew Ammerlaan
0 siblings, 0 replies; 30+ messages in thread
From: Andrew Ammerlaan @ 2024-02-03 7:43 UTC (permalink / raw
To: gentoo-commits
commit: 26be7cf12e385a8311b1fec224784844fbf79550
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 07:42:06 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 07:42:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26be7cf1
sys-kernel/dracut: teach dracut about the compat layout
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...racut-060_pre20240104-r1.ebuild => dracut-060_pre20240104-r2.ebuild} | 0
sys-kernel/dracut/files/dracut-060-grub-layout.patch | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild b/sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild
similarity index 100%
rename from sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild
rename to sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild
diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
index cf292b7168c4..b04140fb90b1 100644
--- a/sys-kernel/dracut/files/dracut-060-grub-layout.patch
+++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
@@ -15,7 +15,7 @@ index 441414ac..a98449fe 100755
else
exit 0
fi
-+elif [[ $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
++elif [[ $KERNEL_INSTALL_LAYOUT == "grub" || $KERNEL_INSTALL_LAYOUT == "compat" ]]; then
+ BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
+ if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
+ IMAGE="uki.efi"
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2024-03-17 16:53 Andrew Ammerlaan
0 siblings, 0 replies; 30+ messages in thread
From: Andrew Ammerlaan @ 2024-03-17 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 70ca6a8a482c35a473436ec6c4805c1e3beaa8ce
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 16:50:01 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 16:53:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ca6a8a
sys-kernel/dracut: add efistub as valid layout
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...racut-060_pre20240104-r3.ebuild => dracut-060_pre20240104-r4.ebuild} | 0
sys-kernel/dracut/files/dracut-060-grub-layout.patch | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/dracut/dracut-060_pre20240104-r3.ebuild b/sys-kernel/dracut/dracut-060_pre20240104-r4.ebuild
similarity index 100%
rename from sys-kernel/dracut/dracut-060_pre20240104-r3.ebuild
rename to sys-kernel/dracut/dracut-060_pre20240104-r4.ebuild
diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
index b04140fb90b1..543efa1eef47 100644
--- a/sys-kernel/dracut/files/dracut-060-grub-layout.patch
+++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
@@ -15,7 +15,7 @@ index 441414ac..a98449fe 100755
else
exit 0
fi
-+elif [[ $KERNEL_INSTALL_LAYOUT == "grub" || $KERNEL_INSTALL_LAYOUT == "compat" ]]; then
++elif [[ $KERNEL_INSTALL_LAYOUT == "grub" || $KERNEL_INSTALL_LAYOUT == "compat" || $KERNEL_INSTALL_LAYOUT == "efistub" ]]; then
+ BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
+ if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
+ IMAGE="uki.efi"
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2024-07-14 8:21 Andrew Ammerlaan
0 siblings, 0 replies; 30+ messages in thread
From: Andrew Ammerlaan @ 2024-07-14 8:21 UTC (permalink / raw
To: gentoo-commits
commit: d10cfb6fe35ddaf48dad2a5192ac40899ac0b7a3
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 08:15:50 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 08:15:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d10cfb6f
sys-kernel/dracut: add 103
With patch for Gentoo acct-user and acct-group conf files
Closes: https://bugs.gentoo.org/925524
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/dracut/Manifest | 1 +
.../{dracut-9999.ebuild => dracut-103.ebuild} | 2 ++
sys-kernel/dracut/dracut-9999.ebuild | 2 ++
.../files/dracut-103-acct-user-group-gentoo.patch | 30 ++++++++++++++++++++++
4 files changed, 35 insertions(+)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index af8307fd8db6..24642faecfa4 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -3,3 +3,4 @@ DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cb
DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
DIST dracut-101.tar.gz 556673 BLAKE2B 8780451aeafd3d9fdfcabc8eb077bb44cc6d64d69cd3138e7447985fcf225495caea937269cf4f0a09a10a6ce2202cc10e817777090aac0bb207fec99e1c8bc8 SHA512 827f073b749a374b703f317ba249479312043ed54af82609ce45332c27349870a68a1d9883118e0a3ecd1cbb33d64aca8bcf6aac56eb75f721fd3380bd12005b
DIST dracut-102.tar.gz 559538 BLAKE2B 665f1313c71269856b8e5fd540ecf645844ed196d705122752c9577a00a30e91ad8ce4b3336f49507381e78d381e4b5b9982217cc496200b1c97692fa5c6aea9 SHA512 463ad75f0508392431d58796763a41accf5a1dc17fe27d36e37d588153ca9c5b32b453faa9149524ea2dc2906805126d1e023feecb6554206595a972508f6a32
+DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-103.ebuild
similarity index 97%
copy from sys-kernel/dracut/dracut-9999.ebuild
copy to sys-kernel/dracut/dracut-103.ebuild
index 76bce478b715..02a959fa286d 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-103.ebuild
@@ -63,6 +63,8 @@ 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() {
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 76bce478b715..02a959fa286d 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -63,6 +63,8 @@ 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() {
diff --git a/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch b/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch
new file mode 100644
index 000000000000..045528bb0c45
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch
@@ -0,0 +1,30 @@
+diff --git a/dracut-init.sh b/dracut-init.sh
+index 986da96b..bd47bc92 100755
+--- a/dracut-init.sh
++++ b/dracut-init.sh
+@@ -711,10 +711,10 @@ inst_libdir_file() {
+
+ # install sysusers files
+ inst_sysusers() {
+- inst_multiple -o "$sysusers/$*"
++ inst_multiple -o "$sysusers/acct-*-$*"
+
+ if [[ $hostonly ]]; then
+- inst_multiple -H -o "$sysusersconfdir/$*"
++ inst_multiple -H -o "$sysusersconfdir/acct-*-$*"
+ fi
+ }
+
+diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh
+index 4441f552..4b5654d5 100755
+--- a/modules.d/91tpm2-tss/module-setup.sh
++++ b/modules.d/91tpm2-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 \
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2024-07-16 16:52 Andrew Ammerlaan
0 siblings, 0 replies; 30+ messages in thread
From: Andrew Ammerlaan @ 2024-07-16 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 286138c22e437f22d1ed42726c4988745d8cf5cf
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 16:51:56 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 16:51:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=286138c2
sys-kernel/dracut: backport fix for systemd 256
Closes: https://bugs.gentoo.org/935548
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{dracut-103.ebuild => dracut-103-r1.ebuild} | 2 ++
.../files/dracut-103-systemd-udev-256-kmod.patch | 41 ++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/sys-kernel/dracut/dracut-103.ebuild b/sys-kernel/dracut/dracut-103-r1.ebuild
similarity index 97%
rename from sys-kernel/dracut/dracut-103.ebuild
rename to sys-kernel/dracut/dracut-103-r1.ebuild
index 02a959fa286d..7b5110a6f58d 100644
--- a/sys-kernel/dracut/dracut-103.ebuild
+++ b/sys-kernel/dracut/dracut-103-r1.ebuild
@@ -65,6 +65,8 @@ 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/507
+ "${FILESDIR}"/${PN}-103-systemd-udev-256-kmod.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch b/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch
new file mode 100644
index 000000000000..7a1fc1c8daf3
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch
@@ -0,0 +1,41 @@
+From e16195f28669264227c169d45107ea95b83d8f48 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 16 Jul 2024 08:48:54 +0300
+Subject: [PATCH] fix(systemd): move installation of libkmod to udev-rules
+ module
+
+libkmod library should be installed even if systemd module is
+omitted, so move its installation to udev-rules module.
+---
+ modules.d/00systemd/module-setup.sh | 1 -
+ modules.d/95udev-rules/module-setup.sh | 6 +++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
+index ce7bb520c..e4fb9a586 100755
+--- a/modules.d/00systemd/module-setup.sh
++++ b/modules.d/00systemd/module-setup.sh
+@@ -171,6 +171,5 @@ EOF
+ _arch=${DRACUT_ARCH:-$(uname -m)}
+ inst_libdir_file \
+ {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
+- {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
+ {"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
+ }
+diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
+index d82ed5eb9..6078751f6 100755
+--- a/modules.d/95udev-rules/module-setup.sh
++++ b/modules.d/95udev-rules/module-setup.sh
+@@ -93,7 +93,11 @@ install() {
+ "${udevdir}"/usb_id \
+ "${udevdir}"/v4l_id
+
+- inst_libdir_file "libnss_files*"
++ # Install required libraries.
++ _arch=${DRACUT_ARCH:-$(uname -m)}
++ inst_libdir_file \
++ {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
++ {"tls/$_arch/",tls/,"$_arch/",}"libnss_files*"
+
+ # Install the hosts local user configurations if enabled.
+ if [[ $hostonly ]]; then
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2024-11-09 14:31 Andrew Ammerlaan
0 siblings, 0 replies; 30+ messages in thread
From: Andrew Ammerlaan @ 2024-11-09 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 6fb3d4afd50ab9a7054258e6bb78ea8364b8801a
Author: Nowa Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 14:31:31 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 14:31:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb3d4af
sys-kernel/dracut: backport fix for checking kmods
Signed-off-by: Nowa Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{dracut-105-r1.ebuild => dracut-105-r2.ebuild} | 2 ++
.../files/dracut-105-fix-check_kernel_module.patch | 28 ++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/sys-kernel/dracut/dracut-105-r1.ebuild b/sys-kernel/dracut/dracut-105-r2.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-105-r1.ebuild
rename to sys-kernel/dracut/dracut-105-r2.ebuild
index 70692cd367a4..743a246869b9 100644
--- a/sys-kernel/dracut/dracut-105-r1.ebuild
+++ b/sys-kernel/dracut/dracut-105-r2.ebuild
@@ -101,6 +101,8 @@ PATCHES=(
"${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
+ # https://github.com/dracut-ng/dracut-ng/pull/904
+ "${FILESDIR}"/${PN}-105-fix-check_kernel_module.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch b/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch
new file mode 100644
index 000000000000..e1fc7924c303
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch
@@ -0,0 +1,28 @@
+From b90eda4b431af23d1101f1ea68b656929c6a82b2 Mon Sep 17 00:00:00 2001
+From: Nowa Ammerlaan <andrewammerlaan@gentoo.org>
+Date: Fri, 8 Nov 2024 20:01:54 +0100
+Subject: [PATCH] fix(dracut-functions.sh): check for modules in --kmoddir, not
+ in --sysroot
+
+Modules are installed from the directory specified by --kmoddir, but currently
+the check_kernel_module() function is checking for the module in
+--sysroot/lib/modules. This is notably not the same when kernels packages are
+being built inside some docker container. We should check for the modules
+existence in the directory we are actually going to install it from.
+---
+ dracut-functions.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 865c31290..245c69cb6 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -761,7 +761,7 @@ check_kernel_config() {
+ # 0 if the kernel module is either built-in or available
+ # 1 if the kernel module is not enabled
+ check_kernel_module() {
+- modprobe -d "$dracutsysrootdir" -S "$kernel" --dry-run "$1" &> /dev/null || return 1
++ modprobe -d "$drivers_dir/../../" -S "$kernel" --dry-run "$1" &> /dev/null || return 1
+ }
+
+ # get_cpu_vendor
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/
@ 2024-11-14 18:15 Nowa Ammerlaan
0 siblings, 0 replies; 30+ messages in thread
From: Nowa Ammerlaan @ 2024-11-14 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 77f2f3a6f08067dfad9819c766099692b2e99600
Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 18:13:57 2024 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 18:13:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f2f3a6
sys-kernel/dracut: fixup finding kmods when --kmoddir specified
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
sys-kernel/dracut/{dracut-105-r3.ebuild => dracut-105-r4.ebuild} | 0
sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/dracut/dracut-105-r3.ebuild b/sys-kernel/dracut/dracut-105-r4.ebuild
similarity index 100%
rename from sys-kernel/dracut/dracut-105-r3.ebuild
rename to sys-kernel/dracut/dracut-105-r4.ebuild
diff --git a/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch b/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch
index e1fc7924c303..558bd388b964 100644
--- a/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch
+++ b/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch
@@ -22,7 +22,7 @@ index 865c31290..245c69cb6 100755
# 1 if the kernel module is not enabled
check_kernel_module() {
- modprobe -d "$dracutsysrootdir" -S "$kernel" --dry-run "$1" &> /dev/null || return 1
-+ modprobe -d "$drivers_dir/../../" -S "$kernel" --dry-run "$1" &> /dev/null || return 1
++ modprobe -d "$drivers_dir/../../../" -S "$kernel" --dry-run "$1" &> /dev/null || return 1
}
# get_cpu_vendor
^ permalink raw reply related [flat|nested] 30+ messages in thread
end of thread, other threads:[~2024-11-14 18:15 UTC | newest]
Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-16 16:52 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2024-11-14 18:15 Nowa Ammerlaan
2024-11-09 14:31 Andrew Ammerlaan
2024-07-14 8:21 Andrew Ammerlaan
2024-03-17 16:53 Andrew Ammerlaan
2024-02-03 7:43 Andrew Ammerlaan
2024-02-02 13:11 Andrew Ammerlaan
2024-01-15 9:46 Andrew Ammerlaan
2023-12-20 7:43 Florian Schmaus
2023-12-12 19:07 Mike Gilbert
2023-11-09 16:09 Mike Gilbert
2023-11-09 2:37 Mike Gilbert
2023-05-26 20:27 Mike Gilbert
2022-12-23 23:21 Mike Gilbert
2022-07-05 14:30 Mike Gilbert
2022-07-04 23:29 Mike Gilbert
2022-06-07 23:47 Sam James
2022-05-29 1:39 Mike Gilbert
2021-07-23 19:16 Mike Gilbert
2021-06-17 15:02 Mike Gilbert
2020-12-20 17:27 Mike Gilbert
2020-12-15 20:49 Mike Gilbert
2020-12-15 20:49 Mike Gilbert
2020-08-07 16:59 Mike Gilbert
2020-03-10 19:50 Mike Gilbert
2018-10-09 19:23 Mike Gilbert
2018-01-07 16:56 Mike Gilbert
2017-07-04 2:52 Mike Gilbert
2015-08-16 10:36 Amadeusz Żołnowski
2015-08-12 23:09 Amadeusz Żołnowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox