summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Schmelzer2012-06-22 12:30:39 +0200
committerSebastian Schmelzer2012-06-22 12:30:39 +0200
commitfaa8ece3e909a8853d2478d4f00e8e35def431f2 (patch)
tree9df694bb757aaa5dacbe8e645118895bfd1d5b08
parentMerge branch 'master' of openslx.org:openslx-ng/buildroot (diff)
downloadbuildroot-faa8ece3e909a8853d2478d4f00e8e35def431f2.tar.gz
buildroot-faa8ece3e909a8853d2478d4f00e8e35def431f2.tar.xz
buildroot-faa8ece3e909a8853d2478d4f00e8e35def431f2.zip
update kernel config
-rw-r--r--openslx/config.buildroot40
1 files changed, 30 insertions, 10 deletions
diff --git a/openslx/config.buildroot b/openslx/config.buildroot
index e484095a7..d4b07be7a 100644
--- a/openslx/config.buildroot
+++ b/openslx/config.buildroot
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2012.08-git-00176-g463e9b8 Configuration
+# Buildroot 2012.08-git-00177-g02ce294 Configuration
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -285,6 +285,7 @@ BR2_PACKAGE_KEXEC_ZLIB=y
# BR2_PACKAGE_LATENCYTOP is not set
# BR2_PACKAGE_LMBENCH is not set
# BR2_PACKAGE_LTP_TESTSUITE is not set
+# BR2_PACKAGE_LTTNG_MODULES is not set
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_MEMSTAT=y
BR2_PACKAGE_NETPERF=y
@@ -357,6 +358,7 @@ BR2_PACKAGE_FBV_PNG=y
BR2_PACKAGE_FBV_JPEG=y
BR2_PACKAGE_FBV_GIF=y
# BR2_PACKAGE_IMAGEMAGICK is not set
+# BR2_PACKAGE_LINUX_FUSION is not set
# BR2_PACKAGE_SDL is not set
#
@@ -1165,6 +1167,7 @@ BR2_PACKAGE_DROPBEAR_LASTLOG=y
# BR2_PACKAGE_ETHTOOL is not set
# BR2_PACKAGE_HEIRLOOM_MAILX is not set
# BR2_PACKAGE_HOSTAPD is not set
+# BR2_PACKAGE_IGH_ETHERCAT is not set
# BR2_PACKAGE_IPERF is not set
BR2_PACKAGE_IPROUTE2=y
# BR2_PACKAGE_IPSEC_TOOLS is not set
@@ -1393,14 +1396,8 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
# BR2_TARGET_ROOTFS_TAR_LZMA is not set
BR2_TARGET_ROOTFS_TAR_OPTIONS=""
# BR2_TARGET_ROOTFS_CPIO is not set
-
-#
-# iso image requires a Linux kernel to be built
-#
-
-#
-# initramfs requires a Linux kernel to be built
-#
+# BR2_TARGET_ROOTFS_ISO9660 is not set
+# BR2_TARGET_ROOTFS_INITRAMFS is not set
# BR2_TARGET_ROOTFS_ROMFS is not set
#
@@ -1414,4 +1411,27 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
#
# Kernel
#
-# BR2_LINUX_KERNEL is not set
+BR2_LINUX_KERNEL=y
+# BR2_LINUX_KERNEL_3_4 is not set
+# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
+# 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_PATCH=""
+# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="openslx/config.kernel"
+BR2_LINUX_KERNEL_BZIMAGE=y
+# BR2_LINUX_KERNEL_VMLINUX is not set
+# BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+
+#
+# Linux Kernel Extensions
+#
+# BR2_LINUX_KERNEL_EXT_XENOMAI is not set
+# BR2_LINUX_KERNEL_EXT_OCF_LINUX is not set
+# BR2_LINUX_KERNEL_EXT_RTAI is not set