From ad8836134e92ee90526f6638b29c760999d5035e Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Mon, 26 Aug 2013 20:50:34 +0000 Subject: meta-yocto-bsp/genericx86: Update kernel, branch, KMACHINE, and SRCREV For the genericx86 machine: o Update the PREFERRED_VERSION for linux-yocto to 3.10 o Change the KBRANCH to common-pc/base o Change the SRCREV to the HEAD o Change the KMACHINE to a valid linux-yocto BSP name (From meta-yocto rev: d26bfd7bf908d9ad622c1298c918ebf1db216e98) Signed-off-by: Darren Hart Cc: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/genericx86.conf | 2 +- meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'meta-yocto-bsp') diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 042f206..ff5cbc9 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf @@ -10,7 +10,7 @@ MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa" KERNEL_IMAGETYPE = "bzImage" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.8%" +PREFERRED_VERSION_linux-yocto ?= "3.10%" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-glx \ diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend index 1ac014e..9639a56 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,11 +1,13 @@ KBRANCH_atom-pc = "standard/common-pc/atom-pc" -KBRANCH_genericx86 = "standard/common-pc/atom-pc" +KBRANCH_genericx86 = "standard/common-pc/base" KBRANCH_routerstationpro = "standard/routerstationpro" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" KBRANCH_beagleboard = "standard/beagleboard" +KMACHINE_genericx86 ?= "common-pc" + SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" -SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" +SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a" SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" -- cgit v1.1