aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Buchholz <tomalok@gmail.com>2018-08-17 21:46:07 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-08-22 12:45:48 +0000
commit2c3f6a6f647e7e6dce08acf871a7438ee46fc05a (patch)
tree1de6f2f4e5835e4395e4eab173bdfcbe11d3bffc
parenta859106885ba4ad387f8fc8b0b367ee51fac2bfd (diff)
downloadaports-2c3f6a6f647e7e6dce08acf871a7438ee46fc05a.tar.gz
aports-2c3f6a6f647e7e6dce08acf871a7438ee46fc05a.tar.bz2
aports-2c3f6a6f647e7e6dce08acf871a7438ee46fc05a.tar.xz
main/linux-vanilla: build NVMe modules for x86* virt flavor
The most recent generation of AWS EC2 instances (c5, i3, m5) expose EBS volums as NVMe devices. This patch simply builds the same NVMe kernel modules for the 'virt' flavor as it does for 'vanilla'.
-rw-r--r--main/linux-vanilla/APKBUILD6
-rw-r--r--main/linux-vanilla/config-virt.x8610
-rw-r--r--main/linux-vanilla/config-virt.x86_6410
3 files changed, 19 insertions, 7 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 945a49b56e..470824aa1f 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=0
+pkgrel=1
pkgdesc="Linux vanilla kernel"
url="http://kernel.org"
depends="mkinitfs"
@@ -229,6 +229,6 @@ b7d8a264cdd08b2661710d4326ec7bbaa35363dd19a390a7ffaf157eadb59291e1c6f027fbc242e7
03a14f009996319fc24fc1a4eae26e250f7cf6213bcdce0f82c3d0b4b54b81517f55e0445df0460d30f6b61f22519f04ac219ce3017c7cf72acd14c43e781a8b config-vanilla.ppc
f60b743952c080a4f8e61930034e2c8f173fbd321d5ebdec92023319c5f6335ed3e1ba04921b6e83f938fd2d32ca29aac14747650cd96608c69053764164ce35 config-vanilla.ppc64le
10ecea3e0a101a898e347a42d74f9a3d8f226153cf487e1d65f59fb557b6fdaccab0d2ad6cf705c6cdeb5ed053eb7c5edecc655b3700e4ba237e965c0b6e417e config-vanilla.s390x
-408a37fdf7dd467c1a874b0de54e72379378e2f4338a964fe2a50d80ddbb8916cb3bd23f000c6f57727384a24e011e06d5f4af6017453391e4cc60fd57892bda config-virt.x86
-c6a7e5f405739856ceab097f878bcf102597ba33a375b8270ba1f0c59784204a587e0d0dbbbd1cd0fc52829552bf147019f7590bdc7034a0881ef5b327c40013 config-virt.x86_64
+72e31d5a1c929c15a96e80b72c332751af4a2d7becbf30ef36e9ccda62038075e77381ceda612d49ea6324f0a087e4312c66eb2df9406aa132a62eee6f303c7f config-virt.x86
+dd40f51d6f69d34ef4c46cf25c5330905937888ebd0773764071f7fa9439c76556e0370f0b59de2f93dd16aaa913704b39e6e266fd75c6fda637e313f4ded847 config-virt.x86_64
7e3dc52a391f325c2798a9e9f5f02a0cfb5e04a84a9190f0dfd4720e738abb780c60ced5da68bd3c2be87c4cb6f52c93a0bf2b7904a81e067787e6661df76a7d patch-4.14.65.xz"
diff --git a/main/linux-vanilla/config-virt.x86 b/main/linux-vanilla/config-virt.x86
index 8d9b8020d5..1742693b53 100644
--- a/main/linux-vanilla/config-virt.x86
+++ b/main/linux-vanilla/config-virt.x86
@@ -1526,9 +1526,15 @@ CONFIG_VIRTIO_BLK=m
# CONFIG_VIRTIO_BLK_SCSI is not set
CONFIG_BLK_DEV_RBD=m
# CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TARGET is not set
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+# CONFIG_NVME_TARGET_FC is not set
#
# Misc devices
diff --git a/main/linux-vanilla/config-virt.x86_64 b/main/linux-vanilla/config-virt.x86_64
index 5745dbf406..35c9983148 100644
--- a/main/linux-vanilla/config-virt.x86_64
+++ b/main/linux-vanilla/config-virt.x86_64
@@ -1558,9 +1558,15 @@ CONFIG_VIRTIO_BLK=m
# CONFIG_VIRTIO_BLK_SCSI is not set
CONFIG_BLK_DEV_RBD=m
# CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TARGET is not set
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+# CONFIG_NVME_TARGET_FC is not set
#
# Misc devices