kernel: Compile in virtio modules.

Basic virtio modules should be present without loading an extra
module. virtio_console and virtio_pci benefit a lot of an early
initialization.

However, it is not possible to compile them in on armv7hl-omap.

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 1e2f0afb59c0d9030d3726838961b99aa73b65ae..23f6633da0865111dab2d2c10e3e8033f6800b51 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -290,7 +290,6 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_HVC_DCC is not set
-CONFIG_VIRTIO_CONSOLE=m
 
 #
 # PC SMBus host controller drivers

diff --git a/kernel/config-armv7hl-omap b/kernel/config-armv7hl-omap
index 920644c76e3a5c89ac051ce9316a56cbb205224c..66aba75a6e65e94e06dd1d2d9031f51ca4546139 100644 (file)
--- a/kernel/config-armv7hl-omap
+++ b/kernel/config-armv7hl-omap
@@ -345,6 +345,7 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_I2C=y
 
 #
@@ -538,6 +539,12 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 #
 # CONFIG_RTC_DRV_TWL4030 is not set
 
+#
+# DMA Clients
+#
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+
 #
 # Virtio drivers
 #

diff --git a/kernel/config-generic b/kernel/config-generic
index b918e5c1c7da081539c7ae52cadf9ca918afa700..79c38a99dfc9650a58d5fea65fb3d1bb8fd93c1d 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -1852,6 +1852,7 @@ CONFIG_PRINTER=m
 CONFIG_LP_CONSOLE=y
 CONFIG_PPDEV=m
 CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=y
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -3444,13 +3445,13 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_RING=y
 
 #
 # Virtio drivers
 #
-CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_BALLOON=m
 # CONFIG_VIRTIO_MMIO is not set
 

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 224fd52c260197ed41ca232fafcab05fc7543695..0d707563c03c21972e239ccd78790756ee6c55aa 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -392,7 +392,6 @@ CONFIG_SERIAL_8250_PNP=y
 #
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
-# CONFIG_VIRTIO_CONSOLE is not set
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index ed507e43a065ed277e70defa7961e8cc932a8e90..ec46938c2d52832f82c7c3d74a5ba510bbd45064 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.2.12
-release    = 1
+release    = 2
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -359,8 +359,8 @@ packages
                end
 
                _posttrans
-                       /sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmod --update %{kernel_release} || exit $?
-                       /sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_release} || exit $?
+                       /sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmod --update %{kernel_release}
+                       /sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_release}
                end
 
                script posttransin
@@ -372,7 +372,7 @@ packages
                end
 
                script postin
-                       /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --install %{KVERREL}%{?-v:.%{-v*}}
+                       /sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release}
                end
 
                script postup