All of lore.kernel.org
 help / color / mirror / Atom feed
* [for-dora] backport bitbake git fetcher fix
@ 2014-02-21 16:54 Viguera, Javier
  2014-02-28 11:07 ` Javier Viguera
  0 siblings, 1 reply; 4+ messages in thread
From: Viguera, Javier @ 2014-02-21 16:54 UTC (permalink / raw)
  To: poky@yoctoproject.org

[-- Attachment #1: Type: text/plain, Size: 845 bytes --]

Hi all,

I'm using Dora with a customer kernel that happens to have two very 
similar branch names:

af186b498eb8e39ffa419d356010d67d7fa6dee3 refs/heads/android/v3.10/master
a094f655dc2ba623742a01dcb744ed0e8ebde3ed refs/heads/v3.10/master

My custom linux recipe does the following to get 'v3.10/master' branch:

KBRANCH_DEFAULT = "v3.10/master"
KBRANCH = "${KBRANCH_DEFAULT}"
SRC_URI = "${GIT_URL}linux-2.6.git;protocol=git;branch=${KBRANCH}"

But it always fetchs the 'android/v3.10/master' branch.

This seems to be already fixed in master:

d21c1537b7052aa24ec56434b821fee67de33a83

So could that fix be cherry-picked to Dora?

Directly cherry-picking the commit does not apply cleanly so i attach 
here a reworked patch that applies to Dora.

-
Javier Viguera
Software Engineer
Digi International® Spain S.A.U.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-bitbake-fetch2-git-Anchor-names-when-using-ls-remote.patch --]
[-- Type: text/x-diff; name="0001-bitbake-fetch2-git-Anchor-names-when-using-ls-remote.patch", Size: 1662 bytes --]

From 4ca7cccd7ce8cf58332b3f00eb1b1e5bbf61aebd Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 20 Jan 2014 14:30:11 +0000
Subject: [PATCH] bitbake: fetch2/git: Anchor names when using ls-remote

When specifying tags, they're searched for unanchored so foo/bar could
match:

refs/heads/abc/foo/bar
refs/heads/xyz/foo/bar
refs/heads/foo/bar

This change anchors the expressions so they are based against heads
or tags (or any other base level tree that has been created).

(Bitbake rev: df2e0972cd1db7abd5ec8b7cb295fb0c42e284a4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d21c1537b7052aa24ec56434b821fee67de33a83)
Signed-off-by: Javier Viguera <javier.viguera@digi.com>

Conflicts:
	bitbake/lib/bb/fetch2/git.py
---
 bitbake/lib/bb/fetch2/git.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 6175e4c7c977..989d72cb316e 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -305,8 +305,8 @@ class Git(FetchMethod):
             username = ""
 
         basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
-        cmd = "%s ls-remote %s://%s%s%s %s" % \
-              (basecmd, ud.proto, username, ud.host, ud.path, ud.branches[name])
+        cmd = "%s ls-remote %s://%s%s%s refs/heads/%s refs/tags/%s" % \
+              (basecmd, ud.proto, username, ud.host, ud.path, ud.branches[name], ud.branches[name])
         if ud.proto.lower() != 'file':
             bb.fetch2.check_network_access(d, cmd)
         output = runfetchcmd(cmd, d, True)

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-11  8:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-21 16:54 [for-dora] backport bitbake git fetcher fix Viguera, Javier
2014-02-28 11:07 ` Javier Viguera
2014-03-11  8:22   ` [poky] " Robert Yang
2014-03-11  8:22     ` Robert Yang

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.