From 69ad383525657b44dc7eeb347e888deebb501b00 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 13 Dec 2010 01:23:56 -0500 Subject: [PATCH] linux-yocto: fix machine compatibility During the last phase of the recipe factoring, the board compatibility lists ended up in the wrong place, which meant we had an incomplete list of boards, and the same set of boards for both kernels (stable and devel). To fix this, I've yanked the compatibility to the recipes themselves and updated the emenlow to have a -stable bbappend. Signed-off-by: Bruce Ashfield --- ...linux-yocto_git.bbappend => linux-yocto-stable_git.bbappend} | 0 meta/recipes-kernel/linux/linux-yocto-stable_git.bb | 2 ++ meta/recipes-kernel/linux/linux-yocto.inc | 2 -- meta/recipes-kernel/linux/linux-yocto_git.bb | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) rename meta-emenlow/recipes/linux/{linux-yocto_git.bbappend => linux-yocto-stable_git.bbappend} (100%) diff --git a/meta-emenlow/recipes/linux/linux-yocto_git.bbappend b/meta-emenlow/recipes/linux/linux-yocto-stable_git.bbappend similarity index 100% rename from meta-emenlow/recipes/linux/linux-yocto_git.bbappend rename to meta-emenlow/recipes/linux/linux-yocto-stable_git.bbappend diff --git a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb index 8ecd86fa9f7..dd4d176ac5e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb @@ -17,6 +17,8 @@ PR = "r0" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|routerstationpro|mpc8315e-rdb|beagleboard)" + # this performs a fixup on the SRCREV for new/undefined BSPs python __anonymous () { import bb, re diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 095b3375fac..2a77f4a9c42 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -7,8 +7,6 @@ LICENSE = "GPL" # and it can be specific to the machine or shared KMACHINE = "UNDEFINED" -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|routerstationpro)" - # Set this to 'preempt_rt' in the local.conf if you want a real time kernel LINUX_KERNEL_TYPE ?= standard diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index 1e3df478eb6..f40fe38fcd3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -20,6 +20,7 @@ SRCREV_FORMAT = "meta_machine" SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta" +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags KERNEL_REVISION_CHECKING ?= "t" -- 2.47.3