[gentoo-commits] proj/genkernel:master commit in: /, defaults/

[Thomas Deutschmann]

commit:     b8bf4c4ae97f8d077a8e6b9cb23593e45d9ea966
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 13:36:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <whissi <AT> 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