| Message ID | 20170502101824.1085-1-kleber.souza@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 02.05.2017 12:18, Kleber Sacilotto de Souza wrote: > BugLink: http://bugs.launchpad.net/bugs/1687035 > > Fix the release tag pattern for raspi2 backport on the debian/gbp.conf > file to the pattern used for the linux-raspi2 packages. Hm, the problem is that it is sitting in a shared directory. Which can cause rebase pain whenever master changes this. Wonder whether there could be a better way (like moving it into debian.<branch>/ and add it to things created with clean (either copy or softlink). -Stefan > > Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > > Notes: > Note: this patch needs to be applied on raspi2 branch > > debian/gbp.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian/gbp.conf b/debian/gbp.conf > index 8ce5fdad0ead..726c8dd39534 100644 > --- a/debian/gbp.conf > +++ b/debian/gbp.conf > @@ -1,2 +1,2 @@ > [buildpackage] > -debian-tag = Ubuntu-%(version)s > +debian-tag = Ubuntu-raspi2-%(version)s >
On Thu, May 04, 2017 at 11:29:52AM +0200, Stefan Bader wrote: > On 02.05.2017 12:18, Kleber Sacilotto de Souza wrote: > > BugLink: http://bugs.launchpad.net/bugs/1687035 > > > > Fix the release tag pattern for raspi2 backport on the debian/gbp.conf > > file to the pattern used for the linux-raspi2 packages. > > Hm, the problem is that it is sitting in a shared directory. Which can cause > rebase pain whenever master changes this. Wonder whether there could be a better > way (like moving it into debian.<branch>/ and add it to things created with > clean (either copy or softlink). > > -Stefan I agree. We can't really take this commit as is. > > > > > Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > > --- > > > > Notes: > > Note: this patch needs to be applied on raspi2 branch > > > > debian/gbp.conf | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/debian/gbp.conf b/debian/gbp.conf > > index 8ce5fdad0ead..726c8dd39534 100644 > > --- a/debian/gbp.conf > > +++ b/debian/gbp.conf > > @@ -1,2 +1,2 @@ > > [buildpackage] > > -debian-tag = Ubuntu-%(version)s > > +debian-tag = Ubuntu-raspi2-%(version)s > > > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On Thu, May 04, 2017 at 11:29:52AM +0200, Stefan Bader wrote: > On 02.05.2017 12:18, Kleber Sacilotto de Souza wrote: > > BugLink: http://bugs.launchpad.net/bugs/1687035 > > > > Fix the release tag pattern for raspi2 backport on the debian/gbp.conf > > file to the pattern used for the linux-raspi2 packages. > > Hm, the problem is that it is sitting in a shared directory. Which can cause > rebase pain whenever master changes this. Wonder whether there could be a better > way (like moving it into debian.<branch>/ and add it to things created with > clean (either copy or softlink). The time at which one uses gbp (if one does) you are not likely to have or want to have the tree clean in a debian/rules clean sense. You are more likely to have it in a git clean -x -f -d sense and this does not help you. As the chances of the tag format changing on master is close to 0 and if we _do_ change it we need to change the branch one anyway, we are probabally ok to change this in the branch directly. Much as we necessarily do for debian.env config. -apw
On 09.05.2017 07:04, Andy Whitcroft wrote: > On Thu, May 04, 2017 at 11:29:52AM +0200, Stefan Bader wrote: >> On 02.05.2017 12:18, Kleber Sacilotto de Souza wrote: >>> BugLink: http://bugs.launchpad.net/bugs/1687035 >>> >>> Fix the release tag pattern for raspi2 backport on the debian/gbp.conf >>> file to the pattern used for the linux-raspi2 packages. >> >> Hm, the problem is that it is sitting in a shared directory. Which can cause >> rebase pain whenever master changes this. Wonder whether there could be a better >> way (like moving it into debian.<branch>/ and add it to things created with >> clean (either copy or softlink). > > The time at which one uses gbp (if one does) you are not likely to have > or want to have the tree clean in a debian/rules clean sense. You > are more likely to have it in a git clean -x -f -d sense and this does > not help you. As the chances of the tag format changing on master is > close to 0 and if we _do_ change it we need to change the branch one > anyway, we are probabally ok to change this in the branch directly. > Much as we necessarily do for debian.env config. Hm, ok, so we should make the change is what you say? -Stefan > > -apw >
diff --git a/debian/gbp.conf b/debian/gbp.conf index 8ce5fdad0ead..726c8dd39534 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,2 @@ [buildpackage] -debian-tag = Ubuntu-%(version)s +debian-tag = Ubuntu-raspi2-%(version)s
BugLink: http://bugs.launchpad.net/bugs/1687035 Fix the release tag pattern for raspi2 backport on the debian/gbp.conf file to the pattern used for the linux-raspi2 packages. Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> --- Notes: Note: this patch needs to be applied on raspi2 branch debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)