From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Thu, 15 Nov 2012 22:43:24 +0100 Subject: [Buildroot] [git commit] qemu/x86: update to use kernel 3.6.6 Message-ID: <20121115230532.B69239A031@busybox.osuosl.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=38c42da73e81ce2af168b88ed9e6edd99639a8af branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../x86/{linux-3.5.config => linux-3.6.config} | 0 board/qemu/x86/readme.txt | 2 +- configs/qemu_x86_defconfig | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/qemu/x86/linux-3.5.config b/board/qemu/x86/linux-3.6.config similarity index 100% rename from board/qemu/x86/linux-3.5.config rename to board/qemu/x86/linux-3.6.config diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index f6f5437..3cca682 100644 --- a/board/qemu/x86/readme.txt +++ b/board/qemu/x86/readme.txt @@ -4,4 +4,4 @@ Run the emulation with: The login prompt will appear in the graphical window. -Tested with QEMU 1.1.1 +Tested with QEMU 1.2.0 diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 73c16a3..90524b5 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Lock to 3.5 headers to avoid breaking with newer kernels -BR2_KERNEL_HEADERS_3_5=y +# Lock to 3.6 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_3_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.6.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.5.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.6.config"