Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[8335] branches/1.0/project
|
From: <abe...@us...> - 2017-05-24 23:35:19
|
Revision: 8335
http://sourceforge.net/p/astlinux/code/8335
Author: abelbeck
Date: 2017-05-24 23:35:17 +0000 (Wed, 24 May 2017)
Log Message:
-----------
Enable virtio-scsi as a bootable disk driver for both RUNNIX and the genx86_64-vm AstLinux, adds very little extra size to RUNNIX. Also add virtio-scsi to the ISO Installer (runnix-iso). Thanks much to Michael Keuter for the suggestion and detailed testing
Modified Paths:
--------------
branches/1.0/project/astlinux/board/genx86_64-vm/target_skeleton/etc/rc.modules
branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
branches/1.0/project/astlinux/target_skeleton/etc/rc
branches/1.0/project/runnix/geni586/linux.config
branches/1.0/project/runnix/target_skeleton/runnix
branches/1.0/project/runnix-iso/geni586/linux.config
branches/1.0/project/runnix-iso/target_skeleton/runnix
Modified: branches/1.0/project/astlinux/board/genx86_64-vm/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-vm/target_skeleton/etc/rc.modules 2017-05-24 15:41:24 UTC (rev 8334)
+++ branches/1.0/project/astlinux/board/genx86_64-vm/target_skeleton/etc/rc.modules 2017-05-24 23:35:17 UTC (rev 8335)
@@ -4,7 +4,7 @@
##
## Ethernet support
## Virtual first, then Emulated
-virtio-pci
+virtio_net
vmxnet3
pcnet32
e1000
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2017-05-24 15:41:24 UTC (rev 8334)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2017-05-24 23:35:17 UTC (rev 8335)
@@ -249,7 +249,7 @@
CONFIG_BLOCK=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_INTEGRITY=y
# CONFIG_BLK_CMDLINE_PARSER is not set
#
@@ -380,6 +380,7 @@
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
+CONFIG_NEED_BOUNCE_POOL=y
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
@@ -1206,7 +1207,7 @@
# CONFIG_SCSI_PM8001 is not set
# CONFIG_SCSI_SRP is not set
# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_VIRTIO is not set
+CONFIG_SCSI_VIRTIO=y
# CONFIG_SCSI_CHELSIO_FCOE is not set
# CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -2765,12 +2766,12 @@
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_VIRT_DRIVERS is not set
-CONFIG_VIRTIO=m
+CONFIG_VIRTIO=y
#
# Virtio drivers
#
-CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_BALLOON=m
# CONFIG_VIRTIO_MMIO is not set
@@ -3294,7 +3295,8 @@
# CONFIG_CRYPTO_CRC32C_INTEL is not set
# CONFIG_CRYPTO_CRC32 is not set
# CONFIG_CRYPTO_CRC32_PCLMUL is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
+CONFIG_CRYPTO_CRCT10DIF=y
+# CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
@@ -3388,7 +3390,7 @@
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_T10DIF=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
Modified: branches/1.0/project/astlinux/target_skeleton/etc/rc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/rc 2017-05-24 15:41:24 UTC (rev 8334)
+++ branches/1.0/project/astlinux/target_skeleton/etc/rc 2017-05-24 23:35:17 UTC (rev 8335)
@@ -224,6 +224,8 @@
(while read i; do
if [ "$i" = "sleep" ]; then
sleep 2
+ elif [ "$i" = "virtio-pci" ]; then
+ modprobe virtio_net 2>/dev/null
elif [ "$i" != "rtc" ]; then
modprobe $i 2>/dev/null
fi
Modified: branches/1.0/project/runnix/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix/geni586/linux.config 2017-05-24 15:41:24 UTC (rev 8334)
+++ branches/1.0/project/runnix/geni586/linux.config 2017-05-24 23:35:17 UTC (rev 8335)
@@ -232,7 +232,7 @@
# CONFIG_LBDAF is not set
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_INTEGRITY=y
# CONFIG_BLK_CMDLINE_PARSER is not set
#
@@ -375,6 +375,7 @@
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
+CONFIG_NEED_BOUNCE_POOL=y
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -669,6 +670,7 @@
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_VIRTIO_BLK is not set
# CONFIG_BLK_DEV_HD is not set
# CONFIG_BLK_DEV_RBD is not set
# CONFIG_BLK_DEV_RSXX is not set
@@ -845,6 +847,7 @@
# CONFIG_SCSI_PM8001 is not set
# CONFIG_SCSI_SRP is not set
# CONFIG_SCSI_BFA_FC is not set
+CONFIG_SCSI_VIRTIO=y
# CONFIG_SCSI_CHELSIO_FCOE is not set
# CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -978,6 +981,7 @@
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
+# CONFIG_VIRTIO_NET is not set
# CONFIG_NLMON is not set
# CONFIG_ARCNET is not set
@@ -1311,6 +1315,7 @@
# CONFIG_SERIAL_RP2 is not set
# CONFIG_SERIAL_FSL_LPUART is not set
# CONFIG_TTY_PRINTK is not set
+# CONFIG_VIRTIO_CONSOLE is not set
# CONFIG_IPMI_HANDLER is not set
CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -1318,6 +1323,7 @@
CONFIG_HW_RANDOM_AMD=y
# CONFIG_HW_RANDOM_GEODE is not set
# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HW_RANDOM_VIRTIO is not set
# CONFIG_NVRAM is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
@@ -1951,11 +1957,13 @@
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRTIO=y
#
# Virtio drivers
#
-# CONFIG_VIRTIO_PCI is not set
+CONFIG_VIRTIO_PCI=y
+# CONFIG_VIRTIO_BALLOON is not set
# CONFIG_VIRTIO_MMIO is not set
#
@@ -2416,7 +2424,7 @@
# CONFIG_CRYPTO_CRC32C_INTEL is not set
# CONFIG_CRYPTO_CRC32 is not set
# CONFIG_CRYPTO_CRC32_PCLMUL is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
+CONFIG_CRYPTO_CRCT10DIF=y
# CONFIG_CRYPTO_GHASH is not set
# CONFIG_CRYPTO_MD4 is not set
CONFIG_CRYPTO_MD5=y
@@ -2493,7 +2501,7 @@
CONFIG_GENERIC_IO=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_T10DIF=y
CONFIG_CRC_ITU_T=y
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
Modified: branches/1.0/project/runnix/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix/target_skeleton/runnix 2017-05-24 15:41:24 UTC (rev 8334)
+++ branches/1.0/project/runnix/target_skeleton/runnix 2017-05-24 23:35:17 UTC (rev 8335)
@@ -157,6 +157,9 @@
fi
done
+# Control kernel console messages
+sysctl -w kernel.printk="3 4 1 3" >/dev/null
+
hostname runnix
# Loader not found
Modified: branches/1.0/project/runnix-iso/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix-iso/geni586/linux.config 2017-05-24 15:41:24 UTC (rev 8334)
+++ branches/1.0/project/runnix-iso/geni586/linux.config 2017-05-24 23:35:17 UTC (rev 8335)
@@ -232,7 +232,7 @@
# CONFIG_LBDAF is not set
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_INTEGRITY=y
# CONFIG_BLK_CMDLINE_PARSER is not set
#
@@ -375,6 +375,7 @@
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
+CONFIG_NEED_BOUNCE_POOL=y
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -669,6 +670,7 @@
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_VIRTIO_BLK is not set
# CONFIG_BLK_DEV_HD is not set
# CONFIG_BLK_DEV_RBD is not set
# CONFIG_BLK_DEV_RSXX is not set
@@ -846,6 +848,7 @@
# CONFIG_SCSI_PM8001 is not set
# CONFIG_SCSI_SRP is not set
# CONFIG_SCSI_BFA_FC is not set
+CONFIG_SCSI_VIRTIO=y
# CONFIG_SCSI_CHELSIO_FCOE is not set
# CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -979,6 +982,7 @@
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
+# CONFIG_VIRTIO_NET is not set
# CONFIG_NLMON is not set
# CONFIG_ARCNET is not set
@@ -1312,6 +1316,7 @@
# CONFIG_SERIAL_RP2 is not set
# CONFIG_SERIAL_FSL_LPUART is not set
# CONFIG_TTY_PRINTK is not set
+# CONFIG_VIRTIO_CONSOLE is not set
# CONFIG_IPMI_HANDLER is not set
CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -1319,6 +1324,7 @@
CONFIG_HW_RANDOM_AMD=y
# CONFIG_HW_RANDOM_GEODE is not set
# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HW_RANDOM_VIRTIO is not set
# CONFIG_NVRAM is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
@@ -1952,11 +1958,13 @@
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRTIO=y
#
# Virtio drivers
#
-# CONFIG_VIRTIO_PCI is not set
+CONFIG_VIRTIO_PCI=y
+# CONFIG_VIRTIO_BALLOON is not set
# CONFIG_VIRTIO_MMIO is not set
#
@@ -2417,7 +2425,7 @@
# CONFIG_CRYPTO_CRC32C_INTEL is not set
# CONFIG_CRYPTO_CRC32 is not set
# CONFIG_CRYPTO_CRC32_PCLMUL is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
+CONFIG_CRYPTO_CRCT10DIF=y
# CONFIG_CRYPTO_GHASH is not set
# CONFIG_CRYPTO_MD4 is not set
CONFIG_CRYPTO_MD5=y
@@ -2494,7 +2502,7 @@
CONFIG_GENERIC_IO=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_T10DIF=y
CONFIG_CRC_ITU_T=y
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix 2017-05-24 15:41:24 UTC (rev 8334)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix 2017-05-24 23:35:17 UTC (rev 8335)
@@ -166,6 +166,9 @@
done
fi
+# Control kernel console messages
+sysctl -w kernel.printk="3 4 1 3" >/dev/null
+
hostname runnix
# Loader not found
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
