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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57746138334 for ; Tue, 26 Nov 2019 13:50:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EE0DE0903; Tue, 26 Nov 2019 13:50:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9778E0903 for ; Tue, 26 Nov 2019 13:50:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9499134D406 for ; Tue, 26 Nov 2019 13:50:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC2678B8 for ; Tue, 26 Nov 2019 13:50:04 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1574776040.b8bf4c4ae97f8d077a8e6b9cb23593e45d9ea966.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/modules_load gen_configkernel.sh X-VCS-Directories: / defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: b8bf4c4ae97f8d077a8e6b9cb23593e45d9ea966 X-VCS-Branch: master Date: Tue, 26 Nov 2019 13:50:04 +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: 419daf39-af5e-416e-8534-b8d3e360b480 X-Archives-Hash: de1b6987544b98d5e50081a97d50dc22 commit: b8bf4c4ae97f8d077a8e6b9cb23593e45d9ea966 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Nov 26 13:36:31 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Nov 26 13:47:20 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b8bf4c4a gen_configkernel.sh: config_kernel(): Add virtiofs support Signed-off-by: Thomas Deutschmann gentoo.org> defaults/modules_load | 2 +- gen_configkernel.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/defaults/modules_load b/defaults/modules_load index ed5e197..1b85842 100644 --- a/defaults/modules_load +++ b/defaults/modules_load @@ -27,7 +27,7 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus" # Filesystems -MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop squashfs aufs overlay cramfs configfs fscrypto msdos" +MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse virtiofs loop squashfs aufs overlay cramfs configfs fscrypto msdos" # Crypto MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic aes_generic xts af_alg algif_skcipher algif_hash algif_aead algif_rng" diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 7dbcadd..7840491 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -790,6 +790,18 @@ config_kernel() { [ ${KV_NUMERIC} -ge 4010 ] && kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_DEV_VIRTIO" "${newvirtio_setting}" + + if [ ${KV_NUMERIC} -ge 5004 ] + then + local cfg_CONFIG_FUSE_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FUSE_FS") + case "${cfg_CONFIG_FUSE_FS}" in + y|m) ;; # Do nothing + *) cfg_CONFIG_FUSE_FS=${newvirtio_setting} + esac + + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FUSE_FS" "${cfg_CONFIG_FUSE_FS}" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_FS" "${cfg_CONFIG_FUSE_FS}" + fi fi # Microcode setting, intended for early microcode loading, if --microcode