From 921e67bc820c6d05c1c7ece6a511a6a5e1add22f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 22 Mar 2012 16:00:08 -0400 Subject: linux-yocto: streamline support for multiple upstream repo types In order to support repositories of various types (with or without meta data, branched, pristine, custom, etc) information about the type of processing that is required was passed to the processing phases via variables. The combination of variables involved in coordinating the processing creates a learning curve and overly complicates recipe extensions. With minor tweaks to the kern-tools, adding flexibility and keying off the existence of the meta branch it is possible to remove all of the variables that were added to support different repository types. (From OE-Core rev: 06e5f45c8f38925cd5902a3a3f436f5e9451dd16) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- .../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 1 + meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 2 ++ meta/recipes-kernel/linux/linux-yocto.inc | 7 +++---- meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 2 ++ meta/recipes-kernel/linux/linux-yocto_3.0.bb | 23 ++++++++++++++-------- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 2 ++ 7 files changed, 26 insertions(+), 13 deletions(-) (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 754ebe5..1af22f6 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8 DEPENDS = "git-native guilt-native" -SRCREV = "2bbbaaa00cc70887d6d6f745b9425890d522d240" +SRCREV = "369e67046a1b72b6447c208babd4d2065265a95e" PR = "r12" PV = "0.1+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb index 36dcb6e..14af91d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb @@ -13,6 +13,7 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32" LINUX_VERSION ?= "3.0.24" LINUX_KERNEL_TYPE = "preempt-rt" +KMETA = "meta" SRCREV_machine ?= "cf280f1dc5877d4ca43d21307222326efa68bb27" SRCREV_machine_qemuppc ?= "afaa5baa6a9ca9c8a03a9a3eee2ba9fba089f416" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb index 7e01efb..8ec366c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb @@ -14,6 +14,8 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32" LINUX_VERSION ?= "3.2.11" LINUX_KERNEL_TYPE = "preempt-rt" +KMETA = "meta" + SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7" SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c" SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 2b61b7e..0912bee 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -9,15 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# Set this to 'preempt_rt' in the local.conf if you want a real time kernel LINUX_KERNEL_TYPE ?= "standard" -KMETA ?= "meta" +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" SRCREV_FORMAT ?= "meta_machine" LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" -KERNEL_REVISION_CHECKING ?= "t" -YOCTO_KERNEL_META_DATA ?= "t" do_patch[depends] = "kern-tools-native:do_populate_sysroot" diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb index d3da75c..3968c62 100644 --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb @@ -10,6 +10,8 @@ KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" KBRANCH = "${KMACHINE}" +KMETA = "meta" + LINUX_VERSION ?= "2.6.37" SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index 074b1ed..82a7224 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb @@ -1,14 +1,21 @@ inherit kernel require recipes-kernel/linux/linux-yocto.inc -KMACHINE = "yocto/standard/base" -KMACHINE_qemux86 = "yocto/standard/common-pc/base" -KMACHINE_qemux86-64 = "yocto/standard/common-pc-64/base" -KMACHINE_qemuppc = "yocto/standard/qemu-ppc32" -KMACHINE_qemumips = "yocto/standard/mti-malta32-be" -KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" - -KBRANCH = "${KMACHINE}" +KBRANCH = "yocto/standard/base" +KBRANCH_qemux86 = "yocto/standard/common-pc/base" +KBRANCH_qemux86-64 = "yocto/standard/common-pc-64/base" +KBRANCH_qemuppc = "yocto/standard/qemu-ppc32" +KBRANCH_qemumips = "yocto/standard/mti-malta32-be" +KBRANCH_qemuarm = "yocto/standard/arm-versatile-926ejs" + +# Temporary until 3.0 kernel tree is updated with machine mappings +KMACHINE_qemux86 = "common-pc" +KMACHINE_qemux86-64 = "common-pc-64" +KMACHINE_qemuppc = "qemu-ppc32" +KMACHINE_qemumips = "mti-malta32-be" +KMACHINE_qemuarm = "arm-versatile-926ejs" + +KMETA = "meta" LINUX_VERSION ?= "3.0.24" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index 51119bb..71290bd 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb @@ -28,6 +28,8 @@ SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" PR = "r1" PV = "${LINUX_VERSION}+git${SRCPV}" +KMETA = "meta" + SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" -- cgit v1.1