From b6778ca7d0d6fbaacfb3e82c4fffc168e6134f25 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 8 Jan 2015 16:03:31 +0100 Subject: [PATCH] dracut-040-83.git20150108 - git snapshot --- 0078-qemu-add-virtio_rng-kernel-module.patch | 20 +++ 0079-AUTHORS-and-.mailmap-update.patch | 168 ++++++++++++++++++ 0080-Makefile-add-Wformat-to-CFLAGS.patch | 25 +++ ....sh-avoid-tokenizing-ldconfig-output.patch | 41 +++++ ...-update-for-xhci-module-split-in-ker.patch | 35 ++++ dracut.spec | 10 +- 6 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 0078-qemu-add-virtio_rng-kernel-module.patch create mode 100644 0079-AUTHORS-and-.mailmap-update.patch create mode 100644 0080-Makefile-add-Wformat-to-CFLAGS.patch create mode 100644 0081-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch create mode 100644 0082-90kernel-modules-update-for-xhci-module-split-in-ker.patch diff --git a/0078-qemu-add-virtio_rng-kernel-module.patch b/0078-qemu-add-virtio_rng-kernel-module.patch new file mode 100644 index 0000000..02e91a1 --- /dev/null +++ b/0078-qemu-add-virtio_rng-kernel-module.patch @@ -0,0 +1,20 @@ +From ebc82d38b74bea9645e33055a193d836dfc3afcb Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 8 Jan 2015 13:18:57 +0100 +Subject: [PATCH] qemu: add virtio_rng kernel module + +--- + modules.d/90qemu/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh +index d0ea9ed..37972e4 100755 +--- a/modules.d/90qemu/module-setup.sh ++++ b/modules.d/90qemu/module-setup.sh +@@ -25,5 +25,5 @@ installkernel() { + hostonly='' instmods \ + ata_piix ata_generic pata_acpi cdrom sr_mod ahci \ + virtio_blk virtio virtio_ring virtio_pci \ +- virtio_scsi virtio_console ++ virtio_scsi virtio_console virtio_rng + } diff --git a/0079-AUTHORS-and-.mailmap-update.patch b/0079-AUTHORS-and-.mailmap-update.patch new file mode 100644 index 0000000..0300c2b --- /dev/null +++ b/0079-AUTHORS-and-.mailmap-update.patch @@ -0,0 +1,168 @@ +From e0dc6cd4f60e70077ec8e2ca5d7c7942b744fb91 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 8 Jan 2015 13:26:35 +0100 +Subject: [PATCH] AUTHORS and .mailmap update + +--- + .mailmap | 4 +++- + AUTHORS | 41 ++++++++++++++++++++++++++++------------- + 2 files changed, 31 insertions(+), 14 deletions(-) + +diff --git a/.mailmap b/.mailmap +index aaf5aa9..53d61f2 100644 +--- a/.mailmap ++++ b/.mailmap +@@ -10,7 +10,9 @@ Andrey Borzenkov + Dan Horák + John Reiser + Luca Berra +-Dave Young dyoung@redhat.com ++Dave Young ++Dave Young + Frederick Grose + Frederic Crozat + Shawn W Dunn ++Kyle McMartin +diff --git a/AUTHORS b/AUTHORS +index b180143..8a89a54 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -7,36 +7,40 @@ Warren Togami + Jeremy Katz + Dave Young + David Dillow ++Hannes Reinecke + Michal Soltys + Amerigo Wang + Colin Guthrie ++Thomas Renninger ++WANG Chao + Andrey Borzenkov + Peter Jones +-WANG Chao + Andreas Thienemann +-Hannes Reinecke + Hans de Goede ++Alexander Tsoy + John Reiser + Luca Berra +-Thomas Renninger +-Alexander Tsoy +-Daniel Drake + Brian C. Lane ++Daniel Drake + Dan Horák + Baoquan He + Leho Kraav + Kamil Rytarowski + Marc Grimme + Peter Rajnoha ++Thorsten Behrens + Chao Wang + Colin Walters + Frederic Crozat + Jesse Keating + Milan Broz ++Nicolas Chauvet + Radek Vykydal + Roberto Sassu + Anton Blanchard + Bill Nottingham ++Chapman Flack ++Cristian Rodríguez + David Cantrell + Dennis Gilmore + Jon Ander Hernandez +@@ -44,21 +48,27 @@ Juan RP + Lance Albertson + Marian Ganisin + Michael Ploujnikov ++Peter Robinson ++Stefan Reimer + Stig Telfer ++Vasiliy Tolstov + Wim Muskee + Alan Jenkins + Alan Pevec +-Cristian Rodríguez ++Alex Harpin ++Daniel Schaal + Frederick Grose ++Hari Bathini + Ian Dall + James Buren + James Lee + Joey Boggs + Koen Kooi + Konrad Rzeszutek Wilk ++Kyle McMartin + Mike Snitzer ++Minfei Huang + Przemysław Rudy +-Stefan Reimer + Thomas Lange + Till Maas + Vivek Goyal +@@ -67,41 +77,42 @@ Adam Williamson + Alexander Todorov + Andy Lutomirski + Anssi Hannula ++Antony Messerli + Brandon Philips + Canek Peláez Valdés + Chris Leech + Christian Heinz + Cong Wang +-Daniel Schaal + Dave Jones +-Dave Young + Dennis Schridde + Duane Griffin ++Erwan Velu + Glen Gray +-Hari Bathini + Hermann Gausterer + James Laska + Jan Stodola + Jiri Pirko + Joe Lawrence ++Julian Wolf + Kevin Yung +-Kyle McMartin +-Kyle McMartin + Lars R. Damerow + Lennert Buytenhek + Lubomir Rintel ++Lukas Wunner ++Major Hayden + Marian Csontos + Matt + Matt Smith + Michal Schmidt + Mike Gorse + Munehiro Matsuda +-Nicolas Chauvet ++NeilBrown + Nikoli + Olivier Blin + P J P + Paolo Bonzini + Peter Robinson ++Praveen_Paladugu@Dell.com + Pádraig Brady + Quentin Armitage + Robert Buchholz +@@ -110,9 +121,13 @@ Shawn W Dunn + Srinivasa T N + Thilo Bangert + Thomas Backlund ++Tobias Geerinckx ++Tom Gundersen + Tomasz Torcz + Vadim Kuznetsov ++Vaughan Cao + Ville Skyttä + Vratislav Podzimek + Yanko Kaneti ++jloeser + maximilian attems diff --git a/0080-Makefile-add-Wformat-to-CFLAGS.patch b/0080-Makefile-add-Wformat-to-CFLAGS.patch new file mode 100644 index 0000000..7e78938 --- /dev/null +++ b/0080-Makefile-add-Wformat-to-CFLAGS.patch @@ -0,0 +1,25 @@ +From 1dc360790d6cdaaa124b299e8d375e3670863312 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Thu, 8 Jan 2015 14:53:30 +0100 +Subject: [PATCH] Makefile: add -Wformat to CFLAGS + +-Werror=format-security seems to be ignored without -Wformat + +Thanks @ Christoph Brill +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 7127368..41ae274 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ sysconfdir ?= ${prefix}/etc + bindir ?= ${prefix}/bin + mandir ?= ${prefix}/share/man + CFLAGS ?= -O2 -g -Wall +-CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 ++CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 + bashcompletiondir ?= ${datadir}/bash-completion/completions + + man1pages = lsinitrd.1 diff --git a/0081-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch b/0081-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch new file mode 100644 index 0000000..a5dc353 --- /dev/null +++ b/0081-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch @@ -0,0 +1,41 @@ +From c59779cf9337bc0fc48c7a4d8437f7253f6822c3 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Tue, 23 Dec 2014 22:03:10 +0100 +Subject: [PATCH] dracut-functions.sh: avoid tokenizing ldconfig output with + 'read' + +The space does not separate the elements reliably, spaces can be +embedded in parenthesized expressions too: + + libgmpxx.so.4 (libc6, hwcap: 0x0000000004000000) => /lib/sse2/libgmpxx.so.4 + libgmp.so.10 (libc6, hwcap: 0x0000000004000000) => /lib/sse2/libgmp.so.10 + +This results in dracut creating '0x0000000004000000' and '=>' +directories in the initramfs image. +--- + dracut-functions.sh | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 410960d..37ddca2 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -104,17 +104,7 @@ fi + + ldconfig_paths() + { +- local a i +- declare -A a +- for i in $( +- ldconfig -pN 2>/dev/null | grep -F '=>' | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | while read a b c d; do +- d=${d%/*} +- printf "%s\n" "$d"; +- done +- ); do +- a["$i"]=1; +- done; +- printf "%s\n" ${!a[@]} ++ ldconfig -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq + } + + # Detect lib paths diff --git a/0082-90kernel-modules-update-for-xhci-module-split-in-ker.patch b/0082-90kernel-modules-update-for-xhci-module-split-in-ker.patch new file mode 100644 index 0000000..c1d8204 --- /dev/null +++ b/0082-90kernel-modules-update-for-xhci-module-split-in-ker.patch @@ -0,0 +1,35 @@ +From eb8f202ed033ed64dde4ce754f78c2f5683c9224 Mon Sep 17 00:00:00 2001 +From: Thomas Backlund +Date: Sun, 21 Dec 2014 12:44:30 +0159 +Subject: [PATCH] 90kernel-modules: update for xhci module split in kernel 3.18 + +As reported in https://bugs.mageia.org/show_bug.cgi?id=14799 + +the xhci module got splitted up in upstream linux merged during +3.18 release cycle: + +>From 29e409f0f7613f9fd2235e41f0fa33e48e94544e Mon Sep 17 00:00:00 2001 +From: Andrew Bresticker +Date: Fri, 3 Oct 2014 11:35:29 +0300 +Subject: xhci: Allow xHCI drivers to be built as separate modules + +so we need to adjust 90kernel-modules accordingly. + +Signed-off-by: Thomas Backlund +--- + modules.d/90kernel-modules/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh +index 1a8fcff..5e292b0 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -39,7 +39,7 @@ installkernel() { + ehci-hcd ehci-pci ehci-platform \ + ohci-hcd ohci-pci \ + uhci-hcd \ +- xhci-hcd ++ xhci-hcd xhci-pci xhci-plat-hcd + + instmods yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \ + atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \ diff --git a/dracut.spec b/dracut.spec index 5616cb2..21d0314 100644 --- a/dracut.spec +++ b/dracut.spec @@ -11,7 +11,7 @@ Name: dracut Version: 040 -Release: 78.git20141219%{?dist} +Release: 83.git20150108%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -107,6 +107,11 @@ Patch74: 0074-Revert-95rootfs-block-Correctly-terminate-commandlin.patch Patch75: 0075-resume-make-use-of-systemd-hibernate-resume-if-exist.patch Patch76: 0076-systemd-add-systemd-journald-audit.socket.patch Patch77: 0077-dracut-Don-t-fail-at-copying-files-when-including-di.patch +Patch78: 0078-qemu-add-virtio_rng-kernel-module.patch +Patch79: 0079-AUTHORS-and-.mailmap-update.patch +Patch80: 0080-Makefile-add-Wformat-to-CFLAGS.patch +Patch81: 0081-dracut-functions.sh-avoid-tokenizing-ldconfig-output.patch +Patch82: 0082-90kernel-modules-update-for-xhci-module-split-in-ker.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt @@ -555,6 +560,9 @@ rm -rf -- $RPM_BUILD_ROOT %endif %changelog +* Thu Jan 08 2015 Harald Hoyer 040-83.git20150108 +- git snapshot + * Fri Dec 19 2014 Harald Hoyer 040-78.git20141219 - git snapshot