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 | |||
15 | 15 | ||
16 | LINUX_VERSION ?= "3.4.10" | 16 | LINUX_VERSION ?= "3.4.10" |
17 | 17 | ||
18 | PR = "${INC_PR}.1" | 18 | PR = "${INC_PR}.3" |
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |
20 | 20 | ||
21 | KMETA = "meta" | 21 | KMETA = "meta" |
@@ -28,4 +28,5 @@ KERNEL_FEATURES_append = " features/netfilter" | |||
28 | KERNEL_FEATURES_append_qemux86=" cfg/sound" | 28 | KERNEL_FEATURES_append_qemux86=" cfg/sound" |
29 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" | 29 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" |
30 | KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm" | 30 | KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm" |
31 | KERNEL_FEATURES_append_qemux86-64=" cfg/paravirt_kvm" | ||
31 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32", "" ,d)}" | 32 | 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 | |||
350 | QEMU=qemu-system-x86_64 | 350 | QEMU=qemu-system-x86_64 |
351 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" | 351 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" |
352 | if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then | 352 | if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then |
353 | KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" | 353 | KERNCMDLINE="vga=0 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" |
354 | QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" | 354 | QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" |
355 | fi | 355 | fi |
356 | if [ "$FSTYPE" = "nfs" ]; then | 356 | if [ "$FSTYPE" = "nfs" ]; then |
357 | if [ "x$ROOTFS" = "x" ]; then | 357 | if [ "x$ROOTFS" = "x" ]; then |