Harald Hoyer
parent
b94732d29a
commit
b6778ca7d0
|
|
@ -0,0 +1,20 @@
|
|||
From ebc82d38b74bea9645e33055a193d836dfc3afcb Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
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
|
||||
}
|
||||
|
|
@ -0,0 +1,168 @@
|
|||
From e0dc6cd4f60e70077ec8e2ca5d7c7942b744fb91 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
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 <arvidjaar@gmail.com> <arvidjaar@mail.ru>
|
||||
Dan Horák <dhorak@redhat.com> <dan@danny.cz>
|
||||
John Reiser <jreiser@bitwagon.com> <jreiser@BitWagon.com>
|
||||
Luca Berra <bluca@vodka.it> <bluca@comedia.it>
|
||||
-Dave Young <dyoung@redhat.com> dyoung@redhat.com
|
||||
+Dave Young <dyoung@redhat.com> <dyoung@redhat.com>
|
||||
+Dave Young <dyoung@redhat.com> <dave@redhat.com>
|
||||
Frederick Grose <fgrose@sugarlabs.org> <fgrose@gmail.com>
|
||||
Frederic Crozat <fcrozat@suse.com> <fcrozat@mandriva.com>
|
||||
Shawn W Dunn <sfalken@opensuse.org> <sfalken@opensuse.org>
|
||||
+Kyle McMartin <kmcmarti@redhat.com> <kyle@redhat.com>
|
||||
diff --git a/AUTHORS b/AUTHORS
|
||||
index b180143..8a89a54 100644
|
||||
--- a/AUTHORS
|
||||
+++ b/AUTHORS
|
||||
@@ -7,36 +7,40 @@ Warren Togami <wtogami@redhat.com>
|
||||
Jeremy Katz <katzj@redhat.com>
|
||||
Dave Young <dyoung@redhat.com>
|
||||
David Dillow <dave@thedillows.org>
|
||||
+Hannes Reinecke <hare@suse.de>
|
||||
Michal Soltys <soltys@ziu.info>
|
||||
Amerigo Wang <amwang@redhat.com>
|
||||
Colin Guthrie <colin@mageia.org>
|
||||
+Thomas Renninger <trenn@suse.de>
|
||||
+WANG Chao <chaowang@redhat.com>
|
||||
Andrey Borzenkov <arvidjaar@gmail.com>
|
||||
Peter Jones <pjones@redhat.com>
|
||||
-WANG Chao <chaowang@redhat.com>
|
||||
Andreas Thienemann <andreas@bawue.net>
|
||||
-Hannes Reinecke <hare@suse.de>
|
||||
Hans de Goede <hdegoede@redhat.com>
|
||||
+Alexander Tsoy <alexander@tsoy.me>
|
||||
John Reiser <jreiser@bitwagon.com>
|
||||
Luca Berra <bluca@vodka.it>
|
||||
-Thomas Renninger <trenn@suse.de>
|
||||
-Alexander Tsoy <alexander@tsoy.me>
|
||||
-Daniel Drake <dsd@laptop.org>
|
||||
Brian C. Lane <bcl@redhat.com>
|
||||
+Daniel Drake <dsd@laptop.org>
|
||||
Dan Horák <dhorak@redhat.com>
|
||||
Baoquan He <bhe@redhat.com>
|
||||
Leho Kraav <leho@kraav.com>
|
||||
Kamil Rytarowski <n54@gmx.com>
|
||||
Marc Grimme <grimme@atix.de>
|
||||
Peter Rajnoha <prajnoha@redhat.com>
|
||||
+Thorsten Behrens <tbehrens@suse.com>
|
||||
Chao Wang <chaowang@redhat.com>
|
||||
Colin Walters <walters@verbum.org>
|
||||
Frederic Crozat <fcrozat@suse.com>
|
||||
Jesse Keating <jkeating@redhat.com>
|
||||
Milan Broz <mbroz@redhat.com>
|
||||
+Nicolas Chauvet <kwizart@gmail.com>
|
||||
Radek Vykydal <rvykydal@redhat.com>
|
||||
Roberto Sassu <roberto.sassu@polito.it>
|
||||
Anton Blanchard <anton@samba.org>
|
||||
Bill Nottingham <notting@redhat.com>
|
||||
+Chapman Flack <g2@anastigmatix.net>
|
||||
+Cristian Rodríguez <crrodriguez@opensuse.org>
|
||||
David Cantrell <dcantrell@redhat.com>
|
||||
Dennis Gilmore <dennis@ausil.us>
|
||||
Jon Ander Hernandez <jonan.h@gmail.com>
|
||||
@@ -44,21 +48,27 @@ Juan RP <xtraeme@gmail.com>
|
||||
Lance Albertson <lance@osuosl.org>
|
||||
Marian Ganisin <mganisin@redhat.com>
|
||||
Michael Ploujnikov <plouj@somanetworks.com>
|
||||
+Peter Robinson <pbrobinson@gmail.com>
|
||||
+Stefan Reimer <it@startux.de>
|
||||
Stig Telfer <stelfer@cray.com>
|
||||
+Vasiliy Tolstov <v.tolstov@selfip.ru>
|
||||
Wim Muskee <wimmuskee@gmail.com>
|
||||
Alan Jenkins <alan-jenkins@tuffmail.co.uk>
|
||||
Alan Pevec <apevec@redhat.com>
|
||||
-Cristian Rodríguez <crrodriguez@opensuse.org>
|
||||
+Alex Harpin <development@landsofshadow.co.uk>
|
||||
+Daniel Schaal <farbing@web.de>
|
||||
Frederick Grose <fgrose@sugarlabs.org>
|
||||
+Hari Bathini <hbathini@linux.vnet.ibm.com>
|
||||
Ian Dall <ian@beware.dropbear.id.au>
|
||||
James Buren <ryuo@frugalware.org>
|
||||
James Lee <jlee@thestaticvoid.com>
|
||||
Joey Boggs <jboggs@redhat.com>
|
||||
Koen Kooi <koen@dominion.thruhere.net>
|
||||
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||||
+Kyle McMartin <kmcmarti@redhat.com>
|
||||
Mike Snitzer <snitzer@redhat.com>
|
||||
+Minfei Huang <mhuang@redhat.com>
|
||||
Przemysław Rudy <prudy1@o2.pl>
|
||||
-Stefan Reimer <it@startux.de>
|
||||
Thomas Lange <lange@informatik.uni-koeln.de>
|
||||
Till Maas <opensource@till.name>
|
||||
Vivek Goyal <vgoyal@redhat.com>
|
||||
@@ -67,41 +77,42 @@ Adam Williamson <awilliam@redhat.com>
|
||||
Alexander Todorov <atodorov@redhat.com>
|
||||
Andy Lutomirski <luto@mit.edu>
|
||||
Anssi Hannula <anssi@mageia.org>
|
||||
+Antony Messerli <amesserl@rackspace.com>
|
||||
Brandon Philips <brandon@ifup.co>
|
||||
Canek Peláez Valdés <caneko@gmail.com>
|
||||
Chris Leech <cleech@redhat.com>
|
||||
Christian Heinz <christian.ch.heinz@gmail.com>
|
||||
Cong Wang <amwang@redhat.com>
|
||||
-Daniel Schaal <farbing@web.de>
|
||||
Dave Jones <davej@redhat.com>
|
||||
-Dave Young <dave@redhat.com>
|
||||
Dennis Schridde <devurandom@gmx.net>
|
||||
Duane Griffin <duaneg@dghda.com>
|
||||
+Erwan Velu <erwan.velu@enovance.com>
|
||||
Glen Gray <slaine@slaine.org>
|
||||
-Hari Bathini <hbathini@linux.vnet.ibm.com>
|
||||
Hermann Gausterer <git-dracut-2012@mrq1.org>
|
||||
James Laska <jlaska@redhat.com>
|
||||
Jan Stodola <jstodola@redhat.com>
|
||||
Jiri Pirko <jiri@resnulli.us>
|
||||
Joe Lawrence <Joe.Lawrence@stratus.com>
|
||||
+Julian Wolf <juwolf@suse.com>
|
||||
Kevin Yung <Kevin.Yung@myob.com>
|
||||
-Kyle McMartin <kmcmarti@redhat.com>
|
||||
-Kyle McMartin <kyle@redhat.com>
|
||||
Lars R. Damerow <lars@pixar.com>
|
||||
Lennert Buytenhek <buytenh@wantstofly.org>
|
||||
Lubomir Rintel <lkundrak@v3.sk>
|
||||
+Lukas Wunner <lukas@wunner.de>
|
||||
+Major Hayden <major@mhtx.net>
|
||||
Marian Csontos <mcsontos@redhat.com>
|
||||
Matt <smoothsailing72@hotmail.com>
|
||||
Matt Smith <shadowfax@gmx.com>
|
||||
Michal Schmidt <mschmidt@redhat.com>
|
||||
Mike Gorse <mgorse@suse.com>
|
||||
Munehiro Matsuda <haro@kgt.co.jp>
|
||||
-Nicolas Chauvet <kwizart@gmail.com>
|
||||
+NeilBrown <neilb@suse.de>
|
||||
Nikoli <nikoli@lavabit.com>
|
||||
Olivier Blin <dev@blino.org>
|
||||
P J P <ppandit@redhat.com>
|
||||
Paolo Bonzini <pbonzini@redhat.com>
|
||||
Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
+Praveen_Paladugu@Dell.com <Praveen_Paladugu@Dell.com>
|
||||
Pádraig Brady <P@draigBrady.com>
|
||||
Quentin Armitage <quentin@armitage.org.uk>
|
||||
Robert Buchholz <rbu@goodpoint.de>
|
||||
@@ -110,9 +121,13 @@ Shawn W Dunn <sfalken@opensuse.org>
|
||||
Srinivasa T N <seenutn@linux.vnet.ibm.com>
|
||||
Thilo Bangert <thilo.bangert@gmx.net>
|
||||
Thomas Backlund <tmb@mageia.org>
|
||||
+Tobias Geerinckx <tobias.geerinckx@gmail.com>
|
||||
+Tom Gundersen <teg@jklm.no>
|
||||
Tomasz Torcz <tomek@pipebreaker.pl>
|
||||
Vadim Kuznetsov <vadimk@gentoo.org>
|
||||
+Vaughan Cao <vaughan.cao@oracle.com>
|
||||
Ville Skyttä <ville.skytta@iki.fi>
|
||||
Vratislav Podzimek <vpodzime@redhat.com>
|
||||
Yanko Kaneti <yaneti@declera.com>
|
||||
+jloeser <jloeser@suse.de>
|
||||
maximilian attems <max@stro.at>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 1dc360790d6cdaaa124b299e8d375e3670863312 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
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
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From c59779cf9337bc0fc48c7a4d8437f7253f6822c3 Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
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
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From eb8f202ed033ed64dde4ce754f78c2f5683c9224 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Backlund <tmb@mageia.org>
|
||||
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 <abrestic@chromium.org>
|
||||
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 <tmb@mageia.org>
|
||||
---
|
||||
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 \
|
||||
10
dracut.spec
10
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 <harald@redhat.com> 040-83.git20150108
|
||||
- git snapshot
|
||||
|
||||
* Fri Dec 19 2014 Harald Hoyer <harald@redhat.com> 040-78.git20141219
|
||||
- git snapshot
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue