* [PATCH 0/3] linux-yocto: beagleboard, -rt and install fixes
@ 2013-11-14 16:55 Bruce Ashfield
2013-11-14 16:55 ` [PATCH 1/3] linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for Beagleboard Bruce Ashfield
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Bruce Ashfield @ 2013-11-14 16:55 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Richard/Saul,
Here are two 3.10 kernel updates that I've had in my tree for a
while now, and a fix from this morning for the kernel install
issues being seen on the autobuilder.
The beagleboard changes are for [YOCTO #5211] and [YOCTO #5183],
which means working USB and ethernet.
The install fix addresses [YOCTO #5527], which means we can
avoid the install of vmlinux in a hard link situation.
Cheers,
Bruce
The following changes since commit ea92671d9823e3667d6ced7ac2af20f991da404d:
bitbake: cooker: replace "w" file opening mode with "a" mode (2013-11-12 17:01:37 +0000)
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 (3):
linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for
Beagleboard
linux-yocto-rt/3.10: fix ntp merge issue
kernel.bbclass: test for hardlinks before installing
meta/classes/kernel.bbclass | 6 +++++-
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 3 +--
meta/recipes-kernel/linux/linux-yocto_3.10.bb | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
--
1.8.1.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/3] linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for Beagleboard 2013-11-14 16:55 [PATCH 0/3] linux-yocto: beagleboard, -rt and install fixes Bruce Ashfield @ 2013-11-14 16:55 ` Bruce Ashfield 2013-11-14 19:35 ` Bruce Ashfield 2013-11-14 16:55 ` [PATCH 2/3] linux-yocto-rt/3.10: fix ntp merge issue Bruce Ashfield 2013-11-14 16:55 ` [PATCH 3/3] kernel.bbclass: test for hardlinks before installing Bruce Ashfield 2 siblings, 1 reply; 5+ messages in thread From: Bruce Ashfield @ 2013-11-14 16:55 UTC (permalink / raw) To: richard.purdie; +Cc: openembedded-core Updating the meta branch SRCREV to update the USB configuration: The Beagleboard needs the USB PHY drivers in the kernel in order to enable USB and Ethernet functionality. This fix ensures that they are built in by tweaking the kernel config. Tested on Beagleboard xM Rev. C2. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 3 +-- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index ab95ad1..ab36e6a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb @@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" SRCREV_machine ?= "97499dfaea61934719b91f1347f468c6f0125b2c" SRCREV_machine_qemuppc ?= "54cb4efa033af86301934d58d890a5324cc95a75" -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" +SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb index c15c311..d503d44 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb @@ -10,8 +10,7 @@ LINUX_VERSION ?= "3.10.17" KMETA = "meta" SRCREV_machine ?= "c03195ed6e3066494e3fb4be69154a57066e845b" -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" - +SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index eff245d..383e645 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb @@ -10,7 +10,7 @@ SRCREV_machine_qemux86 ?= "c03195ed6e3066494e3fb4be69154a57066e845b" SRCREV_machine_qemux86-64 ?= "c03195ed6e3066494e3fb4be69154a57066e845b" SRCREV_machine_qemumips64 ?= "8d21f71847640fc052bda1bf1f3792634cae5bb1" SRCREV_machine ?= "c03195ed6e3066494e3fb4be69154a57066e845b" -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" +SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for Beagleboard 2013-11-14 16:55 ` [PATCH 1/3] linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for Beagleboard Bruce Ashfield @ 2013-11-14 19:35 ` Bruce Ashfield 0 siblings, 0 replies; 5+ messages in thread From: Bruce Ashfield @ 2013-11-14 19:35 UTC (permalink / raw) To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 3333 bytes --] Argh. My tools that update the SRCREVs picked up a temporary branch from Darren and I got the wrong SRCREVs. Use this replacement patch .. and you'll be better off :) Bruce On Thu, Nov 14, 2013 at 11:55 AM, Bruce Ashfield <bruce.ashfield@windriver.com> wrote: > Updating the meta branch SRCREV to update the USB configuration: > > The Beagleboard needs the USB PHY drivers in the kernel in order to enable > USB and Ethernet functionality. This fix ensures that they are built in > by tweaking the kernel config. > > Tested on Beagleboard xM Rev. C2. > > Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> > --- > meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 2 +- > meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 3 +-- > meta/recipes-kernel/linux/linux-yocto_3.10.bb | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb > index ab95ad1..ab36e6a 100644 > --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb > @@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" > > SRCREV_machine ?= "97499dfaea61934719b91f1347f468c6f0125b2c" > SRCREV_machine_qemuppc ?= "54cb4efa033af86301934d58d890a5324cc95a75" > -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" > +SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" > > SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" > > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb > index c15c311..d503d44 100644 > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb > @@ -10,8 +10,7 @@ LINUX_VERSION ?= "3.10.17" > KMETA = "meta" > > SRCREV_machine ?= "c03195ed6e3066494e3fb4be69154a57066e845b" > -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" > - > +SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" > > PV = "${LINUX_VERSION}+git${SRCPV}" > > diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb > index eff245d..383e645 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb > @@ -10,7 +10,7 @@ SRCREV_machine_qemux86 ?= "c03195ed6e3066494e3fb4be69154a57066e845b" > SRCREV_machine_qemux86-64 ?= "c03195ed6e3066494e3fb4be69154a57066e845b" > SRCREV_machine_qemumips64 ?= "8d21f71847640fc052bda1bf1f3792634cae5bb1" > SRCREV_machine ?= "c03195ed6e3066494e3fb4be69154a57066e845b" > -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" > +SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" > > SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" > > -- > 1.8.1.2 > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" [-- Attachment #2: 0001-linux-yocto-3.10-meta-ARM-OMAP3-Add-USB-PHY-driver-f.patch --] [-- Type: text/x-patch, Size: 2865 bytes --] From 1ecdbb737cd09b2b184ab103dcf4c422f3d27df5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Wed, 13 Nov 2013 11:40:10 -0500 Subject: [PATCH] linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for Beagleboard Updating the meta branch SRCREV to update the USB configuration: The Beagleboard needs the USB PHY drivers in the kernel in order to enable USB and Ethernet functionality. This fix ensures that they are built in by tweaking the kernel config. Tested on Beagleboard xM Rev. C2. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 3 +-- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index ab95ad1..ab36e6a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb @@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" SRCREV_machine ?= "97499dfaea61934719b91f1347f468c6f0125b2c" SRCREV_machine_qemuppc ?= "54cb4efa033af86301934d58d890a5324cc95a75" -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" +SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb index c15c311..6bd8ae6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb @@ -10,8 +10,7 @@ LINUX_VERSION ?= "3.10.17" KMETA = "meta" SRCREV_machine ?= "c03195ed6e3066494e3fb4be69154a57066e845b" -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" - +SRCREV_meta ?= "6ad20f049abd52b515a8e0a4664861cfd331f684" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index eff245d..1f1a9dc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb @@ -10,7 +10,7 @@ SRCREV_machine_qemux86 ?= "c03195ed6e3066494e3fb4be69154a57066e845b" SRCREV_machine_qemux86-64 ?= "c03195ed6e3066494e3fb4be69154a57066e845b" SRCREV_machine_qemumips64 ?= "8d21f71847640fc052bda1bf1f3792634cae5bb1" SRCREV_machine ?= "c03195ed6e3066494e3fb4be69154a57066e845b" -SRCREV_meta ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" +SRCREV_meta ?= "6ad20f049abd52b515a8e0a4664861cfd331f684" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] linux-yocto-rt/3.10: fix ntp merge issue 2013-11-14 16:55 [PATCH 0/3] linux-yocto: beagleboard, -rt and install fixes Bruce Ashfield 2013-11-14 16:55 ` [PATCH 1/3] linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for Beagleboard Bruce Ashfield @ 2013-11-14 16:55 ` Bruce Ashfield 2013-11-14 16:55 ` [PATCH 3/3] kernel.bbclass: test for hardlinks before installing Bruce Ashfield 2 siblings, 0 replies; 5+ messages in thread From: Bruce Ashfield @ 2013-11-14 16:55 UTC (permalink / raw) To: richard.purdie; +Cc: openembedded-core Updating the -rt SRCREVs to pick up the following fix: ntp: fix ntp_notify_cmos_timer merge issue PREEMPT_RT_FULL has a stubbed ntp_notify_cmos_timer due to a bad merge. Renaming and restoring the full -rt functionality to this routine. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index ab36e6a..c8b9888 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb @@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH = "standard/preempt-rt/base" KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" -SRCREV_machine ?= "97499dfaea61934719b91f1347f468c6f0125b2c" -SRCREV_machine_qemuppc ?= "54cb4efa033af86301934d58d890a5324cc95a75" -SRCREV_meta ?= "c16a2cf7b06c92a0217d61569bd0293233fe6ba7" +SRCREV_machine ?= "baed5453f830d06075a4480ec0ded8ff785828bc" +SRCREV_machine_qemuppc ?= "26a465af89793c7dc5a81661449c5a9f0ad06dee" +SRCREV_meta ?= "6ad20f049abd52b515a8e0a4664861cfd331f684" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] kernel.bbclass: test for hardlinks before installing 2013-11-14 16:55 [PATCH 0/3] linux-yocto: beagleboard, -rt and install fixes Bruce Ashfield 2013-11-14 16:55 ` [PATCH 1/3] linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for Beagleboard Bruce Ashfield 2013-11-14 16:55 ` [PATCH 2/3] linux-yocto-rt/3.10: fix ntp merge issue Bruce Ashfield @ 2013-11-14 16:55 ` Bruce Ashfield 2 siblings, 0 replies; 5+ messages in thread From: Bruce Ashfield @ 2013-11-14 16:55 UTC (permalink / raw) To: richard.purdie; +Cc: openembedded-core commit df564c4 [kernel: Use hardlinks for do_populate_sysroot for speed] does indeed speed up the build, but it also means that the KERNEL_OUPUT and KERNEL_IMAGETYPE may be hardlinks. If they are hardlinks, install complains that they are actually the same file and stops the build. We can easily test and avoid the copy if the file is already in place. [YOCTO #5527] Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- meta/classes/kernel.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 383043e..624b151 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -244,7 +244,11 @@ kernel_do_install() { find . -depth -not -path "./Documentation*" -not -path "./.*" -print0 | cpio --null -pdlu $kerneldir cd "$pwd" fi - install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} + + # Test to ensure that the output file and image type are not actually + # the same file. If hardlinking is used, they will be the same, and there's + # no need to install. + ![ ${KERNEL_OUTPUT} -ef $kerneldir/${KERNEL_IMAGETYPE} ] && install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION} # Dummy Makefile so the clean below works -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-11-14 19:35 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-14 16:55 [PATCH 0/3] linux-yocto: beagleboard, -rt and install fixes Bruce Ashfield 2013-11-14 16:55 ` [PATCH 1/3] linux-yocto/3.10: meta: ARM: OMAP3: Add USB PHY driver for Beagleboard Bruce Ashfield 2013-11-14 19:35 ` Bruce Ashfield 2013-11-14 16:55 ` [PATCH 2/3] linux-yocto-rt/3.10: fix ntp merge issue Bruce Ashfield 2013-11-14 16:55 ` [PATCH 3/3] kernel.bbclass: test for hardlinks before installing Bruce Ashfield
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.