bitbake: Replace deprecated git branch parameter "--set-upstream"
PATCH 1/1 bitbake: Replace deprecated git branch parameter "--set-upstream"
From: Andre Rosa <[email protected]>
Since 2017-08-17 (git version 2.14.1.473.g3ec7d702a) using deprecated git branch parameter "--set-upstream" causes a fetcher error. Replace it by "--set-upstream-to".
https://git.kernel.org/pub/scm/git/git.git/commit/?id=52668846ea2d41ffbd87cda7cb8e492dea9f2c4d
says, it's deprecated since 2012-08-30 so hopefully all still supported host distributions have new enough git to support "--set-upstream-to".
ERROR: PACKAGE do_unpack: Fetcher failure: ...;
git -c core.fsyncobjectfiles=0 branch --set-upstream master origin/master failed with exit code 128, output:
fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.
ERROR: PACKAGE do_unpack: Function failed: base_do_unpack
(Bitbake rev: 2ab50074c1a6c56a8a178755de108447d7b7acaf)
--- bitbake/lib/bb/fetch2/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
bitbake/lib/bb/fetch2/git.py +1 -1
@@ -326,7 +326,7 @@ class Git(FetchMethod): branchname = ud.branches[ud.names[0]] runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ ud.revisions[ud.names[0]]), d, workdir=destdir) - runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ + runfetchcmd("%s branch %s --set-upstream-to origin/%s" % (ud.basecmd, branchname, \ branchname), d, workdir=destdir) else: runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir)
Signature · 1 line
2.15.0.rc1
It should go to bitbake-devel ML and the subject should say bitbake branch (which is 1.34 not pyro).
Quoted 58 lines · André Draszik
From: Andre Rosa <[email protected]>
Since 2017-08-17 (git version 2.14.1.473.g3ec7d702a) using deprecated git branch parameter "--set-upstream" causes a fetcher error. Replace it by "--set-upstream-to".
https://git.kernel.org/pub/scm/git/git.git/commit/?id=
52668846ea2d41ffbd87cda7cb8e492dea9f2c4d
says, it's deprecated since 2012-08-30 so hopefully all still supported host distributions have new enough git to support "--set-upstream-to".ERROR: PACKAGE
do_unpack: Fetcher failure: ...;
git -c core.fsyncobjectfiles=0 branch --set-upstream master origin/master failed with exit code 128, output:
fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.ERROR: PACKAGE
do_unpack: Function failed:base_do_unpack(Bitbake rev:
2ab50074c1a6c56a8a178755de108447d7b7acaf)Signed-off-by Andre Rosa <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit 20d0282c6048fe11b303e538dbf9109ccb0c467d)Signed-off-by André Draszik <[email protected]>--- bitbake/lib/bb/fetch2/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)bitbake/lib/bb/fetch2/git.py +1
-1@@ -326,7 +326,7 @@ class Git(FetchMethod): branchname = ud.branches[ud.names[0]] runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ ud.revisions[ud.names[0]]), d, workdir=destdir) - runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ + runfetchcmd("%s branch %s --set-upstream-to origin/%s" %(ud.basecmd, branchname, \
branchname), d, workdir=destdir)
else:
runfetchcmd("%s checkout %s" % (ud.basecmd,
ud.revisions[ud.names[0]]), d, workdir=destdir)
--
2.15.0.rc1--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
[1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
In reply to André DraszikFrom: Andre Rosa <[email protected]>
Since 2017-08-17 (git version 2.14.1.473.g3ec7d702a) using deprecated git branch parameter "--set-upstream" causes a fetcher error. Replace it by "--set-upstream-to".
https://git.kernel.org/pub/scm/git/git.git/commit/?id=52668846ea2d41ffbd87cda7cb8e492dea9f2c4d
says, it's deprecated since 2012-08-30 so hopefully all still supported host distributions have new enough git to support "--set-upstream-to".
ERROR: PACKAGE do_unpack: Fetcher failure: ...;
git -c core.fsyncobjectfiles=0 branch --set-upstream master origin/master failed with exit code 128, output:
fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.
ERROR: PACKAGE do_unpack: Function failed: base_do_unpack
--- lib/bb/fetch2/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bb/fetch2/git.py +1 -1
@@ -326,7 +326,7 @@ class Git(FetchMethod): branchname = ud.branches[ud.names[0]] runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ ud.revisions[ud.names[0]]), d, workdir=destdir) - runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ + runfetchcmd("%s branch %s --set-upstream-to origin/%s" % (ud.basecmd, branchname, \ branchname), d, workdir=destdir) else: runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir)
Signature · 1 line
2.15.0.rc1
Re: [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
Hi all,
Last night Ubuntu 16 updated git to version 2.15, and now this is biting us (and I guess many other people in the wild) on releases based on Morty and Jethro.
I did a basic test and for bitbake 1.32 (Poky Morty) and 1.34 (Poky Pyro) a simple cherry-pick works just fine without conflicts:
git cherry-pick -x 2ab50074c1a6c56a8a178755de108447d7b7acaf
So could someone do those cherry-picks in bitbake and then move those fixes to Poky Pyro and Morty stable braches?
For previous versions the cherry-pick does not apply cleanly. I'll try to find the time and send a proper patch for 1.30 (Krogoth) and 1.28 (Jethro).
Thanks in advance.
--
Javier Viguera
Software Engineer
Digi International® Spain S.A.U.
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of André Draszik
Sent: Wednesday, October 18, 2017 8:52 AM
To: [email protected]
Subject: [bitbake-devel] [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
From: Andre Rosa <[email protected]>
Since 2017-08-17 (git version 2.14.1.473.g3ec7d702a) using deprecated git branch parameter "--set-upstream" causes a fetcher error. Replace it by "--set-upstream-to".
https://git.kernel.org/pub/scm/git/git.git/commit/?id=52668846ea2d41ffbd87cda7cb8e492dea9f2c4d
says, it's deprecated since 2012-08-30 so hopefully all still supported host distributions have new enough git to support "--set-upstream-to".
ERROR: PACKAGE do_unpack: Fetcher failure: ...; git -c core.fsyncobjectfiles=0 branch --set-upstream master origin/master failed with exit code 128, output:
fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.
ERROR: PACKAGE do_unpack: Function failed: base_do_unpack
--- lib/bb/fetch2/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bb/fetch2/git.py +2 -1
@@ -326,7 +326,7 @@ class Git(FetchMethod): branchname = ud.branches[ud.names[0]] runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ ud.revisions[ud.names[0]]), d, workdir=destdir) - runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ + runfetchcmd("%s branch %s --set-upstream-to origin/%s" + % (ud.basecmd, branchname, \ branchname), d, workdir=destdir) else:
runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir)
--
2.15.0.rc1
--
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel
Re: [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
Quoted 9 lines · Javier
Hi all,
Last night Ubuntu 16 updated git to version 2.15, and now this is biting us (and I guess many other people in the wild) on releases based on Morty and Jethro.
I did a basic test and for bitbake 1.32 (Poky Morty) and 1.34 (Poky Pyro) a simple cherry-pick works just fine without conflicts:
git cherry-pick -x
2ab50074c1a6c56a8a178755de108447d7b7acafSo could someone do those cherry-picks in bitbake and then move those fixes to Poky Pyro and Morty stable braches?
These are in my pyro and morty stagging branches.
thanks,
Armin
Quoted 60 lines
For previous versions the cherry-pick does not apply cleanly. I'll try to find the time and send a proper patch for 1.30 (Krogoth) and 1.28 (Jethro).
Thanks in advance.
--
Javier Viguera
Software Engineer
Digi International® Spain S.A.U.-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of André Draszik
Sent: Wednesday, October 18, 2017 8:52 AM
To: [email protected]
Subject: [bitbake-devel] [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"From: Andre Rosa <[email protected]>
Since 2017-08-17 (git version 2.14.1.473.g3ec7d702a) using deprecated git branch parameter "--set-upstream" causes a fetcher error. Replace it by "--set-upstream-to".
https://git.kernel.org/pub/scm/git/git.git/commit/?id=52668846ea2d41ffbd87cda7cb8e492dea9f2c4d
says, it's deprecated since 2012-08-30 so hopefully all still supported host distributions have new enough git to support "--set-upstream-to".ERROR: PACKAGE
do_unpack: Fetcher failure: ...; git -c core.fsyncobjectfiles=0 branch --set-upstream master origin/master failed with exit code 128, output:
fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.ERROR: PACKAGE
do_unpack: Function failed:base_do_unpackSigned-off-by Andre Rosa <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit 2ab50074c1a6c56a8a178755de108447d7b7acaf)Signed-off-by André Draszik <[email protected]>--- lib/bb/fetch2/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/bb/fetch2/git.py +2
-2@@ -326,7 +326,7 @@ class Git(FetchMethod): branchname = ud.branches[ud.names[0]] runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ ud.revisions[ud.names[0]]), d, workdir=destdir) - runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ + runfetchcmd("%s branch %s --set-upstream-to origin/%s" + % (ud.basecmd, branchname, \ branchname), d, workdir=destdir) else: runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir) --2.15.0.rc1
--
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel