From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1AE08158086 for ; Mon, 27 Dec 2021 16:51:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A9B22BC008; Mon, 27 Dec 2021 16:51:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B3052BC008 for ; Mon, 27 Dec 2021 16:51:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42866342EB9 for ; Mon, 27 Dec 2021 16:51:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 954501BF for ; Mon, 27 Dec 2021 16:51:45 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1640623902.a50ce1b8021417323405d8526e104248b07d86b8.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-055-r3.ebuild sys-kernel/dracut/dracut-055-r4.ebuild sys-kernel/dracut/files/055-add-blockfuncs.patch X-VCS-Directories: sys-kernel/dracut/ sys-kernel/dracut/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: a50ce1b8021417323405d8526e104248b07d86b8 X-VCS-Branch: master Date: Mon, 27 Dec 2021 16:51:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ccf5c65b-644b-4e2d-94d0-54cd2589e7db X-Archives-Hash: 7565b5e4a73b41c041e7d37689681190 commit: a50ce1b8021417323405d8526e104248b07d86b8 Author: Mike Gilbert gentoo org> AuthorDate: Mon Dec 27 16:51:09 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Dec 27 16:51:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50ce1b8 sys-kernel/dracut: backport a patch Signed-off-by: Mike Gilbert gentoo.org> .../{dracut-055-r3.ebuild => dracut-055-r4.ebuild} | 1 + sys-kernel/dracut/files/055-add-blockfuncs.patch | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/sys-kernel/dracut/dracut-055-r3.ebuild b/sys-kernel/dracut/dracut-055-r4.ebuild similarity index 99% rename from sys-kernel/dracut/dracut-055-r3.ebuild rename to sys-kernel/dracut/dracut-055-r4.ebuild index b6ae9af423ff..607fff23c894 100644 --- a/sys-kernel/dracut/dracut-055-r3.ebuild +++ b/sys-kernel/dracut/dracut-055-r4.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}"/055-fix-base-do-not-quote-initargs-for-switch_root.patch "${FILESDIR}"/055-fix-usrmount-do-not-empty-_dev-variable.patch "${FILESDIR}"/055-tpm2-tss-typo.patch + "${FILESDIR}"/055-add-blockfuncs.patch "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch ) diff --git a/sys-kernel/dracut/files/055-add-blockfuncs.patch b/sys-kernel/dracut/files/055-add-blockfuncs.patch new file mode 100644 index 000000000000..56724e0c73aa --- /dev/null +++ b/sys-kernel/dracut/files/055-add-blockfuncs.patch @@ -0,0 +1,25 @@ +From a91dcfeb54b8c6c810020f77124f6eaf6ef5baa9 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 12 Aug 2021 11:46:35 +0200 +Subject: [PATCH] fix(kernel-modules): add blk_mq_alloc_disk and + blk_cleanup_disk to blockfuncs + +Since kernel 5-14 those are used by many drivers for example: +xen-blkfront, loop, nbd, pd +--- + 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 8b06893ae..69dc18b59 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -2,7 +2,7 @@ + + # called by dracut + installkernel() { +- 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' ++ 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' + local -A _hostonly_drvs + + find_kernel_modules_external() {