Poky Project Discussions
 help / color / mirror / Atom feed
* [PATCH 0/2] linux-yocto: consolidated pull request
@ 2011-01-24 21:46 Bruce Ashfield
  2011-01-24 21:46 ` [PATCH 1/2] linux-yocto: allow multiple BSPs per branch Bruce Ashfield
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-01-24 21:46 UTC (permalink / raw)
  To: rpurdie; +Cc: yocto, poky, saul.wold

Saul/Richard,

I'm batching two changes that I've been testing together.

The first is explained by the patch itself, but basically it
allows us to map multiple BSPs onto a single branch for building.
There's no impact to existing BSPs, but as we go forward it means
that if boards only differ by configuration we can avoid branch
explosion in the kernel repo and pickup their different 
configurations. If at any point we need to break them out from
using a common branch, that is an easy switch to do. I've been
testing this with a test enablement of the atom-pc using the
yocto/standar/base branch .. and it works nicely.

The second is an update to pickup Tom's patches for the emenlow.
Tom will follow up with changes to have the emenlow use the
2.6.37 kernel as well as the 2.6.34 kernel.

These are based on top of the beagleboard commits I sent on
Friday, which I've heard are working their way through the
queue. 

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: zedd/kernel
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Thanks,
    Bruce Ashfield <bruce.ashfield@windriver.com>
---


Bruce Ashfield (2):
  linux-yocto: allow multiple BSPs per branch
  linux-yocto: update SRCREVs for emenlow

 meta/classes/kernel-yocto.bbclass                  |    4 ++--
 .../conf/distro/include/poky-default-revisions.inc |    6 +++---
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] linux-yocto: allow multiple BSPs per branch
  2011-01-24 21:46 [PATCH 0/2] linux-yocto: consolidated pull request Bruce Ashfield
@ 2011-01-24 21:46 ` Bruce Ashfield
  2011-01-24 21:46 ` [PATCH 2/2] linux-yocto: update SRCREVs for emenlow Bruce Ashfield
  2011-01-28  1:29 ` [PATCH 0/2] linux-yocto: consolidated pull request Saul Wold
  2 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-01-24 21:46 UTC (permalink / raw)
  To: rpurdie; +Cc: yocto, poky, saul.wold

By default the linux-yocto recipes operate on the current branch
and use it as a trigger to locate the description of a board. This
model works well when using the git repo outside of a build system
since the commands can be simply invoked and will do something
useful. However, it does mean that you can't have two BSPs that
differ only by configuration, building out of a single branch
in the repository.

This means that you must have many branches for very similar
BSPs. This model is still preferred, but having the choice of
branching strategies is better.

With this change we can have multiple BSPs using a single branch
with the preferred description being hinted from the build
system by passing the $machine value to updateme/configme.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass                  |    4 ++--
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 32d2e20..8479b39 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -74,7 +74,7 @@ do_patch() {
 	if [ -n "${KERNEL_FEATURES}" ]; then
 	       addon_features="--features ${KERNEL_FEATURES}"
 	fi
-	updateme ${addon_features} ${ARCH} ${WORKDIR}
+	updateme ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR}
 	if [ $? -ne 0 ]; then
 		echo "ERROR. Could not update ${kbranch}"
 		exit 1
@@ -126,7 +126,7 @@ do_kernel_configme() {
 	echo "[INFO] doing kernel configme"
 
 	cd ${S}
-	configme --reconfig --output ${B}
+	configme --reconfig --output ${B} ${KBRANCH} ${MACHINE}
 	if [ $? -ne 0 ]; then
 		echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
 		exit 1
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index e73c971..b9602ea 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -57,7 +57,7 @@ SRCREV_pn-gypsy ??= "147"
 SRCREV_pn-inputproto ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
 SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
 SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
-SRCREV_pn-kern-tools-native ??= "f553af044615ba75c2b4b7ef1f382e6f75087213"
+SRCREV_pn-kern-tools-native ??= "8832b75dc2e494ae96ca3e1dee7bfde2f3096904"
 SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
 SRCREV_pn-libfakekey ??= "2031"
 SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 7350746..58e6470 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
 
 DEPENDS = "git-native guilt-native"
 
-PR = r8
+PR = r9
 PV = "0.1+git${SRCPV}"
 
 inherit native
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] linux-yocto: update SRCREVs for emenlow
  2011-01-24 21:46 [PATCH 0/2] linux-yocto: consolidated pull request Bruce Ashfield
  2011-01-24 21:46 ` [PATCH 1/2] linux-yocto: allow multiple BSPs per branch Bruce Ashfield
@ 2011-01-24 21:46 ` Bruce Ashfield
  2011-01-28  1:29   ` Saul Wold
  2011-01-28  1:29 ` [PATCH 0/2] linux-yocto: consolidated pull request Saul Wold
  2 siblings, 1 reply; 6+ messages in thread
From: Bruce Ashfield @ 2011-01-24 21:46 UTC (permalink / raw)
  To: rpurdie; +Cc: yocto, poky, saul.wold

The emenlow has been ported/tested on 2.6.37. Updating the SRCREVs
to reflect the change.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../conf/distro/include/poky-default-revisions.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index b9602ea..8d98eef 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -100,12 +100,12 @@ SRCREV_machine_pn-linux-yocto_qemumips ?= "2b43d84250a582b61397ad5f59a6445ce1258
 SRCREV_machine_pn-linux-yocto_qemuppc ?= "20f182db27f3e6fc6bd55bfc9e24c8c023fbff7f"
 SRCREV_machine_pn-linux-yocto_qemux86 ?= "a9d833fda90e2f1257888a97e092135610b5f259"
 SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "a9d833fda90e2f1257888a97e092135610b5f259"
-SRCREV_machine_pn-linux-yocto_emenlow ?= "a9d833fda90e2f1257888a97e092135610b5f259"
+SRCREV_machine_pn-linux-yocto_emenlow ?= "c19e556f79f03c8f1e5e84ccd9b5436c2001fcce"
 SRCREV_machine_pn-linux-yocto_atom-pc ?= "a9d833fda90e2f1257888a97e092135610b5f259"
 SRCREV_machine_pn-linux-yocto_routerstationpro ?= "219a5f9dc6e5beced36184e141f80b2df61ae32f"
 SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "3f01b98238c2ff7913ce9f68f9db5ae9538717bc"
 SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259"
-SRCREV_meta_pn-linux-yocto ?= "e3895db37bd65ea97e59b70ea936c84b398d3f3e"
+SRCREV_meta_pn-linux-yocto ?= "8a49ef6f1a43dabbce34a9ee9a1be08b26fc511c"
 SRCREV_pn-linux-libc-headers-yocto ??= "a9d833fda90e2f1257888a97e092135610b5f259"
 SRCREV_pn-matchbox-config-gtk ??= "2081"
 SRCREV_pn-matchbox-desktop-sato ??= "76"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] linux-yocto: update SRCREVs for emenlow
  2011-01-24 21:46 ` [PATCH 2/2] linux-yocto: update SRCREVs for emenlow Bruce Ashfield
@ 2011-01-28  1:29   ` Saul Wold
  0 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2011-01-28  1:29 UTC (permalink / raw)
  To: Bruce Ashfield; +Cc: yocto, poky

On 01/24/2011 01:46 PM, Bruce Ashfield wrote:
> The emenlow has been ported/tested on 2.6.37. Updating the SRCREVs
> to reflect the change.
>
> Signed-off-by: Bruce Ashfield<bruce.ashfield@windriver.com>
> ---
>   .../conf/distro/include/poky-default-revisions.inc |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
> index b9602ea..8d98eef 100644
> --- a/meta/conf/distro/include/poky-default-revisions.inc
> +++ b/meta/conf/distro/include/poky-default-revisions.inc
> @@ -100,12 +100,12 @@ SRCREV_machine_pn-linux-yocto_qemumips ?= "2b43d84250a582b61397ad5f59a6445ce1258
>   SRCREV_machine_pn-linux-yocto_qemuppc ?= "20f182db27f3e6fc6bd55bfc9e24c8c023fbff7f"
>   SRCREV_machine_pn-linux-yocto_qemux86 ?= "a9d833fda90e2f1257888a97e092135610b5f259"
>   SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "a9d833fda90e2f1257888a97e092135610b5f259"
> -SRCREV_machine_pn-linux-yocto_emenlow ?= "a9d833fda90e2f1257888a97e092135610b5f259"
> +SRCREV_machine_pn-linux-yocto_emenlow ?= "c19e556f79f03c8f1e5e84ccd9b5436c2001fcce"
>   SRCREV_machine_pn-linux-yocto_atom-pc ?= "a9d833fda90e2f1257888a97e092135610b5f259"
>   SRCREV_machine_pn-linux-yocto_routerstationpro ?= "219a5f9dc6e5beced36184e141f80b2df61ae32f"
>   SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "3f01b98238c2ff7913ce9f68f9db5ae9538717bc"
>   SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259"
> -SRCREV_meta_pn-linux-yocto ?= "e3895db37bd65ea97e59b70ea936c84b398d3f3e"
> +SRCREV_meta_pn-linux-yocto ?= "8a49ef6f1a43dabbce34a9ee9a1be08b26fc511c"
>   SRCREV_pn-linux-libc-headers-yocto ??= "a9d833fda90e2f1257888a97e092135610b5f259"
>   SRCREV_pn-matchbox-config-gtk ??= "2081"
>   SRCREV_pn-matchbox-desktop-sato ??= "76"
Pulled into Master

Thanks
	Sau!


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 0/2] linux-yocto: consolidated pull request
  2011-01-24 21:46 [PATCH 0/2] linux-yocto: consolidated pull request Bruce Ashfield
  2011-01-24 21:46 ` [PATCH 1/2] linux-yocto: allow multiple BSPs per branch Bruce Ashfield
  2011-01-24 21:46 ` [PATCH 2/2] linux-yocto: update SRCREVs for emenlow Bruce Ashfield
@ 2011-01-28  1:29 ` Saul Wold
  2 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2011-01-28  1:29 UTC (permalink / raw)
  To: Bruce Ashfield; +Cc: yocto, poky

On 01/24/2011 01:46 PM, Bruce Ashfield wrote:
> Saul/Richard,
>
> I'm batching two changes that I've been testing together.
>
> The first is explained by the patch itself, but basically it
> allows us to map multiple BSPs onto a single branch for building.
> There's no impact to existing BSPs, but as we go forward it means
> that if boards only differ by configuration we can avoid branch
> explosion in the kernel repo and pickup their different
> configurations. If at any point we need to break them out from
> using a common branch, that is an easy switch to do. I've been
> testing this with a test enablement of the atom-pc using the
> yocto/standar/base branch .. and it works nicely.
>
> The second is an update to pickup Tom's patches for the emenlow.
> Tom will follow up with changes to have the emenlow use the
> 2.6.37 kernel as well as the 2.6.34 kernel.
>
> These are based on top of the beagleboard commits I sent on
> Friday, which I've heard are working their way through the
> queue.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: zedd/kernel
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
>
> Thanks,
>      Bruce Ashfield<bruce.ashfield@windriver.com>
> ---
>
>
> Bruce Ashfield (2):
>    linux-yocto: allow multiple BSPs per branch
>    linux-yocto: update SRCREVs for emenlow
>
>   meta/classes/kernel-yocto.bbclass                  |    4 ++--
>   .../conf/distro/include/poky-default-revisions.inc |    6 +++---
>   .../kern-tools/kern-tools-native_git.bb            |    2 +-
>   3 files changed, 6 insertions(+), 6 deletions(-)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Oops, both where pulled

Sau!



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 0/2] linux-yocto: consolidated pull request
@ 2011-02-01 17:25 Bruce Ashfield
  0 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2011-02-01 17:25 UTC (permalink / raw)
  To: rpurdie; +Cc: yocto, poky, saul.wold

Richard/Saul,

I'm addressing a couple of bugs in this pull request.

Bug #685: for the mpc8315e-rdb boot issue. I'm going to revisit
this one, since changing the entry point shouldn't be making a
difference to this board's boot (by me looking at th code), but
it does seem to fix the problem according to the reporter.

Bug #692: kernel configuration audit information

After configuration of the kernel and audit is performed, and
has been for some time. This updates it to work with the 2.6.37
kernel and makes the output visible. You now get something like
this:

------------------------
NOTE: package linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15: task do_kernel_configcheck: Started
NOTE: validating kernel configuration
The following Kconfig files no longer exist in this tree:
      drivers/ieee1394/Kconfig
      drivers/media/video/zc0301/Kconfig

This BSP sets 1 invalid/obsolete kernel options.
These config options are not offered anywhere within this kernel.
The full list can be found in your workspace at:
/home/bruce/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15/linux/meta/cfg/yocto/standard/common-pc/invalid.cfg

This BSP sets 6 kernel options that are possibly non-hardware related.
The full list can be found in your workspace at:
/home/bruce/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15/linux/meta/cfg/yocto/standard/common-pc/specified_non_hdw.cfg

WARNING: There were 2 hardware options requested that do not
         have a corresponding value present in the final ".config" file.
         This probably means you aren't getting the config you wanted.
The full list can be found in your workspace at:
/home/bruce/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15/linux/meta/cfg/yocto/standard/common-pc/mismatch.cfg

Waiting a second to make sure you get a chance to see this...
NOTE: package linux-yocto-2.6.37+git0+e8b8c1ae44932835f4f79e77180d3ce5e4b1ec99_0+a9d833fda90e2f1257888a97e092135610b5f259-r15: task do_kernel_configcheck: Succeeded
------------------------

This is actually telling us something useful, and actually is showing
me something that need to be fixed in the Kconfig classification for
2.6.37 .. so it has already proven to be useful data to expose
to the user!


Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: zedd/kernel
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Thanks,
    Bruce Ashfield <bruce.ashfield@windriver.com>
---


Bruce Ashfield (2):
  mpc8315e-rdb: set UBOOT_ENTRYPOINT
  linux-yocto: export kernel configuration audit to the console

 meta/classes/kernel-yocto.bbclass                  |   17 +++++++++++------
 .../conf/distro/include/poky-default-revisions.inc |    4 ++--
 meta/conf/machine/mpc8315e-rdb.conf                |    3 +++
 meta/recipes-kernel/linux/linux-yocto.inc          |    1 -
 meta/recipes-kernel/linux/linux-yocto_git.bb       |    1 +
 5 files changed, 17 insertions(+), 9 deletions(-)

-- 
1.7.3.4



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2011-02-01 17:22 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-24 21:46 [PATCH 0/2] linux-yocto: consolidated pull request Bruce Ashfield
2011-01-24 21:46 ` [PATCH 1/2] linux-yocto: allow multiple BSPs per branch Bruce Ashfield
2011-01-24 21:46 ` [PATCH 2/2] linux-yocto: update SRCREVs for emenlow Bruce Ashfield
2011-01-28  1:29   ` Saul Wold
2011-01-28  1:29 ` [PATCH 0/2] linux-yocto: consolidated pull request Saul Wold
  -- strict thread matches above, loose matches on Subject: below --
2011-02-01 17:25 Bruce Ashfield

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox