harald pushed to dracut (f21). "dracut 038-39.git20150518 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 11:59:03 UTC 2015
From e1428ded1f232ce7ff7fecb9d7b095865695f541 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 18 May 2015 13:58:00 +0200
Subject: dracut 038-39.git20150518
- add more input drivers
Resolves: rhbz#1135734 rhbz#1204392
- lvm: add cache tools for dm-cache usage
Resolves: rhbz#1184519
- add hyperv framebuffer module
Resolves: rhbz#1192035
- add amdkfd kernel module
Resolves: rhbz#1205222
- add sdhci-pci kernel module
Resolves: rhbz#1211480
diff --git a/0032-do-not-fsck-on-resume-from-hibernation.patch b/0032-do-not-fsck-on-resume-from-hibernation.patch
deleted file mode 100644
index d165bef..0000000
--- a/0032-do-not-fsck-on-resume-from-hibernation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Harald Hoyer <harald at redhat.com>
-Date: Wed, 17 Dec 2014 12:08:37 +0100
-Subject: resume: make use of systemd-hibernate-resume, if existant
-
-Source: https://bugzilla.redhat.com/attachment.cgi?id=990261&action=diff
-References: https://bugzilla.redhat.com/show_bug.cgi?id=1174945
-Based on dracut commit 733c71c:
-http://git.kernel.org/cgit/boot/dracut/dracut.git/patch/?id=733c71ce9e2d161c9e04772aeb1c5fb38e3fcb3a
-
-Note: e-mail header was used from original commit
-
- modules.d/95resume/module-setup.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
---- a/modules.d/95resume/module-setup.sh
-+++ a/modules.d/95resume/module-setup.sh
-@@ -35,6 +35,15 @@ install() {
- echo >> "${initdir}/etc/cmdline.d/95resume.conf"
- fi
-
-+ # if systemd is included and has the hibernate-resume tool, use it and nothing else
-+ if dracut_module_included "systemd" && [[ -x $systemdutildir/systemd-hibernate-resume ]]; then
-+ inst_multiple -o \
-+ $systemdutildir/system-generators/systemd-hibernate-resume-generator \
-+ $systemdsystemunitdir/systemd-hibernate-resume at .service \
-+ $systemdutildir/systemd-hibernate-resume
-+ return 0
-+ fi
-+
- # Optional uswsusp support
- for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib/uswsusp/resume
- do
---
diff --git a/0032-resume-make-use-of-systemd-hibernate-resume-if-exist.patch b/0032-resume-make-use-of-systemd-hibernate-resume-if-exist.patch
new file mode 100644
index 0000000..ae911cd
--- /dev/null
+++ b/0032-resume-make-use-of-systemd-hibernate-resume-if-exist.patch
@@ -0,0 +1,38 @@
+From 08b0280c8a3f057c44bb0e761d4e0755f8c299f8 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 17 Dec 2014 12:08:37 +0100
+Subject: [PATCH] resume: make use of systemd-hibernate-resume, if existant
+
+Source: https://bugzilla.redhat.com/attachment.cgi?id=990261&action=diff
+References: https://bugzilla.redhat.com/show_bug.cgi?id=1174945
+Based on dracut commit 733c71c:
+http://git.kernel.org/cgit/boot/dracut/dracut.git/patch/?id=733c71ce9e2d161c9e04772aeb1c5fb38e3fcb3a
+
+Note: e-mail header was used from original commit
+
+ modules.d/95resume/module-setup.sh | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+---
+ modules.d/95resume/module-setup.sh | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
+index b964b3e..28e981c 100755
+--- a/modules.d/95resume/module-setup.sh
++++ b/modules.d/95resume/module-setup.sh
+@@ -35,6 +35,15 @@ install() {
+ echo >> "${initdir}/etc/cmdline.d/95resume.conf"
+ fi
+
++ # if systemd is included and has the hibernate-resume tool, use it and nothing else
++ if dracut_module_included "systemd" && [[ -x $systemdutildir/systemd-hibernate-resume ]]; then
++ inst_multiple -o \
++ $systemdutildir/system-generators/systemd-hibernate-resume-generator \
++ $systemdsystemunitdir/systemd-hibernate-resume at .service \
++ $systemdutildir/systemd-hibernate-resume
++ return 0
++ fi
++
+ # Optional uswsusp support
+ for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib/uswsusp/resume
+ do
diff --git a/0033-kernel-modules-added-hid-lcpower.patch b/0033-kernel-modules-added-hid-lcpower.patch
new file mode 100644
index 0000000..c76b6c4
--- /dev/null
+++ b/0033-kernel-modules-added-hid-lcpower.patch
@@ -0,0 +1,25 @@
+From fe7e3007d221e2795f0620363d7fa2a5e0307d93 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 8 Sep 2014 13:25:53 +0200
+Subject: [PATCH] kernel-modules: added hid-lcpower
+
+(cherry picked from commit 23ad117c4951c040761e754adb605e98c034dfe7)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1135734
+---
+ 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 f3e4f65..5f96ba9 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -45,7 +45,7 @@ installkernel() {
+
+ instmods yenta_socket scsi_dh_rdac scsi_dh_emc \
+ atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \
+- hid-logitech-dj hid-microsoft firewire-ohci \
++ hid-logitech-dj hid-microsoft hid-lcpower firewire-ohci \
+ pcmcia usb_storage nvme hid-hyperv hv-vmbus \
+ sdhci_acpi
+
diff --git a/0034-lvm-add-cache-tools-for-dm-cache-usage.patch b/0034-lvm-add-cache-tools-for-dm-cache-usage.patch
new file mode 100644
index 0000000..c8ffa75
--- /dev/null
+++ b/0034-lvm-add-cache-tools-for-dm-cache-usage.patch
@@ -0,0 +1,42 @@
+From c7853418f7bb095e2cef000e261a5a2293d15a81 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 28 Jan 2015 13:25:09 +0000
+Subject: [PATCH] lvm: add cache tools for dm-cache usage
+
+(cherry picked from commit 70598ac292bce6e554cf0dc327426a7dbf92c65f)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1184519
+---
+ modules.d/90lvm/module-setup.sh | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
+index 2f2b64c..6731c65 100755
+--- a/modules.d/90lvm/module-setup.sh
++++ b/modules.d/90lvm/module-setup.sh
+@@ -109,12 +109,19 @@ install() {
+ dev=$(</sys/block/${dev#/dev/}/dm/name)
+ eval $(dmsetup splitname --nameprefixes --noheadings --rows "$dev" 2>/dev/null)
+ [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || continue
+- if [[ "$(lvs --noheadings -o segtype ${DM_VG_NAME} 2>/dev/null)" == *thin* ]] ; then
+- inst_multiple -o thin_dump thin_restore thin_check thin_repair
+- break
+- fi
++ case "$(lvs --noheadings -o segtype ${DM_VG_NAME} 2>/dev/null)" in
++ *thin*|*cache*|*era*)
++ inst_multiple -o thin_dump thin_restore thin_check thin_repair \
++ cache_dump cache_restore cache_check cache_repair \
++ era_check era_dump era_invalidate era_restore
++ break;;
++ esac
+ done
+- else
+- inst_multiple -o thin_dump thin_restore thin_check thin_repair
++ fi
++
++ if ! [[ $hostonly ]]; then
++ inst_multiple -o thin_dump thin_restore thin_check thin_repair \
++ cache_dump cache_restore cache_check cache_repair \
++ era_check era_dump era_invalidate era_restore
+ fi
+ }
diff --git a/0035-kernel-modules-install-all-HID-drivers.patch b/0035-kernel-modules-install-all-HID-drivers.patch
new file mode 100644
index 0000000..7493732
--- /dev/null
+++ b/0035-kernel-modules-install-all-HID-drivers.patch
@@ -0,0 +1,41 @@
+From f95f348d8975f7e37465226d1fee9791f68e7c92 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 23 Apr 2015 13:46:52 +0200
+Subject: [PATCH] kernel-modules: install all HID drivers
+
+Instead of hardcoding a list of useful drivers, which has to be curated
+all the time, just include all HID drivers.
+
+(cherry picked from commit 180e9d78516fb4b2ee5baef44521007a860d4dd2)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1204392
+---
+ modules.d/90kernel-modules/module-setup.sh | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 5f96ba9..062aca4 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -41,13 +41,15 @@ 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 \
+- atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \
+- hid-logitech-dj hid-microsoft hid-lcpower firewire-ohci \
+- pcmcia usb_storage nvme hid-hyperv hv-vmbus \
+- sdhci_acpi
++ instmods \
++ "=drivers/hid" \
++ "=drivers/input/serio" \
++ "=drivers/input/keyboard"
++
++ instmods yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
++ atkbd i8042 usbhid firewire-ohci pcmcia hv-vmbus
+
+ if [[ "$(uname -p)" == arm* ]]; then
+ # arm specific modules
diff --git a/0036-drm-module-setup.sh-radeon-needs-amdkfd.patch b/0036-drm-module-setup.sh-radeon-needs-amdkfd.patch
new file mode 100644
index 0000000..e4b10d9
--- /dev/null
+++ b/0036-drm-module-setup.sh-radeon-needs-amdkfd.patch
@@ -0,0 +1,53 @@
+From 2c98646d6737b931cff0aec53156b6959a401549 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 23 Apr 2015 16:11:53 +0200
+Subject: [PATCH] drm/module-setup.sh: radeon needs amdkfd
+
+AMD's HSA Linux kernel driver (amdkfd) has been merged into the mainline
+kernel since kernel 3.19.
+
+However, for the driver to work, it needs to be included in the default
+initramfs image, together with the amd_iommu_v2 driver.
+
+The radeon driver (AMD's kernel graphic driver) calls amdkfd during its
+initialization and probing stages. Because radeon is included in the
+initramfs image, it tries to initialize amdkfd during the early boot
+stages. However, as amdkfd is not present there, it fails.
+
+That doesn't harm radeon operation. However, it disables the HSA
+abilities in the machine.
+
+Because of the current design, if you later try to "modprobe amdkfd",
+you won't be able to run HSA applications, even though the driver will
+be loaded.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1205222
+(cherry picked from commit a3e464ca43618e362ad3c2e20573de23d725bee6)
+---
+ modules.d/50drm/module-setup.sh | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh
+index a42bcba..317c084 100755
+--- a/modules.d/50drm/module-setup.sh
++++ b/modules.d/50drm/module-setup.sh
+@@ -62,6 +62,8 @@ installkernel() {
+ ${NULL}
+ fi
+
++ instmods amdkfd
++
+ for _modname in $(find_kernel_modules_by_path drivers/gpu/drm \
+ | drm_module_filter) ; do
+ # if the hardware is present, include module even if it is not currently loaded,
+@@ -70,6 +72,10 @@ installkernel() {
+ if [[ $hostonly ]] && modinfo -F alias $_modname | sed -e 's,\?,\.,g' -e 's,\*,\.\*,g' \
+ | grep -qxf - /sys/bus/{pci/devices,soc/devices/soc?}/*/modalias 2>/dev/null; then
+ hostonly='' instmods $_modname
++ # if radeon.ko is installed, we want amdkfd also
++ if strstr "$_modname" radeon.ko; then
++ hostonly='' instmods amdkfd
++ fi
+ continue
+ fi
+ instmods $_modname
diff --git a/0037-50drm-add-hyperv_fb-kernel-module.patch b/0037-50drm-add-hyperv_fb-kernel-module.patch
new file mode 100644
index 0000000..2bab278
--- /dev/null
+++ b/0037-50drm-add-hyperv_fb-kernel-module.patch
@@ -0,0 +1,24 @@
+From c1d1a985b980ef1d89d39dce1c3570f3adf119ad Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 18 May 2015 13:43:26 +0200
+Subject: [PATCH] 50drm: add hyperv_fb kernel module
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1192035
+(cherry picked from commit 81b67232dcc796178124676d124d7d91514e4a8f)
+---
+ modules.d/50drm/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/50drm/module-setup.sh b/modules.d/50drm/module-setup.sh
+index 317c084..fd484e3 100755
+--- a/modules.d/50drm/module-setup.sh
++++ b/modules.d/50drm/module-setup.sh
+@@ -62,7 +62,7 @@ installkernel() {
+ ${NULL}
+ fi
+
+- instmods amdkfd
++ instmods amdkfd hyperv_fb
+
+ for _modname in $(find_kernel_modules_by_path drivers/gpu/drm \
+ | drm_module_filter) ; do
diff --git a/0038-kernel-modules-increase-SDHCI-driver-inclusion.patch b/0038-kernel-modules-increase-SDHCI-driver-inclusion.patch
new file mode 100644
index 0000000..9adc7a3
--- /dev/null
+++ b/0038-kernel-modules-increase-SDHCI-driver-inclusion.patch
@@ -0,0 +1,33 @@
+From bf46a9105123ac9b36af1debb225bb8007d427c9 Mon Sep 17 00:00:00 2001
+From: Daniel Drake <drake at endlessm.com>
+Date: Thu, 15 Jan 2015 11:27:47 -0600
+Subject: [PATCH] kernel-modules: increase SDHCI driver inclusion
+
+The sdhci-pci module is currently not being included in the initramfs,
+even though other sdhci modules are. This breaks boot on systems that
+rely on this driver to access the root filesystem.
+
+Instead of looking for modules that use sdhci_pltfm_init, look for
+sdhci_add_host. I checked 3.18 kernel sources, and this change
+does not remove any of the previously-matched SDHCI drivers.
+It should result in the addition of sdhci-pci, sdhci-s3c, sdhci-spear
+and sdhci-acpi.
+
+(cherry picked from commit 6dcc5e1158bf502b431491a381a16ca894f99ae2)
+---
+ 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 062aca4..9213cd4 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -6,7 +6,7 @@
+ installkernel() {
+ if [[ -z $drivers ]]; then
+ block_module_filter() {
+- local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_pltfm_init'
++ local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host'
+ # subfunctions inherit following FDs
+ local _merge=8 _side2=9
+ function bmf1() {
diff --git a/dracut.spec b/dracut.spec
index d003281..6710b89 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -11,7 +11,7 @@
Name: dracut
Version: 038
-Release: 33.git20141216%{?dist}
+Release: 39.git20150518%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -61,7 +61,13 @@ Patch28: 0028-dmsquash-live-do-not-abort-if-user-pressed-ESC-on-ch.patch
Patch29: 0029-dracut.conf.d-fedora.conf.example-turn-on-early_micr.patch
Patch30: 0030-systemd-add-90-vconsole.rules.patch
Patch31: 0031-do-not-symlink-var-log-to-run-log.patch
-Patch32: 0032-do-not-fsck-on-resume-from-hibernation.patch
+Patch32: 0032-resume-make-use-of-systemd-hibernate-resume-if-exist.patch
+Patch33: 0033-kernel-modules-added-hid-lcpower.patch
+Patch34: 0034-lvm-add-cache-tools-for-dm-cache-usage.patch
+Patch35: 0035-kernel-modules-install-all-HID-drivers.patch
+Patch36: 0036-drm-module-setup.sh-radeon-needs-amdkfd.patch
+Patch37: 0037-50drm-add-hyperv_fb-kernel-module.patch
+Patch38: 0038-kernel-modules-increase-SDHCI-driver-inclusion.patch
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
@@ -510,6 +516,18 @@ rm -rf -- $RPM_BUILD_ROOT
%endif
%changelog
+* Mon May 18 2015 Harald Hoyer <harald at redhat.com> 038-39.git20150518
+- add more input drivers
+Resolves: rhbz#1135734 rhbz#1204392
+- lvm: add cache tools for dm-cache usage
+Resolves: rhbz#1184519
+- add hyperv framebuffer module
+Resolves: rhbz#1192035
+- add amdkfd kernel module
+Resolves: rhbz#1205222
+- add sdhci-pci kernel module
+Resolves: rhbz#1211480
+
* Fri Mar 06 2015 Till Maas <opensource at till.name> - 038-33.git20141216
- Do not fsck on resum from hibernate
Resolves: rhbz#1174945
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/dracut.git/commit/?h=f21&id=e1428ded1f232ce7ff7fecb9d7b095865695f541
More information about the scm-commits
mailing list