On Tue, Jun 21, 2016 at 11:38 AM, akuster <[email protected]> wrote:
> > > On 06/21/2016 08:01 AM, Bruce Ashfield wrote: > > On Tue, Jun 21, 2016 at 10:39 AM, Armin Kuster <[email protected]> > wrote: > > > >> From: Armin Kuster <[email protected]> > >> > > > > Is this for master ? If so, can you drop the SRCREV updates ? I have an > > entire series > > under test that bumps all the versions. > > Did work against master but had merge conflict on last rebase. I figured > this patch would have to fixed up at time of merge. > > > > > What is listed here, isn't ready to go yet. > > hhah, what is listed has going back in time. boy, screwed that merge > conflict up. I will resend an update to this patch. > No worries. I sent an updated series (which you probably saw) with my latest SRCREVs that I've tested. If you jump off the end of that, you should be good. Bruce > > thanks, > Armin > > > > Bruce > > > > > >> > >> Signed-off-by: Armin Kuster <[email protected]> > >> --- > >> meta/recipes-kernel/linux/linux-yocto_4.1.bb | 22 > ++++++++++++---------- > >> meta/recipes-kernel/linux/linux-yocto_4.4.bb | 22 > ++++++++++++---------- > >> 2 files changed, 24 insertions(+), 20 deletions(-) > >> > >> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb > >> b/meta/recipes-kernel/linux/linux-yocto_4.1.bb > >> index 667212f..6053ea3 100644 > >> --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb > >> +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb > >> @@ -7,19 +7,21 @@ KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" > >> KBRANCH_qemuarm64 ?= "standard/qemuarm64" > >> KBRANCH_qemumips ?= "standard/mti-malta32" > >> KBRANCH_qemuppc ?= "standard/qemuppc" > >> +KBRANCH_qemuppc64 ?= "standard/qemuppc" > >> KBRANCH_qemux86 ?= "standard/base" > >> KBRANCH_qemux86-64 ?= "standard/base" > >> KBRANCH_qemumips64 ?= "standard/mti-malta64" > >> > >> -SRCREV_machine_qemuarm ?= "a6899b7c294ed25d9d37afde858cdd52f41f86b0" > >> -SRCREV_machine_qemuarm64 ?= "9ba8c36e9ea7419d06accab5311e7fb0d56513ff" > >> -SRCREV_machine_qemumips ?= "69936a9614608b7aa893ae78bd69e5cc197816c3" > >> -SRCREV_machine_qemuppc ?= "9ba8c36e9ea7419d06accab5311e7fb0d56513ff" > >> -SRCREV_machine_qemux86 ?= "9ba8c36e9ea7419d06accab5311e7fb0d56513ff" > >> -SRCREV_machine_qemux86-64 ?= "9ba8c36e9ea7419d06accab5311e7fb0d56513ff" > >> -SRCREV_machine_qemumips64 ?= "f0eb9eabbeafa5eadf66893822ea42d80e04afbd" > >> -SRCREV_machine ?= "9ba8c36e9ea7419d06accab5311e7fb0d56513ff" > >> -SRCREV_meta ?= "9f68667031354532563766a3d04ca8a618e9177a" > >> +SRCREV_machine_qemuarm ?= "a7b999561115b0b84814a2a27fe3f8c5b0599b0d" > >> +SRCREV_machine_qemuarm64 ?= "57f17e7008c57885ef5c41bda2829589e499ae28" > >> +SRCREV_machine_qemumips ?= "ce9d4e563925e65c7a4b73fd6027ed8d2a4fc5e4" > >> +SRCREV_machine_qemuppc ?= "57f17e7008c57885ef5c41bda2829589e499ae28" > >> +SRCREV_machine_qemuppc64 ?= "57f17e7008c57885ef5c41bda2829589e499ae28" > >> +SRCREV_machine_qemux86 ?= "57f17e7008c57885ef5c41bda2829589e499ae28" > >> +SRCREV_machine_qemux86-64 ?= "57f17e7008c57885ef5c41bda2829589e499ae28" > >> +SRCREV_machine_qemumips64 ?= "75260c1966188a38e070420624ac65b188f77948" > >> +SRCREV_machine ?= "57f17e7008c57885ef5c41bda2829589e499ae28" > >> +SRCREV_meta ?= "4b4199bd24f206d459061bb0a920d009429d5ed3" > >> > >> SRC_URI = "git:// > >> git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; > \ > >> git:// > >> > git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA} > >> " > >> @@ -31,7 +33,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}" > >> KMETA = "kernel-meta" > >> KCONF_BSP_AUDIT_LEVEL = "2" > >> > >> -COMPATIBLE_MACHINE = > >> "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" > >> +COMPATIBLE_MACHINE = > >> > "qemuarm|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64" > >> > >> # Functionality flags > >> KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" > >> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb > >> b/meta/recipes-kernel/linux/linux-yocto_4.4.bb > >> index d69ecec..a277199 100644 > >> --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb > >> +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb > >> @@ -7,19 +7,21 @@ KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" > >> KBRANCH_qemuarm64 ?= "standard/qemuarm64" > >> KBRANCH_qemumips ?= "standard/mti-malta32" > >> KBRANCH_qemuppc ?= "standard/qemuppc" > >> +KBRANCH_qemuppc64 ?= "standard/qemuppc" > >> KBRANCH_qemux86 ?= "standard/base" > >> KBRANCH_qemux86-64 ?= "standard/base" > >> KBRANCH_qemumips64 ?= "standard/mti-malta64" > >> > >> -SRCREV_machine_qemuarm ?= "cdfdcbd7ee553dc2e483813054a378ef9eaa44b6" > >> -SRCREV_machine_qemuarm64 ?= "bc64c8124504681545cb97a22b69a4e4bfeb55e2" > >> -SRCREV_machine_qemumips ?= "b1f51ad1d4e95be437bf7725e094d6ad1b8286b0" > >> -SRCREV_machine_qemuppc ?= "bc64c8124504681545cb97a22b69a4e4bfeb55e2" > >> -SRCREV_machine_qemux86 ?= "bc64c8124504681545cb97a22b69a4e4bfeb55e2" > >> -SRCREV_machine_qemux86-64 ?= "bc64c8124504681545cb97a22b69a4e4bfeb55e2" > >> -SRCREV_machine_qemumips64 ?= "4b17815085dbd2a0408d7969bf4689a4c2b12942" > >> -SRCREV_machine ?= "bc64c8124504681545cb97a22b69a4e4bfeb55e2" > >> -SRCREV_meta ?= "870134f4bfa6208d6e5339e065486be3b6e693a5" > >> +SRCREV_machine_qemuarm ?= "ae04be16985c86803d8016b06aa57c02fe63cab3" > >> +SRCREV_machine_qemuarm64 ?= "1f3e98df094cb7afb7d3d540dd0e47b3b8c89711" > >> +SRCREV_machine_qemumips ?= "1d16db0bce02f4f46a925e5425194de8d25a926e" > >> +SRCREV_machine_qemuppc ?= "1f3e98df094cb7afb7d3d540dd0e47b3b8c89711" > >> +SRCREV_machine_qemuppc64 ?= "1f3e98df094cb7afb7d3d540dd0e47b3b8c89711" > >> +SRCREV_machine_qemux86 ?= "1f3e98df094cb7afb7d3d540dd0e47b3b8c89711" > >> +SRCREV_machine_qemux86-64 ?= "1f3e98df094cb7afb7d3d540dd0e47b3b8c89711" > >> +SRCREV_machine_qemumips64 ?= "6fe42d5321cd24411c2a4b7f2aac8a01dfa82b8f" > >> +SRCREV_machine ?= "1f3e98df094cb7afb7d3d540dd0e47b3b8c89711" > >> +SRCREV_meta ?= "8900370d334ab4f7224fa71d7d46d62f0b11199d" > >> > >> SRC_URI = "git:// > >> git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; > \ > >> git:// > >> > git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA} > >> " > >> @@ -31,7 +33,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}" > >> KMETA = "kernel-meta" > >> KCONF_BSP_AUDIT_LEVEL = "2" > >> > >> -COMPATIBLE_MACHINE = > >> "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" > >> +COMPATIBLE_MACHINE = > >> > "qemuarm|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64" > >> > >> # Functionality flags > >> KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" > >> -- > >> 1.9.1 > >> > >> -- > >> _______________________________________________ > >> 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"
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
