diff options
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.0.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.2.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 3 |
8 files changed, 10 insertions, 14 deletions
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 1de0411b96..1dd95c6bf0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | inherit kernel | ||
| 2 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
| 3 | 2 | ||
| 4 | KBRANCH = "yocto/standard/preempt-rt/base" | 3 | KBRANCH = "yocto/standard/preempt-rt/base" |
| @@ -12,7 +11,7 @@ SRCREV_machine ?= "e67428d9966eecec4c081993dc64ceb5c0e64643" | |||
| 12 | SRCREV_machine_qemuppc ?= "dcca458cb92cc287f70e4062f02460f36a881b16" | 11 | SRCREV_machine_qemuppc ?= "dcca458cb92cc287f70e4062f02460f36a881b16" |
| 13 | SRCREV_meta ?= "d282029891bba5440630a885b940dea5e34e3e2c" | 12 | SRCREV_meta ?= "d282029891bba5440630a885b940dea5e34e3e2c" |
| 14 | 13 | ||
| 15 | PR = "r2" | 14 | PR = "${INC_PR}.0" |
| 16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 17 | 16 | ||
| 18 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
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 ada66b8a17..cf88fae3ba 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | inherit kernel | ||
| 2 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
| 3 | 2 | ||
| 4 | KBRANCH = "standard/preempt-rt/base" | 3 | KBRANCH = "standard/preempt-rt/base" |
| @@ -13,7 +12,7 @@ SRCREV_machine ?= "c413f23eafb3e91ff98653e578e771532fd71be9" | |||
| 13 | SRCREV_machine_qemuppc ?= "d7020ba154df03cba5351011ff664f5e3e1ce678" | 12 | SRCREV_machine_qemuppc ?= "d7020ba154df03cba5351011ff664f5e3e1ce678" |
| 14 | SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654" | 13 | SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654" |
| 15 | 14 | ||
| 16 | PR = "r1" | 15 | PR = "${INC_PR}.0" |
| 17 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 18 | 17 | ||
| 19 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 18 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb index 9b77186d82..fde902024e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | inherit kernel | ||
| 2 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
| 3 | 2 | ||
| 4 | KBRANCH = "standard/preempt-rt/base" | 3 | KBRANCH = "standard/preempt-rt/base" |
| @@ -13,7 +12,7 @@ SRCREV_machine ?= "4a688295a1c6d44f3eea409d51a0344c8830d829" | |||
| 13 | SRCREV_machine_qemuppc ?= "83843542dd524007547eddba507690cd4bab393b" | 12 | SRCREV_machine_qemuppc ?= "83843542dd524007547eddba507690cd4bab393b" |
| 14 | SRCREV_meta ?= "d65afd9e42230a3ef4cc1f9ad62d0aa84a533cd0" | 13 | SRCREV_meta ?= "d65afd9e42230a3ef4cc1f9ad62d0aa84a533cd0" |
| 15 | 14 | ||
| 16 | PR = "r0" | 15 | PR = "${INC_PR}.0" |
| 17 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 18 | 17 | ||
| 19 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 18 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb index 546971b79d..78337fb621 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | inherit kernel | ||
| 2 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
| 3 | 2 | ||
| 4 | # We need lzma (as CONFIG_KERNEL_LZMA=y) | 3 | # We need lzma (as CONFIG_KERNEL_LZMA=y) |
| @@ -13,7 +12,7 @@ LINUX_VERSION ?= "3.2.18" | |||
| 13 | SRCREV_machine ?= "27b68a93eb791e830da8d3a2c0fc99780897ad89" | 12 | SRCREV_machine ?= "27b68a93eb791e830da8d3a2c0fc99780897ad89" |
| 14 | SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654" | 13 | SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654" |
| 15 | 14 | ||
| 16 | PR = "r0" | 15 | PR = "${INC_PR}.0" |
| 17 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 18 | 17 | ||
| 19 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 18 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 0912beef5a..9b46e74531 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
| @@ -4,6 +4,8 @@ LICENSE = "GPLv2" | |||
| 4 | 4 | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" |
| 6 | 6 | ||
| 7 | INC_PR = "r3" | ||
| 8 | |||
| 7 | # A KMACHINE is the mapping of a yocto $MACHINE to what is built | 9 | # A KMACHINE is the mapping of a yocto $MACHINE to what is built |
| 8 | # by the kernel. This is typically the branch that should be built, | 10 | # by the kernel. This is typically the branch that should be built, |
| 9 | # and it can be specific to the machine or shared | 11 | # and it can be specific to the machine or shared |
| @@ -23,6 +25,7 @@ do_patch[depends] = "kern-tools-native:do_populate_sysroot" | |||
| 23 | addtask kernel_configme before do_configure after do_patch | 25 | addtask kernel_configme before do_configure after do_patch |
| 24 | 26 | ||
| 25 | # Pick up shared functions | 27 | # Pick up shared functions |
| 28 | inherit kernel | ||
| 26 | inherit kernel-yocto | 29 | inherit kernel-yocto |
| 27 | require linux-dtb.inc | 30 | require linux-dtb.inc |
| 28 | 31 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index 362e65a8bd..d178cd07f0 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | inherit kernel | ||
| 2 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
| 3 | 2 | ||
| 4 | KBRANCH = "yocto/standard/base" | 3 | KBRANCH = "yocto/standard/base" |
| @@ -20,7 +19,7 @@ SRCREV_machine_qemux86-64 ?= "cba836a545fbeb96f6f2392c3ecbac9d7735fa65" | |||
| 20 | SRCREV_machine ?= "bd6ad607c754dea30d91502a237870b4c45e0f1b" | 19 | SRCREV_machine ?= "bd6ad607c754dea30d91502a237870b4c45e0f1b" |
| 21 | SRCREV_meta ?= "d282029891bba5440630a885b940dea5e34e3e2c" | 20 | SRCREV_meta ?= "d282029891bba5440630a885b940dea5e34e3e2c" |
| 22 | 21 | ||
| 23 | PR = "r4" | 22 | PR = "${INC_PR}.0" |
| 24 | PV = "${LINUX_VERSION}+git${SRCPV}" | 23 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 25 | 24 | ||
| 26 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 25 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index 3e4a9dded1..1e9a1d1f95 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | inherit kernel | ||
| 2 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
| 3 | 2 | ||
| 4 | KBRANCH = "standard/default/base" | 3 | KBRANCH = "standard/default/base" |
| @@ -18,7 +17,7 @@ SRCREV_machine_qemux86-64 ?= "dd488f551fa0f8e3bf1aadd78083b8547bba8bdf" | |||
| 18 | SRCREV_machine ?= "76133a1cadf0de417c29ed15d6fbb12c41c0802b" | 17 | SRCREV_machine ?= "76133a1cadf0de417c29ed15d6fbb12c41c0802b" |
| 19 | SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654" | 18 | SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654" |
| 20 | 19 | ||
| 21 | PR = "r1" | 20 | PR = "${INC_PR}.0" |
| 22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 21 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 23 | 22 | ||
| 24 | KMETA = "meta" | 23 | KMETA = "meta" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 7d14967319..0247d2481e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | inherit kernel | ||
| 2 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
| 3 | 2 | ||
| 4 | KBRANCH = "standard/base" | 3 | KBRANCH = "standard/base" |
| @@ -22,7 +21,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckou | |||
| 22 | 21 | ||
| 23 | LINUX_VERSION ?= "3.4.3" | 22 | LINUX_VERSION ?= "3.4.3" |
| 24 | 23 | ||
| 25 | PR = "r0" | 24 | PR = "${INC_PR}.0" |
| 26 | PV = "${LINUX_VERSION}+git${SRCPV}" | 25 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 27 | 26 | ||
| 28 | KMETA = "meta" | 27 | KMETA = "meta" |
