diff options
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 3 | ||||
| -rwxr-xr-x | scripts/runqemu-internal | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 32ae02b512..06dd677fcb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -15,7 +15,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckou LINUX_VERSION ?= "3.4.10" -PR = "${INC_PR}.1" +PR = "${INC_PR}.3" PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" @@ -28,4 +28,5 @@ KERNEL_FEATURES_append = " features/netfilter" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm" +KERNEL_FEATURES_append_qemux86-64=" cfg/paravirt_kvm" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32", "" ,d)}" diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index f2c8d8309f..6e20dd7512 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -350,8 +350,8 @@ if [ "$MACHINE" = "qemux86-64" ]; then QEMU=qemu-system-x86_64 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then - KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" - QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" + KERNCMDLINE="vga=0 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" + QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" fi if [ "$FSTYPE" = "nfs" ]; then if [ "x$ROOTFS" = "x" ]; then |