[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 32774e9d9e056831857e7aaf6aeed10498e9de39
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Dec 13 09:17:35 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Dec 13 09:17:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32774e9d
sys-kernel/dracut: backport fix for systemd-255 pcrphase
Signed-off-by: Andrew Ammerlaan gentoo.org>
...030.ebuild => dracut-060_pre20231030-r1.ebuild} | 1 +
.../dracut/files/dracut-060-systemd-255.patch | 26 ++
2 files changed, 27 insertions(+)
diff --git a/sys-kernel/dracut/dracut-060_pre20231030.ebuild
b/sys-kernel/dracut/dracut-060_pre20231030-r1.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-060_pre20231030.ebuild
rename to sys-kernel/dracut/dracut-060_pre20231030-r1.ebuild
index 639d28605329..cdb6f8ce433f 100644
--- a/sys-kernel/dracut/dracut-060_pre20231030.ebuild
+++ b/sys-kernel/dracut/dracut-060_pre20231030-r1.ebuild
@@ -69,6 +69,7 @@ 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
)
src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-060-systemd-255.patch
b/sys-kernel/dracut/files/dracut-060-systemd-255.patch
new file mode 100644
index ..9d577e9504da
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-060-systemd-255.patch
@@ -0,0 +1,26 @@
+https://github.com/dracutdevs/dracut/pull/2586/files
+diff --git a/modules.d/01systemd-pcrphase/module-setup.sh
b/modules.d/01systemd-pcrphase/module-setup.sh
+index fa960a42c1..87efd0c1a6 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
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: a0ff41c3e81b6adb74bea3c15ce7e894753eef6b
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Thu Sep 21 08:54:47 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Fri Sep 22 06:10:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ff41c3
sys-kernel/dracut: backport uki kernel-install fixes
Fixes installing manually configured kernel in uki layout and
allows dropping workaround from dist-kernel-utils.eclass
Provides compatibility with systemd-254's ukify plugin
Signed-off-by: Andrew Ammerlaan gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/32961
Signed-off-by: Andrew Ammerlaan gentoo.org>
sys-kernel/dracut/dracut-059-r4.ebuild | 185 +
.../dracut/files/059-kernel-install-uki.patch | 150 +
2 files changed, 335 insertions(+)
diff --git a/sys-kernel/dracut/dracut-059-r4.ebuild
b/sys-kernel/dracut/dracut-059-r4.ebuild
new file mode 100644
index ..90c42349d4a5
--- /dev/null
+++ b/sys-kernel/dracut/dracut-059-r4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2023 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} == ]] ; 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
+)
+
+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} != && ! -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
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 2711de74b3c4967cd16a7b2760aff3de1acdd69e
Author: Sam James gentoo org>
AuthorDate: Thu Jul 20 03:39:11 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 20 03:39:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2711de74
sys-kernel/dracut: backport UKI fix w/ systemd-254
Fails to boot otherwise.
Signed-off-by: Sam James gentoo.org>
sys-kernel/dracut/dracut-059-r3.ebuild| 184 ++
sys-kernel/dracut/files/059-gawk.patch| 35
sys-kernel/dracut/files/059-uki-systemd-254.patch | 134
3 files changed, 353 insertions(+)
diff --git a/sys-kernel/dracut/dracut-059-r3.ebuild
b/sys-kernel/dracut/dracut-059-r3.ebuild
new file mode 100644
index ..6d27123ec55b
--- /dev/null
+++ b/sys-kernel/dracut/dracut-059-r3.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2023 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} == ]] ; 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-uefi-split-usr.patch
+ "${FILESDIR}"/059-uki-systemd-254.patch
+ "${FILESDIR}"/059-gawk.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} != && ! -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
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: e8f8be11a5cb38c954d54615d0a31c0378bf88f5
Author: Mike Gilbert gentoo org>
AuthorDate: Fri May 26 20:02:07 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri May 26 20:02:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f8be11
sys-kernel/dracut: fix uefi stub path for split-usr
Closes: https://bugs.gentoo.org/765208
Signed-off-by: Mike Gilbert gentoo.org>
.../{dracut-059.ebuild => dracut-059-r1.ebuild}| 1 +
sys-kernel/dracut/files/059-uefi-split-usr.patch | 46 ++
2 files changed, 47 insertions(+)
diff --git a/sys-kernel/dracut/dracut-059.ebuild
b/sys-kernel/dracut/dracut-059-r1.ebuild
similarity index 99%
rename from sys-kernel/dracut/dracut-059.ebuild
rename to sys-kernel/dracut/dracut-059-r1.ebuild
index 20f297121ad8..5aa6cfb4a241 100644
--- a/sys-kernel/dracut/dracut-059.ebuild
+++ b/sys-kernel/dracut/dracut-059-r1.ebuild
@@ -64,6 +64,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
"${FILESDIR}"/gentoo-network-r1.patch
+ "${FILESDIR}"/059-uefi-split-usr.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/059-uefi-split-usr.patch
b/sys-kernel/dracut/files/059-uefi-split-usr.patch
new file mode 100644
index ..1b1f1348a223
--- /dev/null
+++ b/sys-kernel/dracut/files/059-uefi-split-usr.patch
@@ -0,0 +1,46 @@
+https://github.com/dracutdevs/dracut/pull/2365
+
+From afb2019ddc6ffe6e59df3d3dc9929a840bd09bc8 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Fri, 26 May 2023 15:56:45 -0400
+Subject: [PATCH] Fix path to UEFI stub on split-usr systems
+
+systemd always installs the UEFI stub in ${prefix}/lib/systemd/boot/efi.
+
+On split-usr systems, systemdutildir is ${rootprefix}/lib/systemd, which
+makes dracut look in the wrong place.
+
+Instead, grab 'prefix' from systemd.pc and store it in 'systemd_prefix'.
+
+Bug: https://bugs.gentoo.org/765208
+Signed-off-by: Mike Gilbert
+---
+ dracut.sh | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index bbb34697..9da59561 100755
+--- a/dracut.sh
b/dracut.sh
+@@ -1389,6 +1389,9 @@ esac
+
+ abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
+
++[[ -n $systemd_prefix ]] \
++|| systemd_prefix=$(pkg-config systemd --variable=prefix 2> /dev/null)
++
+ [[ -d $dracutsysrootdir$systemdutildir ]] \
+ || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>
/dev/null)
+
+@@ -1467,7 +1470,7 @@ if [[ ! $print_cmdline ]]; then
+ esac
+
+ if ! [[ -s $uefi_stub ]]; then
+-
uefi_stub="$dracutsysrootdir${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
++
uefi_stub="$dracutsysrootdir${systemd_prefix}/lib/systemd/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
+ fi
+
+ if ! [[ -s $uefi_stub ]]; then
+--
+2.40.1
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: d16cdc9c9eb5826a704dc71fd6838a24d83a1172
Author: Laszlo Gombos gmail com>
AuthorDate: Sat Dec 24 02:02:14 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Dec 25 02:53:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16cdc9c
sys-kernel/dracut: when no systemd then only network-legacy is supported
Bug: https://github.com/dracutdevs/dracut/issues/1756
Signed-off-by: Laszlo Gombos gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28777
Signed-off-by: Mike Gilbert gentoo.org>
sys-kernel/dracut/dracut-057-r2.ebuild | 1 +
sys-kernel/dracut/dracut-.ebuild| 1 +
sys-kernel/dracut/files/gentoo-network-r1.patch | 29 +
3 files changed, 31 insertions(+)
diff --git a/sys-kernel/dracut/dracut-057-r2.ebuild
b/sys-kernel/dracut/dracut-057-r2.ebuild
index 5a6ec27fcb43..ddb9e967acd8 100644
--- a/sys-kernel/dracut/dracut-057-r2.ebuild
+++ b/sys-kernel/dracut/dracut-057-r2.ebuild
@@ -63,6 +63,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/gentoo-network-r1.patch
"${FILESDIR}"/057-virtiofs-split-usr.patch
"${FILESDIR}"/057-i18n-keymaps.patch
)
diff --git a/sys-kernel/dracut/dracut-.ebuild
b/sys-kernel/dracut/dracut-.ebuild
index 7f2f0151787d..40d636fee825 100644
--- a/sys-kernel/dracut/dracut-.ebuild
+++ b/sys-kernel/dracut/dracut-.ebuild
@@ -63,6 +63,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+ "${FILESDIR}"/gentoo-network-r1.patch
)
src_configure() {
diff --git a/sys-kernel/dracut/files/gentoo-network-r1.patch
b/sys-kernel/dracut/files/gentoo-network-r1.patch
new file mode 100644
index ..3d5db25cb0ae
--- /dev/null
+++ b/sys-kernel/dracut/files/gentoo-network-r1.patch
@@ -0,0 +1,29 @@
+From 5443396f3cb591f2589888b25e07f21f03989057 Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos
+Date: Sat, 24 Dec 2022 01:48:04 +
+Subject: [PATCH] When no systemd then only network-legacy is supported
+
+Bug: https://github.com/dracutdevs/dracut/issues/1756
+---
+ 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 1ab13ef..da49947 100755
+--- a/modules.d/40network/module-setup.sh
b/modules.d/40network/module-setup.sh
+@@ -16,6 +16,11 @@ depends() {
+ fi
+ done
+
++# When systemd is not available only network-legacy is supported
++if [ -z "$network_handler" ] && ! find_binary systemctl > /dev/null; then
++network_handler="network-legacy"
++fi
++
+ if [ -z "$network_handler" ]; then
+ if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]];
then
+ network_handler="network-wicked"
+--
+2.34.1
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: a50ce1b8021417323405d8526e104248b07d86b8
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Dec 27 16:51:09 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Dec 27 16:51:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50ce1b8
sys-kernel/dracut: backport a patch
Signed-off-by: Mike Gilbert gentoo.org>
.../{dracut-055-r3.ebuild => dracut-055-r4.ebuild} | 1 +
sys-kernel/dracut/files/055-add-blockfuncs.patch | 25 ++
2 files changed, 26 insertions(+)
diff --git a/sys-kernel/dracut/dracut-055-r3.ebuild
b/sys-kernel/dracut/dracut-055-r4.ebuild
similarity index 99%
rename from sys-kernel/dracut/dracut-055-r3.ebuild
rename to sys-kernel/dracut/dracut-055-r4.ebuild
index b6ae9af423ff..607fff23c894 100644
--- a/sys-kernel/dracut/dracut-055-r3.ebuild
+++ b/sys-kernel/dracut/dracut-055-r4.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${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
)
diff --git a/sys-kernel/dracut/files/055-add-blockfuncs.patch
b/sys-kernel/dracut/files/055-add-blockfuncs.patch
new file mode 100644
index ..56724e0c73aa
--- /dev/null
+++ b/sys-kernel/dracut/files/055-add-blockfuncs.patch
@@ -0,0 +1,25 @@
+From a91dcfeb54b8c6c810020f77124f6eaf6ef5baa9 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn
+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() {
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 087f6ff3f00a4e0a84bec0278fcb8228d7d9aa12
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Sep 6 00:13:58 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Sep 6 00:13:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=087f6ff3
sys-kernel/dracut: fix typo in tpm2-tss module
Signed-off-by: Mike Gilbert gentoo.org>
.../{dracut-055-r2.ebuild => dracut-055-r3.ebuild} | 1 +
sys-kernel/dracut/files/055-tpm2-tss-typo.patch| 23 ++
2 files changed, 24 insertions(+)
diff --git a/sys-kernel/dracut/dracut-055-r2.ebuild
b/sys-kernel/dracut/dracut-055-r3.ebuild
similarity index 99%
rename from sys-kernel/dracut/dracut-055-r2.ebuild
rename to sys-kernel/dracut/dracut-055-r3.ebuild
index 5d3767efdfc..cdc58e186f3 100644
--- a/sys-kernel/dracut/dracut-055-r2.ebuild
+++ b/sys-kernel/dracut/dracut-055-r3.ebuild
@@ -63,6 +63,7 @@ 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}"/gentoo-ldconfig-paths-r1.patch
)
diff --git a/sys-kernel/dracut/files/055-tpm2-tss-typo.patch
b/sys-kernel/dracut/files/055-tpm2-tss-typo.patch
new file mode 100644
index 000..a04496a29ca
--- /dev/null
+++ b/sys-kernel/dracut/files/055-tpm2-tss-typo.patch
@@ -0,0 +1,23 @@
+From 8b17105bed69ed90582a13d97d95ee19e6581365 Mon Sep 17 00:00:00 2001
+From: Matthias Berndt
+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
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 85685d7b73395bddcf58a7550a0220ee9175e3f2
Author: Alexander Tsoy tsoy me>
AuthorDate: Tue Aug 17 10:51:21 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Aug 17 17:23:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85685d7b
sys-kernel/dracut: fix usr mount regression
Closes: https://bugs.gentoo.org/807971
Signed-off-by: Alexander Tsoy tsoy.me>
Signed-off-by: Mike Gilbert gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22009
.../{dracut-055-r1.ebuild => dracut-055-r2.ebuild} | 1 +
...5-fix-usrmount-do-not-empty-_dev-variable.patch | 36 ++
2 files changed, 37 insertions(+)
diff --git a/sys-kernel/dracut/dracut-055-r1.ebuild
b/sys-kernel/dracut/dracut-055-r2.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-055-r1.ebuild
rename to sys-kernel/dracut/dracut-055-r2.ebuild
index e45745cf50f..5d3767efdfc 100644
--- a/sys-kernel/dracut/dracut-055-r1.ebuild
+++ b/sys-kernel/dracut/dracut-055-r2.ebuild
@@ -62,6 +62,7 @@ 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}"/gentoo-ldconfig-paths-r1.patch
)
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
new file mode 100644
index 000..e46f8bb25db
--- /dev/null
+++ b/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch
@@ -0,0 +1,36 @@
+From 4afdcba212793f136aea012b30dd7bdb5b641a5a Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy
+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
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: b11a0316d954d186df8c61aee62402ff6026c7dc
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Jul 23 19:13:04 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Jul 23 19:13:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11a0316
sys-kernel/dracut: fix quoting issues
Closes: https://bugs.gentoo.org/803548
Signed-off-by: Mike Gilbert gentoo.org>
.../{dracut-055.ebuild => dracut-055-r1.ebuild}| 2 ++
...ase-do-not-quote-initargs-for-switch_root.patch | 32 ++
...x-crypt-remove-quotes-from-cryptsetupopts.patch | 39 ++
3 files changed, 73 insertions(+)
diff --git a/sys-kernel/dracut/dracut-055.ebuild
b/sys-kernel/dracut/dracut-055-r1.ebuild
similarity index 97%
rename from sys-kernel/dracut/dracut-055.ebuild
rename to sys-kernel/dracut/dracut-055-r1.ebuild
index 3b042f3de74..e45745cf50f 100644
--- a/sys-kernel/dracut/dracut-055.ebuild
+++ b/sys-kernel/dracut/dracut-055-r1.ebuild
@@ -60,6 +60,8 @@ BDEPEND="
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}"/gentoo-ldconfig-paths-r1.patch
)
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
new file mode 100644
index 000..5568c22aede
--- /dev/null
+++
b/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch
@@ -0,0 +1,32 @@
+From 285e2ad01035743ff51005a74e486e09fcbb0a0d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+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
new file mode 100644
index 000..355cdc461ab
--- /dev/null
+++
b/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
@@ -0,0 +1,39 @@
+From e0abf88a15d23fbf793cf872397016ad86aeaaa8 Mon Sep 17 00:00:00 2001
+From: lapseofreason
+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
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: e673f765070d823bd11c6099de4a4798fed9592b
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Jun 14 18:27:32 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jun 14 18:42:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e673f765
sys-kernel/dracut: bump to 055
Signed-off-by: Mike Gilbert gentoo.org>
sys-kernel/dracut/Manifest | 1 +
.../{dracut-.ebuild => dracut-055.ebuild} | 34 +--
sys-kernel/dracut/dracut-.ebuild | 34 +--
.../dracut/files/gentoo-ldconfig-paths-r1.patch| 39 ++
4 files changed, 88 insertions(+), 20 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 1f7643564be..6aa82815479 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,3 +1,4 @@
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-.ebuild
b/sys-kernel/dracut/dracut-055.ebuild
similarity index 90%
copy from sys-kernel/dracut/dracut-.ebuild
copy to sys-kernel/dracut/dracut-055.ebuild
index e6d09f406d0..3b042f3de74 100644
--- a/sys-kernel/dracut/dracut-.ebuild
+++ b/sys-kernel/dracut/dracut-055.ebuild
@@ -19,10 +19,9 @@ HOMEPAGE="https://dracut.wiki.kernel.org;
LICENSE="GPL-2"
SLOT="0"
-IUSE="selinux"
+IUSE="selinux test"
-# Tests need root privileges, bug #298014
-RESTRICT="test"
+RESTRICT="!test? ( test )"
RDEPEND="
app-arch/cpio
@@ -58,13 +57,10 @@ BDEPEND="
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}"/gentoo-ldconfig-paths.patch
+ "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
)
src_configure() {
@@ -86,11 +82,29 @@ src_configure() {
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() {
- default
+ local DOCS=(
+ AUTHORS
+ NEWS.md
+ README.md
+ docs/README.cross
+ docs/README.generic
+ docs/README.kernel
+ docs/SECURITY.md
+ )
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
+ default
docinto html
dodoc dracut.html
diff --git a/sys-kernel/dracut/dracut-.ebuild
b/sys-kernel/dracut/dracut-.ebuild
index e6d09f406d0..3b042f3de74 100644
--- a/sys-kernel/dracut/dracut-.ebuild
+++ b/sys-kernel/dracut/dracut-.ebuild
@@ -19,10 +19,9 @@ HOMEPAGE="https://dracut.wiki.kernel.org;
LICENSE="GPL-2"
SLOT="0"
-IUSE="selinux"
+IUSE="selinux test"
-# Tests need root privileges, bug #298014
-RESTRICT="test"
+RESTRICT="!test? ( test )"
RDEPEND="
app-arch/cpio
@@ -58,13 +57,10 @@ BDEPEND="
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}"/gentoo-ldconfig-paths.patch
+ "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
)
src_configure() {
@@ -86,11 +82,29 @@ src_configure() {
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:
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 88969ec3eacbd206d0f694bd865554f945dc6986
Author: Alexander Tsoy tsoy me>
AuthorDate: Wed Jun 24 14:46:47 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Jul 3 11:17:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88969ec3
sys-kernel/dracut: Apply fix for busybox module to 050
Closes: https://bugs.gentoo.org/714838
Signed-off-by: Alexander Tsoy tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/16394
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-kernel/dracut/dracut-050-r1.ebuild | 166 +
.../dracut/files/050-busybox-module-fix.patch | 102 +
2 files changed, 268 insertions(+)
diff --git a/sys-kernel/dracut/dracut-050-r1.ebuild
b/sys-kernel/dracut/dracut-050-r1.ebuild
new file mode 100644
index 000..3b43c5fefe6
--- /dev/null
+++ b/sys-kernel/dracut/dracut-050-r1.ebuild
@@ -0,0 +1,166 @@
+# 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} == ]] ; 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} != && ! -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 "
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 4963c4ebb04f862691cbb8a769709d34e86eb953
Author: Alexander Tsoy tsoy me>
AuthorDate: Mon Mar 9 23:21:19 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Mar 10 19:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4963c4eb
sys-kernel/dracut: Version bump to 050
* Switch back to tarballs from kernel.org
* Remove redundant gcc paths in ldconfig_paths()
Closes: https://bugs.gentoo.org/705728
Signed-off-by: Alexander Tsoy tsoy.me>
Signed-off-by: Mike Gilbert gentoo.org>
sys-kernel/dracut/Manifest | 1 +
sys-kernel/dracut/dracut-050.ebuild| 165 +
.../files/050-Makefile-fix-VERSION-again.patch | 34 +
...erge-main-version-and-git-version-earlier.patch | 78 ++
...on-t-call-fsfreeze-on-subvol-of-root-file.patch | 75 ++
.../dracut/files/050-gentoo-ldconfig-paths.patch | 39 +
6 files changed, 392 insertions(+)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 7b97320d25d..a2441ad9a7f 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -4,3 +4,4 @@ DIST dracut-046.tar.xz 299520 BLAKE2B
1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4
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-050.ebuild
b/sys-kernel/dracut/dracut-050.ebuild
new file mode 100644
index 000..5b09940bf76
--- /dev/null
+++ b/sys-kernel/dracut/dracut-050.ebuild
@@ -0,0 +1,165 @@
+# 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} == ]] ; 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)"
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 980830b7e4a2953550338f13dd8525bcad28d8fc
Author: Alexander Tsoy tsoy me>
AuthorDate: Thu Dec 26 14:26:15 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Dec 29 19:36:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980830b7
sys-kernel/dracut: Add a bunch of upstream patches
* fix dracut-install crashes
* install kernel module dependencies of dependencies
* add support for compressed firmware files
* add support for rngd service
* bash-5 compatibility
* add fts-standalone dependency and configure check for musl
* fix udevdir detection
Closes: https://bugs.gentoo.org/676268
Closes: https://bugs.gentoo.org/677788
Closes: https://bugs.gentoo.org/687602
Bug: https://bugs.gentoo.org/703438
Signed-off-by: Alexander Tsoy tsoy.me>
Signed-off-by: Mike Gilbert gentoo.org>
sys-kernel/dracut/dracut-049-r3.ebuild | 176 +
...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 +++
...dule-running-early-during-boot-to-help-ge.patch | 88 +++
13 files changed, 860 insertions(+)
diff --git a/sys-kernel/dracut/dracut-049-r3.ebuild
b/sys-kernel/dracut/dracut-049-r3.ebuild
new file mode 100644
index 000..326820abb62
--- /dev/null
+++ b/sys-kernel/dracut/dracut-049-r3.ebuild
@@ -0,0 +1,176 @@
+# 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} == ]] ; 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"
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 3a5005c33678f26a1477a49e791f89a8480c523a
Author: Alexander Tsoy tsoy me>
AuthorDate: Fri Jan 11 18:40:03 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jan 21 14:23:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5005c3
sys-kernel/dracut: version bump to 049
Bug: https://bugs.gentoo.org/602122
Bug: https://bugs.gentoo.org/670450
Closes: https://github.com/gentoo/gentoo/pull/10808
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Alexander Tsoy tsoy.me>
Signed-off-by: Mike Gilbert gentoo.org>
sys-kernel/dracut/Manifest | 1 +
sys-kernel/dracut/dracut-049.ebuild| 158 +
...etwork-Don-t-include-40network-by-default.patch | 34 +
...49-remove-bashism-in-various-boot-scripts.patch | 89
4 files changed, 282 insertions(+)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index cac868159ce..7b97320d25d 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -3,3 +3,4 @@ DIST dracut-045.tar.xz 292652 BLAKE2B
0e7c57ddca6757d59823afdc4ff23dcb06cc9cec31
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
diff --git a/sys-kernel/dracut/dracut-049.ebuild
b/sys-kernel/dracut/dracut-049.ebuild
new file mode 100644
index 000..dda60561bf7
--- /dev/null
+++ b/sys-kernel/dracut/dracut-049.ebuild
@@ -0,0 +1,158 @@
+# 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
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: c9943a36849687a41b3feec6d6a7de5715da
Author: Alexander Tsoy tsoy me>
AuthorDate: Fri Mar 23 14:45:25 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat Mar 24 18:02:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9943a36
sys-kernel/dracut: add upstream patches
Fixes the following issues:
- issues found by shellcheck
- broken plymouth directory detection
Closes: https://bugs.gentoo.org/651132
.../{dracut-047.ebuild => dracut-047-r1.ebuild}| 2 +
.../047-all-fix-issues-found-by-shellcheck.patch | 77 ++
...mouth-fix-detection-of-plymouth-directory.patch | 31 +
3 files changed, 110 insertions(+)
diff --git a/sys-kernel/dracut/dracut-047.ebuild
b/sys-kernel/dracut/dracut-047-r1.ebuild
similarity index 97%
rename from sys-kernel/dracut/dracut-047.ebuild
rename to sys-kernel/dracut/dracut-047-r1.ebuild
index b37520c7e9f..0ced6bdb8d9 100644
--- a/sys-kernel/dracut/dracut-047.ebuild
+++ b/sys-kernel/dracut/dracut-047-r1.ebuild
@@ -52,6 +52,8 @@ 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() {
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
new file mode 100644
index 000..d5cbe042b63
--- /dev/null
+++ b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch
@@ -0,0 +1,77 @@
+From 3aa37cafde734719f2377600a17459fad30edfbc Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn
+Date: Fri, 2 Mar 2018 12:29:46 +0100
+Subject: [PATCH 06/14] all: fix issues found by shellcheck
+To:
+
+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
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 8a7aca3ac5f9df6d2782e53a7ead3620ab56f9b0
Author: Patrick McLean gentoo org>
AuthorDate: Thu Feb 9 18:41:50 2017 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Feb 9 18:47:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7aca3a
sys-kernel/dracut: Revision bump, add patches for bash-4.4
Gentoo-Bug: 594834
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-kernel/dracut/dracut-044-r2.ebuild | 263 +
sys-kernel/dracut/files/dracut-044-bash-4.4.patch | 80 +++
.../dracut-044-preserve-xattrs-when-copying.patch | 51
3 files changed, 394 insertions(+)
diff --git a/sys-kernel/dracut/dracut-044-r2.ebuild
b/sys-kernel/dracut/dracut-044-r2.ebuild
new file mode 100644
index 00..394da6ea72
--- /dev/null
+++ b/sys-kernel/dracut/dracut-044-r2.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info toolchain-funcs systemd
+
+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 ~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
+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="$(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}\"" \
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 991b1645a9b9f46b55a3eaee3ef7abcbbca2533a
Author: Patrick McLean gentoo org>
AuthorDate: Thu Feb 9 18:45:28 2017 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Feb 9 18:47:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991b1645
sys-kernel/dracut: Remove old versions
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-kernel/dracut/Manifest | 3 -
sys-kernel/dracut/dracut-040-r3.ebuild | 254 ---
sys-kernel/dracut/dracut-041-r3.ebuild | 262
sys-kernel/dracut/dracut-043-r2.ebuild | 261 ---
sys-kernel/dracut/dracut-044.ebuild| 253 ---
...01-dracut.sh-do-not-bail-out-if-kernel-mo.patch | 42
...02-dracut-functions.sh-support-for-altern.patch | 41 ---
...03-gentoo.conf-let-udevdir-be-handled-by-.patch | 30 ---
...04-Use-the-same-paths-in-dracut.sh-as-tho.patch | 74 --
...05-Install-dracut-install-into-libexec-di.patch | 81 --
...006-resume-fix-swap-detection-in-hostonly.patch | 31 ---
...07-dracut.sh-also-mkdir-run-lock-which-is.patch | 25 --
...08-dracut.sh-no-need-to-make-subdirs-in-r.patch | 25 --
...09-lvm-install-thin-utils-for-non-hostonl.patch | 41 ---
.../files/034-0011-lvm-fix-thin-recognition.patch | 40 ---
...012-lvm-always-install-thin-utils-for-lvm.patch | 79 --
.../files/034-0013-usrmount-always-install.patch | 31 ---
.../034-0014-udev-rules-add-eudev-rules.patch | 29 ---
...01-dracut-functions.sh-support-for-altern.patch | 41 ---
...02-gentoo.conf-let-udevdir-be-handled-by-.patch | 30 ---
...03-Use-the-same-paths-in-dracut.sh-as-tho.patch | 74 --
...04-Install-dracut-install-into-libexec-di.patch | 81 --
.../dracut/files/040-0005-NEWS-add-040-entry.patch | 25 --
...06-Don-t-pass-rsyncable-option-to-gzip-Ge.patch | 26 --
...07-Take-into-account-lib64-dirs-when-dete.patch | 44
...01-Use-the-same-paths-in-dracut.sh-as-tho.patch | 74 --
...02-Install-dracut-install-and-skipcpio-in.patch | 125 --
...03-Take-into-account-lib64-dirs-when-dete.patch | 60 -
.../dracut/files/041-0004-Portability-fixes.patch | 63 -
...41-0005-base-dracut-lib.sh-remove-bashism.patch | 27 --
...01-Revert-lvm-Don-t-activate-LVs-with-act.patch | 33 ---
...02-Replace-echo-n-with-printf-in-code-wit.patch | 275 -
...03-syncheck-Look-for-echo-n-usage-in-modu.patch | 26 --
...04-dracut-initramfs-restore-make-mount-er.patch | 28 ---
34 files changed, 2634 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 8d50caa9a0..6525882cc1 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,4 +1 @@
-DIST dracut-040.tar.xz 263944 SHA256
b6e743353804b46e350177b9ecb9a8511df7e8c4ff9e0b4f3b4f72bc509c98a3 SHA512
6bc6a714572cc18c4cf9f9c1af4bc787287554ead1e39fbec8a1b8986585cf8c7c7ef476f87fc361f565eb344fe2594d63185ffe02cc5fa7cc3eaa03bcb4b72b
WHIRLPOOL
d8dbdbf6cb7705a0b7793f82a0323c49b4ac0dc3d61cf0073e3061f34af0b5c92dd21a7dc080f2a8d24d3eef3abc99df91f113675721267352f934f1319c66ba
-DIST dracut-041.tar.xz 268288 SHA256
8ece6c2240bf0e9283e5f717b65dfcd6830b3ef7f8d1c01b60014052f1063251 SHA512
358444588febfc482627eb5423b8a87b588ed3842ae814b9f88d8c5dfec28419f2aea92cd54c11c4949b9968d60d7e05ba9cfea78d26d2dc6f2a943a38b28dac
WHIRLPOOL
ab538fe1ffeb3d43185c6222a6e65af8c684b292be571e0571fdd69011f654c3093f3a2256f3003d5dbaf07d0a26f83d82055885bae1868738ad15dc74982e72
-DIST dracut-043.tar.xz 272744 SHA256
1484b558ed20330125aa04dcccab84da15c5689e19068285aa011f7177889cd1 SHA512
a36271e1ed4c1205a01bece7652095a8bfd722bcf7239a93baeb21e7e0a60fa86dd6657aa69b594241981056c87c6fe9d372f18ac045785122a9cafe8b0c31eb
WHIRLPOOL
d1efd59e2c41478e489d4707114b141e8bb0501c54209e364edc2060d3ffac7f2e1afd640b0812a452e7fbe7f9134e5e96436f0f1f2a54613d9468f9dca61a0c
DIST dracut-044.tar.xz 280004 SHA256
84b97c9b0120e9fde06c3b9cf2ede1c4632cccd8e085e980b9ec9c788655af05 SHA512
bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d
WHIRLPOOL
684591df596fa902447e671adfaeeb8cdc469c257f756616e42747835b71be7caaac9c72bd4b1a5ba5728ec4332baaba1d265cddb1c30cbfa65cf4dce0690bc0
diff --git a/sys-kernel/dracut/dracut-040-r3.ebuild
b/sys-kernel/dracut/dracut-040-r3.ebuild
deleted file mode 100644
index cc3554d189..00
--- a/sys-kernel/dracut/dracut-040-r3.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info multilib systemd
-
-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 ~ppc ~ppc64
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 9c93a9970c02f14ba821fae6850868f83e75579a
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Nov 4 18:37:27 2016 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Nov 4 18:39:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c93a997
sys-kernel/dracut: apply a few patches
Bug: https://bugs.gentoo.org/544438#c5
Bug: https://bugs.gentoo.org/586254
Bug: https://github.com/dracutdevs/dracut/pull/169
Package-Manager: portage-2.3.2_p4
sys-kernel/dracut/dracut-044-r1.ebuild | 263 +
...-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 ++
4 files changed, 342 insertions(+)
diff --git a/sys-kernel/dracut/dracut-044-r1.ebuild
b/sys-kernel/dracut/dracut-044-r1.ebuild
new file mode 100644
index ..c873fd6
--- /dev/null
+++ b/sys-kernel/dracut/dracut-044-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils linux-info multilib systemd
+
+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 ~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
+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}\"" \
+
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
commit: 8c578d67d48c971ba1cc438e610b5158eb247d76
Author: Amadeusz Żołnowski aidecoe AT gentoo DOT org
AuthorDate: Sun Aug 16 09:58:26 2015 +
Commit: Amadeusz Żołnowski aidecoe AT gentoo DOT org
CommitDate: Sun Aug 16 09:58:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c578d67
sys-kernel/dracut: Add patches removing non-portable use of `echo -n`
Gentoo-Bug: 554750
Package-Manager: portage-2.2.20.1
sys-kernel/dracut/dracut-043-r1.ebuild | 2 +
...02-Replace-echo-n-with-printf-in-code-wit.patch | 275 +
...03-syncheck-Look-for-echo-n-usage-in-modu.patch | 26 ++
3 files changed, 303 insertions(+)
diff --git a/sys-kernel/dracut/dracut-043-r1.ebuild
b/sys-kernel/dracut/dracut-043-r1.ebuild
index 6c16464..b713bea 100644
--- a/sys-kernel/dracut/dracut-043-r1.ebuild
+++ b/sys-kernel/dracut/dracut-043-r1.ebuild
@@ -50,6 +50,8 @@ DOCS=( AUTHORS HACKING NEWS README README.generic
README.kernel README.modules
MY_LIBDIR=/usr/lib
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
)
QA_MULTILIB_PATHS=
usr/lib/dracut/dracut-install
diff --git
a/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch
b/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch
new file mode 100644
index 000..7f0e627
--- /dev/null
+++
b/sys-kernel/dracut/files/043-0002-Replace-echo-n-with-printf-in-code-wit.patch
@@ -0,0 +1,275 @@
+From 15f330fe1afe9ac8870461faad55b7d63e791aca Mon Sep 17 00:00:00 2001
+From: Mike Gilbert flop...@gentoo.org
+Date: Tue, 14 Jul 2015 22:22:14 -0400
+Subject: [PATCH 2/3] Replace echo -n with printf in code with a /bin/sh
+ shebang
+
+POSIX does not mandate that echo support the -n parameter.
+printf has more well-defined behavior.
+---
+ modules.d/04watchdog/watchdog-stop.sh | 2 +-
+ modules.d/40network/net-lib.sh | 2 +-
+ modules.d/45ifcfg/write-ifcfg.sh | 2 +-
+ modules.d/90lvm/lvm_scan.sh| 4 ++--
+ modules.d/95fcoe/fcoe-up.sh| 2 +-
+ modules.d/98usrmount/mount-usr.sh | 2 +-
+ modules.d/99base/dracut-lib.sh | 6 +++---
+ modules.d/99base/init.sh | 2 +-
+ test/TEST-10-RAID/create-root.sh | 2 +-
+ test/TEST-10-RAID/cryptroot-ask.sh | 2 +-
+ test/TEST-12-RAID-DEG/create-root.sh | 2 +-
+ test/TEST-12-RAID-DEG/cryptroot-ask.sh | 2 +-
+ test/TEST-13-ENC-RAID-LVM/create-root.sh | 2 +-
+ test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh | 2 +-
+ test/TEST-14-IMSM/cryptroot-ask.sh | 2 +-
+ test/TEST-20-NFS/client-init.sh| 2 +-
+ test/TEST-40-NBD/create-root.sh| 2 +-
+ test/TEST-40-NBD/cryptroot-ask.sh | 2 +-
+ 18 files changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/modules.d/04watchdog/watchdog-stop.sh
b/modules.d/04watchdog/watchdog-stop.sh
+index 91d45d6..921f969 100755
+--- a/modules.d/04watchdog/watchdog-stop.sh
b/modules.d/04watchdog/watchdog-stop.sh
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-[ -c /dev/watchdog ] echo -n 'V' /dev/watchdog
++[ -c /dev/watchdog ] printf 'V' /dev/watchdog
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index a09cdaf..6c739e8 100755
+--- a/modules.d/40network/net-lib.sh
b/modules.d/40network/net-lib.sh
+@@ -189,7 +189,7 @@ set_ifname() {
+ fix_bootif() {
+ local macaddr=${1}
+ local IFS='-'
+-macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
++macaddr=$(printf '%s:' ${macaddr})
+ macaddr=${macaddr%:}
+ # strip hardware type field from pxelinux
+ [ -n ${macaddr%??:??:??:??:??:??} ] macaddr=${macaddr#??:}
+diff --git a/modules.d/45ifcfg/write-ifcfg.sh
b/modules.d/45ifcfg/write-ifcfg.sh
+index fa7db27..251d684 100755
+--- a/modules.d/45ifcfg/write-ifcfg.sh
b/modules.d/45ifcfg/write-ifcfg.sh
+@@ -48,7 +48,7 @@ print_s390() {
+ for i in /sys/class/net/$_netif/device/cdev[0-9]*; do
+ [ -e $i ] || continue
+ channel=$(readlink -f $i)
+-echo -n ${channel##*/},
++printf '%s' ${channel##*/},
+ done
+ })
+ [ -n $SUBCHANNELS ] || return 1
+diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
+index 7495644..ead28aa 100755
+--- a/modules.d/90lvm/lvm_scan.sh
b/modules.d/90lvm/lvm_scan.sh
+@@ -15,14 +15,14 @@ SNAPSIZE=$(getargs rd.lvm.snapsize -d rd_LVM_SNAPSIZE=)
+ lvmdevs=$(
+ for f in /tmp/.lvm_scan-*; do
+ [ -e $f ] || continue
+-echo -n ${f##/tmp/.lvm_scan-}
++printf '%s' ${f##/tmp/.lvm_scan-}
+ done
+ )
+
+ if [ ! -e /etc/lvm/lvm.conf ]; then
+ {
+ echo 'devices {';
+-echo -n 'filter = [ '
++printf 'filter = [ '
+ for dev in $lvmdevs; do
+
