From 1e099a37d3e2707b461a80fa34aab79f5db6c32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 13 Feb 2017 12:43:26 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=BC=D0=B0=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20dracut-044?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/base/package.mask/default | 2 - sys-kernel/dracut/Manifest | 1 - sys-kernel/dracut/dracut-040-r3.ebuild | 254 ------------------ ...acut-functions.sh-support-for-altern.patch | 41 --- ...ntoo.conf-let-udevdir-be-handled-by-.patch | 30 --- ...e-the-same-paths-in-dracut.sh-as-tho.patch | 74 ----- ...stall-dracut-install-into-libexec-di.patch | 81 ------ .../files/040-0005-NEWS-add-040-entry.patch | 25 -- ...n-t-pass-rsyncable-option-to-gzip-Ge.patch | 26 -- ...ke-into-account-lib64-dirs-when-dete.patch | 44 --- 10 files changed, 578 deletions(-) delete mode 100644 sys-kernel/dracut/Manifest delete mode 100644 sys-kernel/dracut/dracut-040-r3.ebuild delete mode 100644 sys-kernel/dracut/files/040-0001-dracut-functions.sh-support-for-altern.patch delete mode 100644 sys-kernel/dracut/files/040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch delete mode 100644 sys-kernel/dracut/files/040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch delete mode 100644 sys-kernel/dracut/files/040-0004-Install-dracut-install-into-libexec-di.patch delete mode 100644 sys-kernel/dracut/files/040-0005-NEWS-add-040-entry.patch delete mode 100644 sys-kernel/dracut/files/040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch delete mode 100644 sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch diff --git a/profiles/base/package.mask/default b/profiles/base/package.mask/default index 9b68e19e5..c9f26bd4c 100644 --- a/profiles/base/package.mask/default +++ b/profiles/base/package.mask/default @@ -33,8 +33,6 @@ dev-lang/ruby:2.0 >=sys-libs/ncurses-6.0 =sys-libs/ncurses-5.9-r101 -=sys-kernel/dracut-044-r1 - # without patch =net-dns/bind-9.10.4_p4 =net-dns/bind-9.11.0_p2 diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest deleted file mode 100644 index 4e3190487..000000000 --- a/sys-kernel/dracut/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dracut-040.tar.xz 263944 SHA256 b6e743353804b46e350177b9ecb9a8511df7e8c4ff9e0b4f3b4f72bc509c98a3 SHA512 6bc6a714572cc18c4cf9f9c1af4bc787287554ead1e39fbec8a1b8986585cf8c7c7ef476f87fc361f565eb344fe2594d63185ffe02cc5fa7cc3eaa03bcb4b72b WHIRLPOOL d8dbdbf6cb7705a0b7793f82a0323c49b4ac0dc3d61cf0073e3061f34af0b5c92dd21a7dc080f2a8d24d3eef3abc99df91f113675721267352f934f1319c66ba diff --git a/sys-kernel/dracut/dracut-040-r3.ebuild b/sys-kernel/dracut/dracut-040-r3.ebuild deleted file mode 100644 index 2e5cc8afd..000000000 --- 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 ~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-dracut-functions.sh-support-for-altern.patch" - "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch" - "${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch" - "${FILESDIR}/${PV}-0005-NEWS-add-040-entry.patch" - "${FILESDIR}/${PV}-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch" - "${FILESDIR}/${PV}-0007-Take-into-account-lib64-dirs-when-dete.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 -} - -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 - - # - # 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 98systemd - # Without systemd following modules do not make sense - rm_module 00systemd-bootchart - 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 "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/040-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/040-0001-dracut-functions.sh-support-for-altern.patch deleted file mode 100644 index 55b369981..000000000 --- a/sys-kernel/dracut/files/040-0001-dracut-functions.sh-support-for-altern.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ed2f8d6145ef12084af882575091a7d44a3e47c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Sun, 6 Jan 2013 13:35:01 +0100 -Subject: [PATCH 1/4] dracut-functions.sh: support for alternative udev dirs - - udevaltdirs - -It is required for Gentoo which moves udev from / to /usr and supports -both /lib/udev and /usr/lib/udev for compatibility with other packages. - -Credits go to Alexander Tsoy . - -Conflicts: - dracut-functions.sh ---- - dracut-functions.sh | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 1bcc3b4..72afce2 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -943,6 +943,16 @@ inst_rules() { - inst_dir "$_target" - for _rule in "$@"; do - if [ "${_rule#/}" = "$_rule" ]; then -+ for r in ${udevaltdirs}; do -+ [[ "$r" = "${udevdir}" ]] && continue -+ if [[ -e $r/rules.d/$_rule ]]; then -+ _found="$r/rules.d/$_rule" -+ inst_rule_programs "$_found" -+ inst_rule_group_owner "$_found" -+ inst_rule_initqueue "$_found" -+ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}" -+ fi -+ done - for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do - if [[ -e $r/$_rule ]]; then - _found="$r/$_rule" --- -2.1.3 - diff --git a/sys-kernel/dracut/files/040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch deleted file mode 100644 index 52b97692f..000000000 --- a/sys-kernel/dracut/files/040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a562cb9ad84784cb4ba7679a2fc3a269d31a4ca3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Sun, 16 Dec 2012 20:02:48 +0100 -Subject: [PATCH 2/4] gentoo.conf: let udevdir= be handled by pkg-config and - use udevaltdirs - -To avoid need of rebuild after udev update/downgrade let udevdir= be set -dynamically with pkg-config. Use udevaltdirs to search for rules both -in old and new locations. ---- - dracut.conf.d/gentoo.conf.example | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example -index 26e7314..f9617f0 100644 ---- a/dracut.conf.d/gentoo.conf.example -+++ b/dracut.conf.d/gentoo.conf.example -@@ -1,7 +1,8 @@ - # /etc/dracut.conf.d/gentoo.conf - # dracut config file customized for Gentoo Base System release 2 - --udevdir=/lib/udev -+udevdir= -+udevaltdirs="/lib/udev /usr/lib/udev" - ro_mnt=yes - - # --- -2.1.3 - diff --git a/sys-kernel/dracut/files/040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch deleted file mode 100644 index fbfd9ee41..000000000 --- a/sys-kernel/dracut/files/040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5a1de9053d27feeb283253554033e7ad25c9aa31 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Wed, 2 Oct 2013 22:37:09 +0200 -Subject: [PATCH 3/4] Use the same paths in dracut.sh as those set with - configure script - -Makefile alters destination main dracut script and sets dracutbasedir to -the value of pkglibdir set in configure. ---- - Makefile | 3 +++ - dracut.sh | 9 ++++----- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 7127368..a4c35e5 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,6 +103,9 @@ install: dracut-version.sh - mkdir -p $(DESTDIR)$(pkglibdir)/modules.d - mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut -+ sed -r \ -+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ -+ -i $(DESTDIR)$(bindir)/dracut - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages - install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd - install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd -diff --git a/dracut.sh b/dracut.sh -index 1c7e208..ea30a7b 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -24,10 +24,13 @@ - # store for logging - dracut_args=( "$@" ) - -+# base dirs -+pkglibdir=/usr/lib/dracut -+dracutbasedir="$pkglibdir" -+ - set -o pipefail - - usage() { -- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - if [[ -f $dracutbasedir/dracut-version.sh ]]; then - . $dracutbasedir/dracut-version.sh - fi -@@ -52,7 +55,6 @@ EOF - } - - long_usage() { -- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - if [[ -f $dracutbasedir/dracut-version.sh ]]; then - . $dracutbasedir/dracut-version.sh - fi -@@ -656,8 +658,6 @@ export DRACUT_LOG_LEVEL=warning - debug=yes - } - --[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut -- - # if we were not passed a config file, try the default one - if [[ ! -f $conffile ]]; then - if [[ $allowlocal ]]; then -@@ -798,7 +798,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) - [[ $use_fstab_l ]] && use_fstab=$use_fstab_l - [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l - [[ $lvmconf_l ]] && lvmconf=$lvmconf_l --[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" - [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" - [[ $tmpdir ]] || tmpdir=/var/tmp --- -2.1.3 - diff --git a/sys-kernel/dracut/files/040-0004-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/040-0004-Install-dracut-install-into-libexec-di.patch deleted file mode 100644 index 2cf27f339..000000000 --- a/sys-kernel/dracut/files/040-0004-Install-dracut-install-into-libexec-di.patch +++ /dev/null @@ -1,81 +0,0 @@ -From ed9375739c3f7e48f6e1c3037c5a589c49d78613 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Wed, 2 Oct 2013 22:40:43 +0200 -Subject: [PATCH 4/4] Install dracut-install into libexec dir instead of lib - dir - -dracut-install script is the only thing ABI specific atm. - -See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the -problem. ---- - Makefile | 4 +++- - configure | 1 + - dracut-functions.sh | 4 ++++ - dracut.sh | 1 + - 4 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a4c35e5..af61faf 100644 ---- a/Makefile -+++ b/Makefile -@@ -104,6 +104,7 @@ install: dracut-version.sh - mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut - sed -r \ -+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \ - -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ - -i $(DESTDIR)$(bindir)/dracut - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages -@@ -147,7 +148,8 @@ endif - done \ - fi - if [ -f install/dracut-install ]; then \ -- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ -+ mkdir -p $(DESTDIR)$(libexecdir); \ -+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \ - fi - if [ -f skipcpio/skipcpio ]; then \ - install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \ -diff --git a/configure b/configure -index 0bd3d2d..17370de 100755 ---- a/configure -+++ b/configure -@@ -59,6 +59,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin} - mandir ?= ${mandir:-${prefix}/share/man} - enable_documentation ?= ${enable_documentation:-yes} - bindir ?= ${bindir:-${prefix}/bin} -+libexecdir ?= ${libexecdir:-${prefix}/libexec} - EOF - - { -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 72afce2..1d85315 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -741,6 +741,10 @@ if ! [[ $DRACUT_INSTALL ]]; then - DRACUT_INSTALL=$(find_binary dracut-install) - fi - -+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then -+ DRACUT_INSTALL=$libexecdir/dracut-install -+fi -+ - if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then - DRACUT_INSTALL=$dracutbasedir/dracut-install - fi -diff --git a/dracut.sh b/dracut.sh -index ea30a7b..08f27eb 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -25,6 +25,7 @@ - dracut_args=( "$@" ) - - # base dirs -+libexecdir=/usr/libexec - pkglibdir=/usr/lib/dracut - dracutbasedir="$pkglibdir" - --- -2.1.3 - diff --git a/sys-kernel/dracut/files/040-0005-NEWS-add-040-entry.patch b/sys-kernel/dracut/files/040-0005-NEWS-add-040-entry.patch deleted file mode 100644 index eeb4610e4..000000000 --- a/sys-kernel/dracut/files/040-0005-NEWS-add-040-entry.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 36c91220234af69a96cd95e575b47f0a3ec4c645 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 24 Oct 2014 14:41:29 +0200 -Subject: [PATCH 5/5] NEWS: add 040 entry - ---- - NEWS | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/NEWS b/NEWS -index 1b79da1..da44068 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,8 @@ -+dracut-040 -+========== -+- fixed dracut module dependency checks -+- fixed test suite -+ - dracut-039 - ========== - - DRACUT_PATH can now be used to specify the PATH used by dracut --- -2.1.3 - diff --git a/sys-kernel/dracut/files/040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch b/sys-kernel/dracut/files/040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch deleted file mode 100644 index 1ade9bd1e..000000000 --- a/sys-kernel/dracut/files/040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ff57ba111c03957d4a68459efd91322c24223861 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Sat, 1 Nov 2014 22:25:07 +0100 -Subject: [PATCH 6/6] Don't pass --rsyncable option to gzip - Gentoo gzip - doesn't support it - ---- - dracut.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index 08f27eb..17be895 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -822,7 +822,7 @@ case $compress in - bzip2) compress="bzip2 -9";; - lzma) compress="lzma -9 -T0";; - xz) compress="xz --check=crc32 --lzma2=dict=1MiB -T0";; -- gzip) compress="gzip -n -9 --rsyncable"; command -v pigz > /dev/null 2>&1 && compress="pigz -9 -n -T -R";; -+ gzip) compress="gzip -n -9"; command -v pigz > /dev/null 2>&1 && compress="pigz -9 -n -T -R";; - lzo) compress="lzop -9";; - lz4) compress="lz4 -l -9";; - esac --- -2.1.3 - diff --git a/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch b/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch deleted file mode 100644 index 5d1031284..000000000 --- a/sys-kernel/dracut/files/040-0007-Take-into-account-lib64-dirs-when-dete.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 25efd305dace3275c661e0a7dfbaef42b4cbc6d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Sun, 11 Jan 2015 15:10:39 +0100 -Subject: [PATCH 7/7] Take into account lib64 dirs when detecting version, - modules and params - ---- - lsinitrd.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lsinitrd.sh b/lsinitrd.sh -index 4f12c2c..dc1f88f 100755 ---- a/lsinitrd.sh -+++ b/lsinitrd.sh -@@ -124,7 +124,7 @@ extract_files() - list_modules() - { - echo "dracut modules:" -- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null -+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/modules.txt' 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null - ((ret+=$?)) - } - -@@ -217,7 +217,7 @@ ret=0 - if (( ${#filenames[@]} > 0 )); then - extract_files - else -- version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null) -+ version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/dracut-*' 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null) - ((ret+=$?)) - echo "Version: $version" - echo -@@ -226,7 +226,7 @@ else - echo "========================================================================" - else - echo -n "Arguments: " -- $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null -+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/build-parameter.txt' 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null - echo - list_modules - list_files --- -2.2.1 -