Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27e64536420761943451d62686374bcfcc614f7a
commit 27e64536420761943451d62686374bcfcc614f7a Author: crazy <[email protected]> Date: Mon May 29 13:45:23 2017 +0200 dracut-045-2-x86_64 * added patch to match our initrd- naming by default * added pkgconfig to rodepends=() ( is used to figure system PATHs for systemd and friends ) diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild index 96a38f6..61bdb01 100644 --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@ -3,20 +3,22 @@ pkgname=dracut pkgver=045 -pkgrel=1 +pkgrel=2 pkgdesc="Generic initramfs generationtool" rodepends=('systemd>=227-15' 'util-linux>=2.27.1-4' 'bash>=4.4' \ 'dash>=0.5.8' 'kbd>=2.0.3-3' 'cpio>=2.12-3' 'multipath-tools>=0.5.0-4' \ 'lvm2>=2.02.139' 'popt>=1.16-5' 'keyutils>=1.5.9-5' 'bootchart2>=0.14.5-2' \ - 'dmraid' ) + 'dmraid' 'pkgconfig') makedepends=("docbook-sgml-dtd" "libxslt" "docbook-xsl" "docbook-xml" "asciidoc") groups=('base-extra') archs=('x86_64') url="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"; up2date="Flasttar http://www.kernel.org/pub/linux/utils/boot/dracut/"; source=(http://kernel.org/pub/linux/utils/boot/dracut/$pkgname-$pkgver.tar.xz \ - fix_fakeroot.patch ) -signatures=(${source/.tar.xz/.tar.sign} '') + fix_fakeroot.patch fw-match-initrd-naming-by-default.patch) +sha1sums=('755eb079ca1a75b26153dd4043083f2c23ac596d' \ + 'dae13497054785f9a004177d809337a4c37335fa' \ + 'e0f4c056ed784184d0dc6f08e95eeafccde97b3d') backup=(etc/dracut.conf) options=('scriptlet' 'force') diff --git a/source/base-extra/dracut/fw-match-initrd-naming-by-default.patch b/source/base-extra/dracut/fw-match-initrd-naming-by-default.patch new file mode 100644 index 0000000..9f4421a --- /dev/null +++ b/source/base-extra/dracut/fw-match-initrd-naming-by-default.patch @@ -0,0 +1,60 @@ +diff -Naur dracut-045/dracut-initramfs-restore.sh dracut-045-p/dracut-initramfs-restore.sh +--- dracut-045/dracut-initramfs-restore.sh 2017-04-03 10:26:25.000000000 +0200 ++++ dracut-045-p/dracut-initramfs-restore.sh 2017-05-29 13:34:34.592759092 +0200 +@@ -19,7 +19,7 @@ + if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then + IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + fi +-[[ -f $IMG ]] || IMG="/boot/initramfs-${KERNEL_VERSION}.img" ++[[ -f $IMG ]] || IMG="/boot/initrd-${KERNEL_VERSION}" + + cd /run/initramfs + +diff -Naur dracut-045/dracut.sh dracut-045-p/dracut.sh +--- dracut-045/dracut.sh 2017-04-03 10:26:25.000000000 +0200 ++++ dracut-045-p/dracut.sh 2017-05-29 13:34:34.593759119 +0200 +@@ -770,7 +770,7 @@ + if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then + outfile="/boot/${MACHINE_ID}/$kernel/initrd" + else +- outfile="/boot/initramfs-$kernel.img" ++ outfile="/boot/initrd-$kernel" + fi + fi + fi +diff -Naur dracut-045/lsinitrd.sh dracut-045-p/lsinitrd.sh +--- dracut-045/lsinitrd.sh 2017-04-03 10:26:25.000000000 +0200 ++++ dracut-045-p/lsinitrd.sh 2017-05-29 13:34:34.594759145 +0200 +@@ -99,7 +99,7 @@ + && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then + image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + else +- image="/boot/initramfs-${KERNEL_VERSION}.img" ++ image="/boot/initrd-${KERNEL_VERSION}" + fi + fi + +diff -Naur dracut-045/mkinitrd-dracut.sh dracut-045-p/mkinitrd-dracut.sh +--- dracut-045/mkinitrd-dracut.sh 2017-04-03 10:26:25.000000000 +0200 ++++ dracut-045-p/mkinitrd-dracut.sh 2017-05-29 13:34:34.594759145 +0200 +@@ -16,7 +16,7 @@ + $cmd " [--nocompress]" + $cmd " <initrd-image> <kernel-version>" + $cmd "" +- $cmd " (ex: ${0##*/} /boot/initramfs-$kver.img $kver)" ++ $cmd " (ex: ${0##*/} /boot/initrd-$kver $kver)" + + [[ $1 = '-n' ]] && exit 0 + exit 1 +diff -Naur dracut-045/test/TEST-16-DMSQUASH/test.sh dracut-045-p/test/TEST-16-DMSQUASH/test.sh +--- dracut-045/test/TEST-16-DMSQUASH/test.sh 2017-04-03 10:26:25.000000000 +0200 ++++ dracut-045-p/test/TEST-16-DMSQUASH/test.sh 2017-05-29 13:34:34.595759172 +0200 +@@ -86,7 +86,7 @@ + done + inst_simple /etc/os-release + inst ./test-init.sh /sbin/init +- inst "$TESTDIR"/initramfs.testing "/boot/initramfs-$KVERSION.img" ++ inst "$TESTDIR"/initramfs.testing "/boot/initrd-$KVERSION" + [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id + + VMLINUZ="/lib/modules/${KVERSION}/vmlinuz" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
