sys-kernel/dracut: Version bump, build.sh fixed
This commit is contained in:
Stefan Reimer
parent
19078eaede
commit
c21ddfa321
@ -137,9 +137,8 @@ setup_chroot() {
|
||||
|
||||
PORTAGE_SNAPSHOT="${GENTOO_MIRROR}/snapshots/portage-latest.tar.bz2"
|
||||
if [ ${BIND_PORTAGE} = 1 ] ; then
|
||||
if [ -d ${ROOT_FS}/${HOST_PORTDIR} ] ; then
|
||||
mount --bind ${HOST_PORTDIR} ${ROOT_FS}/${HOST_PORTDIR} || die "Error mounting ${HOST_PORTDIR}"
|
||||
fi
|
||||
mkdir -p ${ROOT_FS}/${HOST_PORTDIR}
|
||||
mount --bind ${HOST_PORTDIR} ${ROOT_FS}/${HOST_PORTDIR} || die "Error mounting ${HOST_PORTDIR}"
|
||||
else
|
||||
# install latest portage snapshot
|
||||
if [ ! -d "usr/portage" ] ; then
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
AUX 027-0000-fix-version-print.patch 365 SHA256 c065b20c95b24a9fc0e8e1e20de19ec3dca7cb4bd62d7a3d26adf099c39fc57b SHA512 2f622d8bc4e483d91674cb7acaa2ef9bde613bcda7c8b5c8b79bed4919fdcf0852798ba38615f796528e8c83fc18a89322a1fbde7fc5effaa6c4c4d0a389638f WHIRLPOOL b38923d3e04e161b23b9fa510b0dc0b3ce5238f3008ef0f92a1918e38c7a9ecf6d6c99a14006b734c8c77df01213c866bdce293c684c073a6cb61691a5700102
|
||||
AUX 027-0001-dracut-functions.sh-support-for-altern.patch 1387 SHA256 992e44243e87b07833154d4b2299d08df4d7c1d3b931aa22e1ad75acce21330b SHA512 d3dd82a6f976bb4aab0e70a5c483e89e6ef43f59401bbe756ea8376a758003b434610f31d2d661d749d865b6a943da01867d0223856981262dddc5f12457ccdf WHIRLPOOL eb11e2d39e18d6e2f47c34f4c9d52c90becefe71507069e333c08f96b2b3b2630e4f0d9acff265858546f63f876bd6f83227d8e9459a6732b7488c0f7e77503e
|
||||
AUX 027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 e778ee1fb9179e3898b25e5ae558060d1ee75a0c63e03ad1ddb36b5275c53b35 SHA512 3ce017f58d7eea16342631b02f86330f8e86d8357928df2fb2009d3544b17f4d12a9446e83d6a47cd8fa90c2a910df34a0c680277174bf865a34f1a771f1902a WHIRLPOOL fb5cfa821abd55e6a16ec710cb418d34c1ace1be9e787310054ca5b0d08c31a26600a7ec2d8e27ee8b74773ecbc0d93810ec67f225e909e88623914eb0eb7bbc
|
||||
AUX 027-crypt-ssh.patch 2235 SHA256 1da93f6cc03cd9aaa1e8e5d642101a996400242e25b0d0520ac9ed86d9675906 SHA512 097ba800dca6eaddbfc262d370a187899d9c1ef86c46067ba3214390948ff0f12f31a75a3fae4c9a536e26aa3b91c5aa0d137e6aef51aa3d56a9a199651e47b4 WHIRLPOOL 4406b29de811cbfe1226f01b9ad9c5a2a8c185df0b6f19e03b0f6912881d23673ee174f184eba1f941e3180e1ac9fbf3fca676a9c2dbefbe81cfeb27f3909158
|
||||
AUX 027-0003-Do-not-call-plymouth-with-full-path.patch 7131 SHA256 0a4d3482713417969a946760b4b25473ba9b4f42224d1fa4223bcc7967137e12 SHA512 bd35e3f22de44df839680f7b28db0bb5a14fd164faafc47a90d3fd799455d83e4e03811c003818c8db76ed56c14ca22b4806e8d6fec3e9f8d90831859f3dbe3f WHIRLPOOL 65917161c32c1f9796e7d8ddf498415ab4e9d09b19140798f4a44df2d3e75bf655bba723603598348f2c657d34bfa7376536e4361afd8ee5d8ab40e2bf233ee6
|
||||
AUX 027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch 1056 SHA256 8e126a78eb051ccc69b9a3edb2d7b74515170ce8acdb9420aceaee750068cc11 SHA512 b1bda85237331aa51d0105e1ad0dee655284ea23d8e47c0818e6ea74190b65593e70b366a254140c9706e33d23eccb7893b83f0a28514806318d9f08cae01281 WHIRLPOOL 5b78398b28cc06c5a25e99b5ae687ad1c7dc14c67605fe7256f3617b458fa21af24f783ab5cad24278225e93f59fd40d1ba97ed42b460f77d1814f0546058c25
|
||||
AUX 027-crypt-ssh.patch 2641 SHA256 28745938ef7bf8ed1a0459062e6ef2b87cde194e63738c7635c72525c9fb2bc3 SHA512 f235391602ac1c2aeca2fb4bf35b87da4e22c9dba609166b2badde6c4eb00b9f2c46ce61df65180156bba39f7f0cd793e98238967452a4a07981c2ae37099955 WHIRLPOOL 007130dd88b846bee9d1193e2837297df081fcb8a9e30cfb6032d8219a232728acb2e6a1cbf5747da430ee7279a065ef8d053da196845f88e03f06348243a0d6
|
||||
DIST dracut-027.tar.bz2 253049 SHA256 9a8f1ad2e133b4072ff433410be5b14a01cec4f75ab72ef0296e5f49a15fad13 SHA512 1e44b1ad09bc631cc554be4917c5f56514d6f5f4f9658401a7c7e9dc20ef79029246106682146785cb63beef39061aaa944fb24acd106086f02ba1356c61e938 WHIRLPOOL ebd0e0f1c4ba6e95a320e01f98ed7e31d7f399b05c7133fff8a686750f39f29c803b02764995775fa3f2c383205bc09b35a905116d366298bd6587d8d1cac572
|
||||
EBUILD dracut-027.ebuild 8856 SHA256 4cb1c517d522b4af436d5efd63ab2b2476f9f11bb413d0272be889f8eed0d08a SHA512 c076a9519690fbf1cc7caa79239796b87678bd1b0d46bafaf0c591bc51f54026d6bfebaf9420827d88c4b6d2d983aaf0c8eef6f12217c44c3a3f15d80bbff968 WHIRLPOOL c9d228efb75501820f7f5fdc043c82d4b2e928f43799e2dcdbb10417a6b196f4f0fc8595e03a6c15e1cdf1d7713ad7db66ed8fe9ac168f1d905eb1481621e267
|
||||
EBUILD dracut-027-r1.ebuild 8983 SHA256 683fcabd8e618b3321c4b667a0cfe2821fd974cb6f585e240cb2ff7713a0022b SHA512 c7f464126ad3baf86cd59536659e0f056edc8390fc627464241581a2f37c27c949cdcf58fbc38f04298b69d11d2bcb24c92d6dcd5a9f5cfbad1522000901cbc1 WHIRLPOOL 8521155da6b3b8578ff2ffe801946cda1e52c2d9996c8e4446173b1e20c9a4000b180345e8037926619db3b2dab7e9d11c01028d7e5b5f822d6328a5646f40c6
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# 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.ebuild,v 1.2 2013/04/02 14:16:51 aidecoe Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r1.ebuild,v 1.1 2013/04/18 13:37:10 aidecoe Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
@ -81,7 +81,7 @@ RDEPEND="${CDEPEND}
|
||||
virtual/pkgconfig
|
||||
|
||||
debug? ( dev-util/strace )
|
||||
device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
|
||||
device-mapper? ( >=sys-fs/lvm2-2.02.33 )
|
||||
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
|
||||
selinux? ( sys-libs/libselinux sys-libs/libsepol )
|
||||
dracut_modules_biosdevname? ( sys-apps/biosdevname )
|
||||
@ -161,6 +161,8 @@ src_prepare() {
|
||||
epatch "${FILESDIR}/${PV}-0000-fix-version-print.patch"
|
||||
epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
|
||||
epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
|
||||
epatch "${FILESDIR}/${PV}-0003-Do-not-call-plymouth-with-full-path.patch"
|
||||
epatch "${FILESDIR}/${PV}-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch"
|
||||
|
||||
if use dracut_modules_systemd; then
|
||||
local systemdutildir="$($(tc-getPKG_CONFIG) systemd \
|
||||
@ -178,9 +180,8 @@ src_prepare() {
|
||||
-i "${S}/dracut.conf.d/gentoo.conf.example" || die
|
||||
fi
|
||||
if use dracut_modules_crypt-ssh; then
|
||||
epatch "${FILESDIR}/${PV}-crypt-ssh.patch"
|
||||
epatch "${FILESDIR}/${PV}-crypt-ssh.patch"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
@ -234,7 +235,7 @@ src_install() {
|
||||
|
||||
# Following flags define set of helper modules which are base dependencies
|
||||
# for others and as so have no practical use, so remove these modules.
|
||||
use device-mapper || rm_module 90dm
|
||||
use device-mapper || rm_module 90dm
|
||||
use net || rm_module 40network 45ifcfg 45url-lib
|
||||
|
||||
if use dracut_modules_systemd; then
|
||||
@ -0,0 +1,167 @@
|
||||
From d084ce382e70723854f960daa8b0e486ee1ce97f Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Thu, 11 Apr 2013 16:08:26 +0200
|
||||
Subject: [PATCH 3/4] Do not call plymouth with full path
|
||||
|
||||
---
|
||||
modules.d/50plymouth/module-setup.sh | 2 +-
|
||||
modules.d/50plymouth/plymouth-emergency.sh | 2 +-
|
||||
modules.d/50plymouth/plymouth-newroot.sh | 4 ++--
|
||||
modules.d/50plymouth/plymouth-populate-initrd.sh | 5 ++---
|
||||
modules.d/50plymouth/plymouth-pretrigger.sh | 6 +++---
|
||||
modules.d/90crypt/crypt-lib.sh | 4 ++--
|
||||
modules.d/90dmsquash-live/dmsquash-live-root.sh | 4 ++--
|
||||
modules.d/98systemd/dracut-emergency.sh | 2 +-
|
||||
modules.d/99base/dracut-lib.sh | 4 ++--
|
||||
9 files changed, 16 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
|
||||
index f754e24..ae35b11 100755
|
||||
--- a/modules.d/50plymouth/module-setup.sh
|
||||
+++ b/modules.d/50plymouth/module-setup.sh
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
check() {
|
||||
[[ "$mount_needs" ]] && return 1
|
||||
- [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
|
||||
+ type -P plymouthd >/dev/null && type -P plymouth >/dev/null
|
||||
}
|
||||
|
||||
depends() {
|
||||
diff --git a/modules.d/50plymouth/plymouth-emergency.sh b/modules.d/50plymouth/plymouth-emergency.sh
|
||||
index 68955b8..ed0b0ac 100755
|
||||
--- a/modules.d/50plymouth/plymouth-emergency.sh
|
||||
+++ b/modules.d/50plymouth/plymouth-emergency.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||
-[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
|
||||
+plymouth --hide-splash 2>/dev/null || :
|
||||
diff --git a/modules.d/50plymouth/plymouth-newroot.sh b/modules.d/50plymouth/plymouth-newroot.sh
|
||||
index 2311b47..96cd138 100755
|
||||
--- a/modules.d/50plymouth/plymouth-newroot.sh
|
||||
+++ b/modules.d/50plymouth/plymouth-newroot.sh
|
||||
@@ -2,6 +2,6 @@
|
||||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||
|
||||
-if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
|
||||
- /bin/plymouth --newroot=$NEWROOT
|
||||
+if type plymouth >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
|
||||
+ plymouth --newroot=$NEWROOT
|
||||
fi
|
||||
diff --git a/modules.d/50plymouth/plymouth-populate-initrd.sh b/modules.d/50plymouth/plymouth-populate-initrd.sh
|
||||
index 1e2ffe7..6e0f561 100755
|
||||
--- a/modules.d/50plymouth/plymouth-populate-initrd.sh
|
||||
+++ b/modules.d/50plymouth/plymouth-populate-initrd.sh
|
||||
@@ -4,15 +4,14 @@
|
||||
PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
|
||||
PLYMOUTH_THEME=$(plymouth-set-default-theme)
|
||||
|
||||
-inst /sbin/plymouthd /bin/plymouthd
|
||||
-dracut_install /bin/plymouth \
|
||||
+dracut_install plymouthd plymouth \
|
||||
"${PLYMOUTH_LOGO_FILE}" \
|
||||
/etc/system-release
|
||||
|
||||
mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
|
||||
|
||||
inst_libdir_file "plymouth/text.so" "plymouth/details.so"
|
||||
-
|
||||
+
|
||||
if [[ $hostonly ]]; then
|
||||
dracut_install \
|
||||
"/usr/share/plymouth/themes/details/details.plymouth" \
|
||||
diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
|
||||
index 0e3cb02..8087bf6 100755
|
||||
--- a/modules.d/50plymouth/plymouth-pretrigger.sh
|
||||
+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
|
||||
@@ -2,7 +2,7 @@
|
||||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||
|
||||
-if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
|
||||
+if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
|
||||
if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
|
||||
# first trigger graphics subsystem
|
||||
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
|
||||
@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
|
||||
read consoledev rest < /sys/class/tty/console/active
|
||||
consoledev=${consoledev:-tty0}
|
||||
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
|
||||
- [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
|
||||
- /bin/plymouth --show-splash 2>&1 | vinfo
|
||||
+ plymouthd --attach-to-session --pid-file /run/plymouth/pid
|
||||
+ plymouth --show-splash 2>&1 | vinfo
|
||||
# reset tty after plymouth messed with it
|
||||
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
|
||||
fi
|
||||
diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
|
||||
index d66ba88..ebe09f8 100755
|
||||
--- a/modules.d/90crypt/crypt-lib.sh
|
||||
+++ b/modules.d/90crypt/crypt-lib.sh
|
||||
@@ -47,8 +47,8 @@ ask_for_password() {
|
||||
|
||||
{ flock -s 9;
|
||||
# Prompt for password with plymouth, if installed and running.
|
||||
- if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
|
||||
- /bin/plymouth ask-for-password \
|
||||
+ if type plymouth >/dev/null 2>&1 && plymouth --ping 2>/dev/null; then
|
||||
+ plymouth ask-for-password \
|
||||
--prompt "$ply_prompt" --number-of-tries=$ply_tries \
|
||||
--command="$ply_cmd"
|
||||
ret=$?
|
||||
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
|
||||
index a79b0d9..07e41f0 100755
|
||||
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
|
||||
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
|
||||
@@ -31,7 +31,7 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
|
||||
fi
|
||||
getarg rd.live.check -d check || check=""
|
||||
if [ -n "$check" ]; then
|
||||
- [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
|
||||
+ type plymouth >/dev/null 2>&1 && plymouth --hide-splash
|
||||
if [ -n "$DRACUT_SYSTEMD" ]; then
|
||||
p=$(str_replace "$livedev" "-" '\x2d')
|
||||
systemctl start checkisomd5@${p}.service
|
||||
@@ -42,7 +42,7 @@ if [ -n "$check" ]; then
|
||||
die "CD check failed!"
|
||||
exit 1
|
||||
fi
|
||||
- [ -x /bin/plymouth ] && /bin/plymouth --show-splash
|
||||
+ type plymouth >/dev/null 2>&1 && plymouth --show-splash
|
||||
fi
|
||||
|
||||
ln -s $livedev /run/initramfs/livedev
|
||||
diff --git a/modules.d/98systemd/dracut-emergency.sh b/modules.d/98systemd/dracut-emergency.sh
|
||||
index a0a4b12..8ab045e 100755
|
||||
--- a/modules.d/98systemd/dracut-emergency.sh
|
||||
+++ b/modules.d/98systemd/dracut-emergency.sh
|
||||
@@ -10,7 +10,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
||||
|
||||
source_conf /etc/conf.d
|
||||
|
||||
-[ -x /bin/plymouth ] && /bin/plymouth quit
|
||||
+type plymouth >/dev/null 2>&1 && plymouth quit
|
||||
|
||||
export _rdshell_name="dracut" action="Boot" hook="emergency"
|
||||
|
||||
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
||||
index e456b01..b8919f3 100755
|
||||
--- a/modules.d/99base/dracut-lib.sh
|
||||
+++ b/modules.d/99base/dracut-lib.sh
|
||||
@@ -952,8 +952,8 @@ emergency_shell()
|
||||
shift 2
|
||||
elif [ "$1" = "--shutdown" ]; then
|
||||
_rdshell_name=$2; action="Shutdown"; hook="shutdown-emergency"
|
||||
- if [ -x /bin/plymouth ]; then
|
||||
- /bin/plymouth --hide-splash
|
||||
+ if type plymouth >/dev/null 2>&1; then
|
||||
+ plymouth --hide-splash
|
||||
elif [ -x /oldroot/bin/plymouth ]; then
|
||||
/oldroot/bin/plymouth --hide-splash
|
||||
fi
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 331ebcb5f3530597f49a344c7392c7f330838fdd Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Fri, 12 Apr 2013 15:25:44 +0200
|
||||
Subject: [PATCH 4/4] plymouth/plymouth-pretrigger.sh: fixup of ca2c6936
|
||||
|
||||
---
|
||||
modules.d/50plymouth/plymouth-pretrigger.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
|
||||
index 8087bf6..196f2f9 100755
|
||||
--- a/modules.d/50plymouth/plymouth-pretrigger.sh
|
||||
+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
|
||||
@@ -2,7 +2,7 @@
|
||||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||
|
||||
-if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
|
||||
+if type plymouthd >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
|
||||
if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
|
||||
# first trigger graphics subsystem
|
||||
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user