On Tue, Dec 10, 2013 at 10:16 AM, Bruce Ashfield <[email protected]> wrote: > Richard/Saul, > > Here are a couple of changes that I've been testing locally for a week now, > with nothing (obvious) breaking. > > The linux-yocto-dev kernel change is to allow integration into master under > test, so our dev kernels can be exercised directly before they become the > kernel for a release. With this change, a layer can now create an optional > include file, set a couple of variables and have a set of static REVs used > rather than the default of AUTOREV.
I then proceeded to NOT include this patch in my rr directory, so it didn't get sent. I've attached it here and it is on the branch I referenced, but let me know if you'd rather I do a complete resend. Cheers, Bruce > > The linux-libc-headers change fixes a klibc mips build failure issue found > by Andrea Adami. This is fixed in the latest kernels, so we'll backport > the change to the 3.10 based headers and drop it when I next uprev the > kernel and headers. > > Cheers, > > Bruce > > cc: Andrea Adami <[email protected]> > > > The following changes since commit fc1bbe3654a3d456dfeb904f4c9752a03e3c48d6: > > linux-yocto-dev: allow static SRCREVs via include (2013-12-10 10:06:09 > -0500) > > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib zedd/kernel > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel > > Bruce Ashfield (1): > linux-libc-headers: fix MIPS klibc build error > > ...lude-asm-byteorder.h-in-linux-raid-md_p.h.patch | 34 > ++++++++++++++++++++++ > .../linux-libc-headers/linux-libc-headers_3.10.bb | 3 ++ > 2 files changed, 37 insertions(+) > create mode 100644 > meta/recipes-kernel/linux-libc-headers/linux-libc-headers/UAPI-include-asm-byteorder.h-in-linux-raid-md_p.h.patch > > -- > 1.8.1.2 > > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
From fc1bbe3654a3d456dfeb904f4c9752a03e3c48d6 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <[email protected]> Date: Thu, 5 Dec 2013 14:31:55 -0500 Subject: [PATCH] linux-yocto-dev: allow static SRCREVs via include 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. Signed-off-by: Bruce Ashfield <[email protected]> --- meta/recipes-kernel/linux/linux-yocto-dev.bb | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index e7b8d8b2a7a1..e8d14b966d84 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -11,6 +11,12 @@ inherit kernel 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_DEFAULT = "${KBRANCH}" 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 # AUTOREV in following anonymous python routine and resolved when the # variables are finalized. -SRCREV_machine="29594404d7fe73cd80eaa4ee8c43dcc53970c60e" -SRCREV_meta="29594404d7fe73cd80eaa4ee8c43dcc53970c60e" +SRCREV_machine ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e" +SRCREV_meta ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e" python () { 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") else: - d.setVar("SRCREV_machine", "${AUTOREV}") - d.setVar("SRCREV_meta", "${AUTOREV}") + # if the revisions have been changed from the defaults above we leave them + # 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+" @@ -40,8 +50,9 @@ PV = "${LINUX_VERSION}+git${SRCPV}" COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64)" # Functionality flags -KERNEL_FEATURES_append = " features/netfilter/netfilter.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc" +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.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=" cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" + -- 1.8.1.2
_______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
