From 657a23d40c6bc255be8c4fc7a854604b409bdf92 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Tue, 5 Jul 2016 12:06:03 -0700 Subject: [PATCH] sys-kernel/coreos-modules: TCM/FS config - enable TCM for torus - sync some fs options for arm64 and enable scsi cd driver --- ...rnel-4.6.3-r1.ebuild => coreos-kernel-4.6.3-r2.ebuild} | 0 ...les-4.6.3-r1.ebuild => coreos-modules-4.6.3-r2.ebuild} | 0 .../sys-kernel/coreos-modules/files/amd64_defconfig-4.6 | 2 ++ .../sys-kernel/coreos-modules/files/arm64_defconfig-4.6 | 8 ++++++++ 4 files changed, 10 insertions(+) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.6.3-r1.ebuild => coreos-kernel-4.6.3-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.6.3-r1.ebuild => coreos-modules-4.6.3-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.6.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.6.3-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.6.3-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.6.3-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.6.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.6.3-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.6.3-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.6.3-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.6 index 3c6d8b5812..f8ba6c0cac 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.6 @@ -551,7 +551,9 @@ CONFIG_DM_VERITY=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m CONFIG_ISCSI_TARGET=m CONFIG_FUSION=y CONFIG_FUSION_SPI=m diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.6 index 16f169cd2d..4c7770d609 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.6 @@ -172,6 +172,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_VIRTIO_BLK=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=m # CONFIG_SCSI_LOWLEVEL is not set CONFIG_ATA=y CONFIG_SATA_AHCI=y @@ -188,7 +189,9 @@ CONFIG_DM_CACHE=y CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m CONFIG_ISCSI_TARGET=m CONFIG_NETDEVICES=y CONFIG_IFB=y @@ -298,6 +301,11 @@ CONFIG_CUSE=y CONFIG_OVERLAY_FS=m CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y