| 1 |
commit: a50ce1b8021417323405d8526e104248b07d86b8 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 27 16:51:09 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 27 16:51:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50ce1b8 |
| 7 |
|
| 8 |
sys-kernel/dracut: backport a patch |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{dracut-055-r3.ebuild => dracut-055-r4.ebuild} | 1 + |
| 13 |
sys-kernel/dracut/files/055-add-blockfuncs.patch | 25 ++++++++++++++++++++++ |
| 14 |
2 files changed, 26 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sys-kernel/dracut/dracut-055-r3.ebuild b/sys-kernel/dracut/dracut-055-r4.ebuild |
| 17 |
similarity index 99% |
| 18 |
rename from sys-kernel/dracut/dracut-055-r3.ebuild |
| 19 |
rename to sys-kernel/dracut/dracut-055-r4.ebuild |
| 20 |
index b6ae9af423ff..607fff23c894 100644 |
| 21 |
--- a/sys-kernel/dracut/dracut-055-r3.ebuild |
| 22 |
+++ b/sys-kernel/dracut/dracut-055-r4.ebuild |
| 23 |
@@ -64,6 +64,7 @@ PATCHES=( |
| 24 |
"${FILESDIR}"/055-fix-base-do-not-quote-initargs-for-switch_root.patch |
| 25 |
"${FILESDIR}"/055-fix-usrmount-do-not-empty-_dev-variable.patch |
| 26 |
"${FILESDIR}"/055-tpm2-tss-typo.patch |
| 27 |
+ "${FILESDIR}"/055-add-blockfuncs.patch |
| 28 |
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch |
| 29 |
) |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/sys-kernel/dracut/files/055-add-blockfuncs.patch b/sys-kernel/dracut/files/055-add-blockfuncs.patch |
| 33 |
new file mode 100644 |
| 34 |
index 000000000000..56724e0c73aa |
| 35 |
--- /dev/null |
| 36 |
+++ b/sys-kernel/dracut/files/055-add-blockfuncs.patch |
| 37 |
@@ -0,0 +1,25 @@ |
| 38 |
+From a91dcfeb54b8c6c810020f77124f6eaf6ef5baa9 Mon Sep 17 00:00:00 2001 |
| 39 |
+From: Lukas Nykryn <lnykryn@××××××.com> |
| 40 |
+Date: Thu, 12 Aug 2021 11:46:35 +0200 |
| 41 |
+Subject: [PATCH] fix(kernel-modules): add blk_mq_alloc_disk and |
| 42 |
+ blk_cleanup_disk to blockfuncs |
| 43 |
+ |
| 44 |
+Since kernel 5-14 those are used by many drivers for example: |
| 45 |
+xen-blkfront, loop, nbd, pd |
| 46 |
+--- |
| 47 |
+ modules.d/90kernel-modules/module-setup.sh | 2 +- |
| 48 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 49 |
+ |
| 50 |
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh |
| 51 |
+index 8b06893ae..69dc18b59 100755 |
| 52 |
+--- a/modules.d/90kernel-modules/module-setup.sh |
| 53 |
++++ b/modules.d/90kernel-modules/module-setup.sh |
| 54 |
+@@ -2,7 +2,7 @@ |
| 55 |
+ |
| 56 |
+ # called by dracut |
| 57 |
+ installkernel() { |
| 58 |
+- 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|scsi_add_host_with_dma' |
| 59 |
++ 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|scsi_add_host_with_dma|blk_mq_alloc_disk|blk_cleanup_disk' |
| 60 |
+ local -A _hostonly_drvs |
| 61 |
+ |
| 62 |
+ find_kernel_modules_external() { |
Archives