Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH In review Bruce Ashfield 2 participants 5 messages Jan 24, 2011 – Jan 28, 2011

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-yocto: consolidated pull request

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 <[email protected]>
---

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(-)
author
#1 lore raw

PATCH 1/2 linux-yocto: allow multiple BSPs per branch

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 <[email protected]>
---
 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(-)
meta/classes/kernel-yocto.bbclass +2 -2
index 32d2e20..8479b39 100644
@@ -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
meta/conf/distro/include/poky-default-revisions.inc +1 -1
index e73c971..b9602ea 100644
@@ -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"
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1
index 7350746..58e6470 100644
@@ -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
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/2 linux-yocto: update SRCREVs for emenlow

In reply to Bruce Ashfield

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

Signed-off-by Bruce Ashfield <[email protected]>
---
 .../conf/distro/include/poky-default-revisions.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +2 -2
index b9602ea..8d98eef 100644
@@ -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"
Signature · 1 line
1.7.0.4
#3 lore raw

Re: [PATCH 2/2] linux-yocto: update SRCREVs for emenlow

Quoted 17 lines · Bruce Ashfield

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

Signed-off-by Bruce Ashfield<[email protected]>
---
  .../conf/distro/include/poky-default-revisions.inc |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +0 -1
index b9602ea..8d98eef 100644
@@ -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"

meta/conf/distro/include/poky-default-revisions.inc SRCREV_machine_pn-linux-yocto_qemumips ?= "2b43d84250a582b61397ad5f59a6445ce1258 · line 111

Quoted 10 lines
meta/conf/distro/include/poky-default-revisions.inc +2 -1
+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!

#4 lore raw
In reply to Bruce Ashfield
Quoted 40 lines · Bruce Ashfield

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<[email protected]>
---

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(-)
Quoted 5 lines

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Oops, both where pulled

Sau!