diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/Manifest index bb834da0ab..3f603aef4d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/Manifest @@ -1 +1 @@ -DIST dracut-029.tar.bz2 259163 SHA256 f32f9deb42a03878d96a06a1b365ea26cc46345fc55631502ee2f68a4c6271b9 SHA512 0b68ab67e1b9cf98b7f4fdc29e73e68495077cd7c127c6d732e5f9c26a1312c48323ce3e9595e4d08b0d6766438cda425d04bded1286b70725b53c781e572c96 WHIRLPOOL 877f6dea157e7d6435ac983121fc8e69823960a173420a3e4eb448fe95de7f0bd69d48c17090fcf99d8bafc2bf35e30fd3723fddc481512d579f93e44c06c3a8 +DIST dracut-031.tar.bz2 260601 SHA256 a62fd3d22600adc0f370d2eff474f9aec51bc3dfb2be619647f258a9805bbb77 SHA512 ddde1279cff61b6fd8567f5e21b5f8d95e935e42520a342960432749c6a085637a5e049e6fd121d491727aea3b35af59e86c8b80e55180f3b5e496aff2b6eb23 WHIRLPOOL 46c9d2a3717fd8c36aac269a213a433f6534b2a547e0b23a31ffca9a4101c69c7253358fccb8a55a0ab9b19d4c4218eb902c49a6cc0fc08c48e3cd70c40eebc2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-029.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-031.ebuild similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-029.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-031.ebuild index 92196d5c1a..b9ea3e2906 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-029.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-031.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r3.ebuild,v 1.1 2013/05/20 18:22:56 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-031.ebuild,v 1.1 2013/08/03 21:07:51 aidecoe Exp $ EAPI=4 -inherit eutils linux-info systemd +inherit bash-completion-r1 eutils linux-info systemd add_req_use_for() { local dep="$1"; shift @@ -71,11 +71,9 @@ CDEPEND="virtual/udev RDEPEND="${CDEPEND} app-arch/cpio >=app-shells/bash-4.0 - >=app-shells/dash-0.5.4.11 >=sys-apps/baselayout-1.12.14-r1 - || ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] ) + >sys-apps/kmod-5[tools] >=sys-apps/util-linux-2.21 - sys-apps/sysvinit-tools virtual/pkgconfig debug? ( dev-util/strace ) @@ -172,14 +170,7 @@ src_prepare() { src_configure() { local myconf="--libdir='${MY_LIBDIR}'" - local bashcompletiondir=/usr/share/bash-completion - - if $(tc-getPKG_CONFIG) bash-completion --exists; then - bashcompletiondir="$($(tc-getPKG_CONFIG) bash-completion \ - --variable=completionsdir)" - fi - - myconf+=" --bashcompletiondir=${bashcompletiondir}" + myconf+=" --bashcompletiondir=$(get_bashcompdir)" if use dracut_modules_systemd; then myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" @@ -189,8 +180,6 @@ src_configure() { } src_compile() { - emake doc - if use optimization; then ewarn "Enabling experimental optimization!" tc-export CC @@ -254,6 +243,9 @@ src_install() { # Remove extra modules which go to future dracut-extras rm_module 05busybox 97masterkey 98ecryptfs 98integrity + + # dash module is no longer supported + rm_module 00dash } pkg_postinst() { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch index ca079ad40d..a36324a01c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch @@ -1,4 +1,4 @@ -From 3688462730a97d4cc5644dab87aadf147d8c72f0 Mon Sep 17 00:00:00 2001 +From 9a45dcf7c92d7e7b4ee7b0ff6ab61ae1a90f03f3 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/2] dracut-functions.sh: support for alternative udev dirs - @@ -13,10 +13,10 @@ Credits go to Alexander Tsoy . 1 file changed, 9 insertions(+) diff --git a/dracut-functions.sh b/dracut-functions.sh -index eba7412..d888f4c 100755 +index eb1278e..eaa023c 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh -@@ -961,6 +961,15 @@ inst_rules() { +@@ -960,6 +960,15 @@ inst_rules() { inst_dir "$_target" for _rule in "$@"; do if [ "${_rule#/}" = "$_rule" ]; then @@ -33,5 +33,5 @@ index eba7412..d888f4c 100755 if [[ -f $r/$_rule ]]; then _found="$r/$_rule" -- -1.8.1.5 +1.8.3.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch similarity index 89% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch index d110afa839..34f8e038d5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch @@ -1,4 +1,4 @@ -From 624a97d4e2b548889b5f758ed6a908a1495b44be Mon Sep 17 00:00:00 2001 +From fc2bb603bc17e67c66ffcf53a282aa6fb6a6261c 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/2] gentoo.conf: let udevdir= be handled by pkg-config and @@ -12,7 +12,7 @@ in old and new locations. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example -index 1361a30..b78e5c6 100644 +index 26e7314..f9617f0 100644 --- a/dracut.conf.d/gentoo.conf.example +++ b/dracut.conf.d/gentoo.conf.example @@ -1,7 +1,8 @@ @@ -26,5 +26,5 @@ index 1361a30..b78e5c6 100644 # -- -1.8.1.5 +1.8.3.2