From: Marcin Krol Date: Sat, 22 Nov 2014 13:22:50 +0000 (+0000) Subject: - updated to 040 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=61f9d6725ad8f7d2267c18378a9068bffc9e9087;p=packages%2Fdracut.git - updated to 040 --- diff --git a/dracut.spec b/dracut.spec index e5d49ae..064d951 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,12 +1,12 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 038 +Version: 040 Release: 1 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: 4487bd98000cc536c5c3839a2f112831 +# Source0-md5: e961da9566b3c0dd838f737f879cf339 Source1: tld.conf Patch1: plymouth-libexec.patch Patch2: os-release.patch diff --git a/plymouth-libexec.patch b/plymouth-libexec.patch index fb35e63..24c4bf8 100644 --- a/plymouth-libexec.patch +++ b/plymouth-libexec.patch @@ -1,18 +1,17 @@ ---- dracut-027/modules.d/50plymouth/module-setup.sh.wiget 2013-03-27 22:56:48.855517817 +0100 -+++ dracut-027/modules.d/50plymouth/module-setup.sh 2013-03-27 22:59:42.251657247 +0100 -@@ -12,12 +12,12 @@ depends() { - } +diff -urN dracut-040.orig/modules.d/50plymouth/module-setup.sh dracut-040/modules.d/50plymouth/module-setup.sh +--- dracut-040.orig/modules.d/50plymouth/module-setup.sh 2014-10-24 17:41:12.966283303 +0200 ++++ dracut-040/modules.d/50plymouth/module-setup.sh 2014-10-24 17:42:58.112954942 +0200 +@@ -13,11 +13,11 @@ + # called by dracut install() { -- if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \ -- || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then -+ if grep -q nash /usr/@lib@/plymouth/plymouth-populate-initrd \ -+ || [ ! -x /usr/@lib@/plymouth/plymouth-populate-initrd ]; then - . "$moddir"/plymouth-populate-initrd.sh - else - PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \ -- /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir" -+ /usr/@lib@/plymouth/plymouth-populate-initrd -t "$initdir" +- PKGLIBDIR="/usr/lib/plymouth" ++ PKGLIBDIR="/usr/@lib@/plymouth" + if type -P dpkg-architecture &>/dev/null; then + PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth" fi +- [ -x /usr/libexec/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/libexec/plymouth" ++ [ -x /usr/@lib@/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/@lib@/plymouth" - inst_hook emergency 50 "$moddir"/plymouth-emergency.sh + if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \ + || [ ! -x ${PKGLIBDIR}/plymouth-populate-initrd ]; then diff --git a/prelink-libs.patch b/prelink-libs.patch index 0645766..14b920d 100644 --- a/prelink-libs.patch +++ b/prelink-libs.patch @@ -1,15 +1,15 @@ --- dracut-034/dracut.sh.orig 2013-10-20 14:13:51.740264092 +0200 +++ dracut-034/dracut.sh 2013-10-20 14:29:50.300223867 +0200 @@ -1266,10 +1266,10 @@ - if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then - if [[ $DRACUT_FIPS_MODE ]]; then - dinfo "*** Installing prelink files ***" -- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache -+ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache - else - dinfo "*** Pre-linking files ***" -- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf -+ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf - chroot "$initdir" "$PRELINK_BIN" -a - rm -f -- "$initdir/$PRELINK_BIN" - rm -fr -- "$initdir"/etc/prelink.* + if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then + if [[ $DRACUT_FIPS_MODE ]]; then + dinfo "*** Installing prelink files ***" +- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache ++ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache + elif [[ $do_prelink == yes ]]; then + dinfo "*** Pre-linking files ***" +- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf ++ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf + chroot "$initdir" "$PRELINK_BIN" -a + rm -f -- "$initdir/$PRELINK_BIN" + rm -fr -- "$initdir"/etc/prelink.* diff --git a/xz_compressor.patch b/xz_compressor.patch index 4bdc4ea..2e701c0 100644 --- a/xz_compressor.patch +++ b/xz_compressor.patch @@ -1,16 +1,16 @@ -diff -urN dracut-037.orig/dracut.sh dracut-037/dracut.sh ---- dracut-037.orig/dracut.sh 2014-03-19 16:16:08.000000000 +0000 -+++ dracut-037/dracut.sh 2014-05-17 14:56:39.530999661 +0000 -@@ -159,8 +159,6 @@ - -I, --install [LIST] Install the space separated list of files into the - initramfs. +diff -ur dracut-040.orig/dracut.sh dracut-040/dracut.sh +--- dracut-040.orig/dracut.sh 2014-11-21 14:04:57.000000000 +0000 ++++ dracut-040/dracut.sh 2014-11-22 13:19:07.066000000 +0000 +@@ -163,8 +163,6 @@ + --install-optional [LIST] Install the space separated list of files into the + initramfs, if they exist. --gzip Compress the generated initramfs using gzip. - This will be done by default, unless another - compression option or --no-compress is passed. --bzip2 Compress the generated initramfs using bzip2. Make sure your kernel has bzip2 decompression support compiled in, otherwise you will not be able to boot. -@@ -168,12 +166,14 @@ +@@ -172,6 +170,8 @@ Make sure your kernel has lzma support compiled in, otherwise you will not be able to boot. --xz Compress the generated initramfs using xz. @@ -18,16 +18,8 @@ diff -urN dracut-037.orig/dracut.sh dracut-037/dracut.sh + compression option or --no-compress is passed. Make sure that your kernel has xz support compiled in, otherwise you will not be able to boot. -- --lzo Compress the generated initramfs using lzop. -+ --lzo Compress the generated initramfs using lzop. - Make sure that your kernel has lzo support compiled - in, otherwise you will not be able to boot. -- --lz4 Compress the generated initramfs using lz4. -+ --lz4 Compress the generated initramfs using lz4. - Make sure that your kernel has lz4 support compiled - in, otherwise you will not be able to boot. - --compress [COMPRESSION] Compress the generated initramfs with the -@@ -789,7 +789,7 @@ + --lzo Compress the generated initramfs using lzop. +@@ -817,7 +817,7 @@ fw_dir=${fw_dir//:/ } # handle compression options.