[PATCH 0/1] linux-yocto: branch manipulation changes

[PATCH 0/1] linux-yocto: branch manipulation changes

[Bruce Ashfield]

Richard/Saul,

Recently a few alternate workflow/use cases have been
looked at recently. While they aren't existing cases, or
ones that were previously supported, they are reasonable
so I've tweaked the tools and processing to support them.

The first change is to allow AUTOREV processing to skip
branch validation (since it doesn't make sense). The second
change allows a repository with only a single BSP branch
and a meta directory to be present .. and the tools can
reconstruct what they need to validate and build the
kernel.

Tested against the new use cases, and existing ones, all
performed properly.

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 (1):
  linux-yocto: detect and avoid branch revision checking for AUTOREV

 meta/classes/kernel-yocto.bbclass                  |    7 +++++++
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

[PATCH 1/1] linux-yocto: detect and avoid branch revision checking for AUTOREV

[Bruce Ashfield]

When a BSP or layer specifies an AUTOREV for SRCREV, the logic
that matches expected vs real branch heads doesn't apply. We
always want the latest.

To solve the issues with invalid git revs causing validation
failures, we detect the AUTOINC value and do a early return,
skipping validation.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass                  |    7 +++++++
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 818a07e..536434f 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -136,6 +136,13 @@ do_validate_branches() {
  	 	return
  	fi
 
+	# nothing to do if SRCREV=${AUTOREV}
+	if [ "${SRCREV_machine}" = "AUTOINC" ]; then
+		# restore the branch for builds
+		git checkout -f ${KBRANCH}
+		return
+	fi
+
  	branch_head=`git show-ref -s --heads ${KBRANCH}`
  	meta_head=`git show-ref -s --heads ${KMETA}`
  	target_branch_head="${SRCREV_machine}"
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 829d105..f7600ca 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"
 
-SRCREV = "ecbdf3cdf6705a63dcb3c50bb24c311046f0b35c"
+SRCREV = "f8eb067b023d590b6cd8deddf6f96d6a820997af"
 PR = r10
 PV = "0.1+git${SRCPV}"
 
-- 
1.7.0.4

Re: [PATCH 0/1] linux-yocto: branch manipulation changes

[Saul Wold]

On 05/16/2011 09:52 AM, Bruce Ashfield wrote:
> Richard/Saul,
>
> Recently a few alternate workflow/use cases have been
> looked at recently. While they aren't existing cases, or
> ones that were previously supported, they are reasonable
> so I've tweaked the tools and processing to support them.
>
> The first change is to allow AUTOREV processing to skip
> branch validation (since it doesn't make sense). The second
> change allows a repository with only a single BSP branch
> and a meta directory to be present .. and the tools can
> reconstruct what they need to validate and build the
> kernel.
>
> Tested against the new use cases, and existing ones, all
> performed properly.
>
> 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 (1):
>    linux-yocto: detect and avoid branch revision checking for AUTOREV
>
>   meta/classes/kernel-yocto.bbclass                  |    7 +++++++
>   .../kern-tools/kern-tools-native_git.bb            |    2 +-
>   2 files changed, 8 insertions(+), 1 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into oe-core and poky

Thanks
	Sau!