* [pyro][bitbake][PATCH] bitbake: Replace deprecated git branch parameter "--set-upstream"
@ 2017-10-17 13:31 André Draszik
2017-10-17 14:12 ` Martin Jansa
2017-10-18 6:51 ` [1.34][PATCH] " André Draszik
0 siblings, 2 replies; 5+ messages in thread
From: André Draszik @ 2017-10-17 13:31 UTC (permalink / raw)
To: yocto
From: Andre Rosa <andre.rosa@lge.com>
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 <andre.rosa@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 20d0282c6048fe11b303e538dbf9109ccb0c467d)
Signed-off-by: André Draszik <adraszik@tycoint.com>
---
bitbake/lib/bb/fetch2/git.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 2550bde838..7442f84414 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [pyro][bitbake][PATCH] bitbake: Replace deprecated git branch parameter "--set-upstream"
2017-10-17 13:31 [pyro][bitbake][PATCH] bitbake: Replace deprecated git branch parameter "--set-upstream" André Draszik
@ 2017-10-17 14:12 ` Martin Jansa
2017-10-18 6:51 ` [1.34][PATCH] " André Draszik
1 sibling, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2017-10-17 14:12 UTC (permalink / raw)
To: André Draszik; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 2537 bytes --]
It should go to bitbake-devel ML and the subject should say bitbake branch
(which is 1.34 not pyro).
On Tue, Oct 17, 2017 at 3:31 PM, André Draszik <git@andred.net> wrote:
> From: Andre Rosa <andre.rosa@lge.com>
>
> 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 <andre.rosa@lge.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> (cherry picked from commit 20d0282c6048fe11b303e538dbf9109ccb0c467d)
> Signed-off-by: André Draszik <adraszik@tycoint.com>
> ---
> bitbake/lib/bb/fetch2/git.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
> index 2550bde838..7442f84414 100644
> --- a/bitbake/lib/bb/fetch2/git.py
> +++ b/bitbake/lib/bb/fetch2/git.py
> @@ -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
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>
[-- Attachment #2: Type: text/html, Size: 3709 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
2017-10-17 13:31 [pyro][bitbake][PATCH] bitbake: Replace deprecated git branch parameter "--set-upstream" André Draszik
2017-10-17 14:12 ` Martin Jansa
@ 2017-10-18 6:51 ` André Draszik
2017-11-03 11:16 ` Viguera, Javier
1 sibling, 1 reply; 5+ messages in thread
From: André Draszik @ 2017-10-18 6:51 UTC (permalink / raw)
To: bitbake-devel
From: Andre Rosa <andre.rosa@lge.com>
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
Signed-off-by: Andre Rosa <andre.rosa@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2ab50074c1a6c56a8a178755de108447d7b7acaf)
Signed-off-by: André Draszik <adraszik@tycoint.com>
---
lib/bb/fetch2/git.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 2550bde8..7442f844 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
2017-10-18 6:51 ` [1.34][PATCH] " André Draszik
@ 2017-11-03 11:16 ` Viguera, Javier
2017-11-04 17:00 ` akuster808
0 siblings, 1 reply; 5+ messages in thread
From: Viguera, Javier @ 2017-11-03 11:16 UTC (permalink / raw)
To: bitbake-devel
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: bitbake-devel-bounces@lists.openembedded.org [mailto:bitbake-devel-bounces@lists.openembedded.org] On Behalf Of André Draszik
Sent: Wednesday, October 18, 2017 8:52 AM
To: bitbake-devel@lists.openembedded.org
Subject: [bitbake-devel] [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
From: Andre Rosa <andre.rosa@lge.com>
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
Signed-off-by: Andre Rosa <andre.rosa@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2ab50074c1a6c56a8a178755de108447d7b7acaf)
Signed-off-by: André Draszik <adraszik@tycoint.com>
---
lib/bb/fetch2/git.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 2550bde8..7442f844 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -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
bitbake-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
2017-11-03 11:16 ` Viguera, Javier
@ 2017-11-04 17:00 ` akuster808
0 siblings, 0 replies; 5+ messages in thread
From: akuster808 @ 2017-11-04 17:00 UTC (permalink / raw)
To: Viguera, Javier, bitbake-devel
On 11/03/2017 04:16 AM, Viguera, Javier wrote:
> 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?
These are in my pyro and morty stagging branches.
thanks,
Armin
>
> 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: bitbake-devel-bounces@lists.openembedded.org [mailto:bitbake-devel-bounces@lists.openembedded.org] On Behalf Of André Draszik
> Sent: Wednesday, October 18, 2017 8:52 AM
> To: bitbake-devel@lists.openembedded.org
> Subject: [bitbake-devel] [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"
>
> From: Andre Rosa <andre.rosa@lge.com>
>
> 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
>
> Signed-off-by: Andre Rosa <andre.rosa@lge.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> (cherry picked from commit 2ab50074c1a6c56a8a178755de108447d7b7acaf)
> Signed-off-by: André Draszik <adraszik@tycoint.com>
> ---
> lib/bb/fetch2/git.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 2550bde8..7442f844 100644
> --- a/lib/bb/fetch2/git.py
> +++ b/lib/bb/fetch2/git.py
> @@ -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
> bitbake-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-11-04 17:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-17 13:31 [pyro][bitbake][PATCH] bitbake: Replace deprecated git branch parameter "--set-upstream" André Draszik
2017-10-17 14:12 ` Martin Jansa
2017-10-18 6:51 ` [1.34][PATCH] " André Draszik
2017-11-03 11:16 ` Viguera, Javier
2017-11-04 17:00 ` akuster808
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.