diff options
| -rw-r--r-- | openslx/config.buildroot | 8 | ||||
| -rw-r--r-- | openslx/config.kernel | 17 |
2 files changed, 16 insertions, 9 deletions
diff --git a/openslx/config.buildroot b/openslx/config.buildroot index d4b07be7a..fc8043b32 100644 --- a/openslx/config.buildroot +++ b/openslx/config.buildroot @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Buildroot 2012.08-git-00177-g02ce294 Configuration +# Buildroot 2012.08-git-00181-gca1a774-dirty Configuration # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -1417,9 +1417,9 @@ BR2_LINUX_KERNEL=y # BR2_LINUX_KERNEL_CUSTOM_VERSION is not set # BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git" -BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="aufs3.4" -BR2_LINUX_KERNEL_VERSION="aufs3.4" +BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.openslx.org/openslx-ng/kernel" +BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="master" +BR2_LINUX_KERNEL_VERSION="master" BR2_LINUX_KERNEL_PATCH="" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y diff --git a/openslx/config.kernel b/openslx/config.kernel index 896b98f41..f6ff712ad 100644 --- a/openslx/config.kernel +++ b/openslx/config.kernel @@ -844,7 +844,8 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_DRBD is not set -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_DNBD=m # CONFIG_BLK_DEV_NVME is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set @@ -854,6 +855,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 # CONFIG_BLK_DEV_XIP is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set +CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RBD is not set @@ -1071,6 +1073,7 @@ CONFIG_MII=y # CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set +CONFIG_VIRTIO_NET=m CONFIG_SUNGEM_PHY=y # CONFIG_ARCNET is not set @@ -1619,12 +1622,14 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_XILINX_PS_UART 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 # CONFIG_HW_RANDOM_INTEL is not set # CONFIG_HW_RANDOM_AMD is not set CONFIG_HW_RANDOM_VIA=y +# CONFIG_HW_RANDOM_VIRTIO is not set CONFIG_NVRAM=y # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set @@ -2382,13 +2387,15 @@ CONFIG_UIO=y # CONFIG_UIO_SERCOS3 is not set # CONFIG_UIO_PCI_GENERIC is not set # CONFIG_UIO_NETX is not set +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m # # Virtio drivers # -# CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTIO_BALLOON is not set -# CONFIG_VIRTIO_MMIO is not set +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m # # Microsoft Hyper-V guest support @@ -2415,7 +2422,7 @@ CONFIG_IOMMU_SUPPORT=y # # Rpmsg drivers (EXPERIMENTAL) # -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set # |