[PATCH 0/1] fetch2/git.py: remove .indirectiondir workaround

[PATCH 0/1] fetch2/git.py: remove .indirectiondir workaround

[Robert Yang]

The following changes since commit af5f423887d1c41cf7279f6e537077726ae13082:

  bitbake: siggen: Ensure tainted stamps are accounted for with writing custom stamps (2016-04-03 22:50:17 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib rbt/git
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/git

Robert Yang (1):
  fetch2/git.py: remove .indirectiondir workaround

 bitbake/lib/bb/fetch2/git.py | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

-- 
2.8.0

[PATCH 1/1] fetch2/git.py: remove .indirectiondir workaround

[Robert Yang]

It was used for workaround git 1.7.9.2 which was released in 2012 which
should not be existed on nowadays host, so remove it to avoid
confusions.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 bitbake/lib/bb/fetch2/git.py | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 0513348..526668b 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -262,23 +262,7 @@ class Git(FetchMethod):
         if ud.bareclone:
             cloneflags += " --mirror"
 
-        # Versions of git prior to 1.7.9.2 have issues where foo.git and foo get confused
-        # and you end up with some horrible union of the two when you attempt to clone it
-        # The least invasive workaround seems to be a symlink to the real directory to
-        # fool git into ignoring any .git version that may also be present.
-        #
-        # The issue is fixed in more recent versions of git so we can drop this hack in future
-        # when that version becomes common enough.
-        clonedir = ud.clonedir
-        if not ud.path.endswith(".git"):
-            indirectiondir = destdir[:-1] + ".indirectionsymlink"
-            if os.path.exists(indirectiondir):
-                os.remove(indirectiondir)
-            bb.utils.mkdirhier(os.path.dirname(indirectiondir))
-            os.symlink(ud.clonedir, indirectiondir)
-            clonedir = indirectiondir
-
-        runfetchcmd("%s clone %s %s/ %s" % (ud.basecmd, cloneflags, clonedir, destdir), d)
+        runfetchcmd("%s clone %s %s/ %s" % (ud.basecmd, cloneflags, ud.clonedir, destdir), d)
         os.chdir(destdir)
         repourl = self._get_repo_url(ud)
         runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, repourl), d)
-- 
2.8.0

Re: [PATCH 1/1] fetch2/git.py: remove .indirectiondir workaround

[Richard Purdie]

On Tue, 2016-04-05 at 03:35 -0700, Robert Yang wrote:
> It was used for workaround git 1.7.9.2 which was released in 2012
> which
> should not be existed on nowadays host, so remove it to avoid
> confusions.

I like the idea of this however:

$ cat classes/sanity.bbclass | grep 7.8
# We use git parameters and functionality only found in 1.7.8 or later
    if LooseVersion(version) < LooseVersion("1.7.8"):
        return "Your version of git is older than 1.7.8 and has bugs
which will break builds. Please install a newer version of git.\n"

so we have a minimum version of 1.7.8 defined right now...

I'd be ok merging this if we increase the minimum version requirement.

Cheers,

Richard

Re: [PATCH 1/1] fetch2/git.py: remove .indirectiondir workaround

[Richard Purdie]

On Tue, 2016-04-05 at 14:36 +0100, Richard Purdie wrote:
> On Tue, 2016-04-05 at 03:35 -0700, Robert Yang wrote:
> > It was used for workaround git 1.7.9.2 which was released in 2012
> > which
> > should not be existed on nowadays host, so remove it to avoid
> > confusions.
> 
> I like the idea of this however:
> 
> $ cat classes/sanity.bbclass | grep 7.8
> # We use git parameters and functionality only found in 1.7.8 or
> later
>     if LooseVersion(version) < LooseVersion("1.7.8"):
>         return "Your version of git is older than 1.7.8 and has bugs
> which will break builds. Please install a newer version of git.\n"
> 
> so we have a minimum version of 1.7.8 defined right now...
> 
> I'd be ok merging this if we increase the minimum version
> requirement.

There is also another issue pending on increased git version so I've
just sent a patch for this, which would then unblock this one.

Cheers,

Richard

Re: [PATCH 1/1] fetch2/git.py: remove .indirectiondir workaround

[Robert Yang]

On 04/05/2016 10:47 PM, Richard Purdie wrote:
> On Tue, 2016-04-05 at 14:36 +0100, Richard Purdie wrote:
>> On Tue, 2016-04-05 at 03:35 -0700, Robert Yang wrote:
>>> It was used for workaround git 1.7.9.2 which was released in 2012
>>> which
>>> should not be existed on nowadays host, so remove it to avoid
>>> confusions.
>>
>> I like the idea of this however:
>>
>> $ cat classes/sanity.bbclass | grep 7.8
>> # We use git parameters and functionality only found in 1.7.8 or
>> later
>>      if LooseVersion(version) < LooseVersion("1.7.8"):
>>          return "Your version of git is older than 1.7.8 and has bugs
>> which will break builds. Please install a newer version of git.\n"
>>
>> so we have a minimum version of 1.7.8 defined right now...
>>
>> I'd be ok merging this if we increase the minimum version
>> requirement.
>
> There is also another issue pending on increased git version so I've
> just sent a patch for this, which would then unblock this one.

Thank you very much.

// Robert

>
> Cheers,
>
> Richard
>