mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

linux-yocto-dev: allow static SRCREVs via include

Browse Source 
The linux-yocto dev recipe is intended to track the latest revisions of the
kernel tree by default. To control revision churn, and integrate into a
regular build schedule having the ability to specify a set of SRCREVs without
modifying the recipe itself is desired.

So we introduce an optional include file, and variables that control whether
or not the static SRCREVs are used: USE_MACHINE_AUTOREV and USE_META_AUTOREV,
to add this flexibility.

(From OE-Core rev: 5877781d1dcb2883d00097b66ff2481a4a5ff930)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2013-12-05 14:31:55 -05:00
committed by Richard Purdie
parent db4961ba7f
commit 4bb18c41e8
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-kernel/linux/linux-yocto-dev.bb
+18 -7
View File
@@ -11,6 +11,12 @@
inherit kernel inherit kernel
require recipes-kernel/linux/linux-yocto.inc require recipes-kernel/linux/linux-yocto.inc
USE_MACHINE_AUTOREV ?= "1"
USE_META_AUTOREV ?= "1"
# provide this .inc to set specific revisions
include recipes-kernel/linux/linux-yocto-dev-revisions.inc
KBRANCH = "standard/base" KBRANCH = "standard/base"
KBRANCH_DEFAULT = "${KBRANCH}" KBRANCH_DEFAULT = "${KBRANCH}"
KMETA = "meta" KMETA = "meta"
@@ -22,15 +28,19 @@ SRC_URI = "git://git.pokylinux.org/linux-yocto-dev.git;nocheckout=1;branch=${KBR
# linux-yocto-dev is the preferred provider, they will be overridden to # linux-yocto-dev is the preferred provider, they will be overridden to
# AUTOREV in following anonymous python routine and resolved when the # AUTOREV in following anonymous python routine and resolved when the
# variables are finalized. # variables are finalized.
SRCREV_machine="29594404d7fe73cd80eaa4ee8c43dcc53970c60e" SRCREV_machine ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e"
SRCREV_meta="29594404d7fe73cd80eaa4ee8c43dcc53970c60e" SRCREV_meta ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e"
python () { python () {
if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev": if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev":
raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it") raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it")
else: else:
d.setVar("SRCREV_machine", "${AUTOREV}") # if the revisions have been changed from the defaults above we leave them
d.setVar("SRCREV_meta", "${AUTOREV}") # alone. But if the defaults are left, we change to AUTOREV.
if d.getVar("USE_MACHINE_AUTOREV", True) == "1":
d.setVar("SRCREV_machine", "${AUTOREV}")
if d.getVar("USE_META_AUTOREV", True) == "1":
d.setVar("SRCREV_meta", "${AUTOREV}")
} }
LINUX_VERSION ?= "3.10+" LINUX_VERSION ?= "3.10+"
@@ -40,8 +50,9 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64)" COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64)"
# Functionality flags # Functionality flags
KERNEL_FEATURES_append = " features/netfilter/netfilter.scc" KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
KERNEL_FEATURES_append_qemux86=" cfg/sound.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm.scc"
KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"