[T/Y/Z/A][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
11 messages Options
Reply | Threaded
Open this post in threaded view
|

[T/Y/Z/A][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Marcelo Henrique Cerri
Submitting for the remaining series.

--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[trusty][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Marcelo Henrique Cerri
Ignore: yes

Currently printchanges/insertchanges do not work for custom kernels
because commit messages for each release follow the format
"UBUNTU: Ubuntu-${flavour}-${prev_fullver}" instead of
"UBUNTU: Ubuntu-${prev_fullver}". Also, for the first release, the
previous version in the changelog does not match the version in the
previous release commit.

This patch makes the base commit selection more flexible, allowing
commit messages in the format "UBUNTU: Ubuntu-*${prev_fullver}" and it
fallbacks to the latest release commit when a exact match is not found
in order to support the custom kernels in their initial releases.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 debian/rules.d/1-maintainer.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 98c7182557c4..222180241101 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -97,9 +97,14 @@ printenv:
 
 printchanges:
  @baseCommit=$$(git log --pretty=format:'%H %s' | \
- gawk '/UBUNTU: '".*Ubuntu-`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'$$/ { print $$1; exit }'); \
- git log "$$baseCommit"..HEAD | \
- $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
+ gawk '/UBUNTU: '".*Ubuntu-.*`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'(~.*)?$$/ { print $$1; exit }'); \
+ if [ -z "$$baseCommit" ]; then \
+ echo "WARNING: couldn't find a commit for the previous version. Using the lastest one." >&2; \
+ baseCommit=$$(git log --pretty=format:'%H %s' | \
+ gawk '/UBUNTU:\s*Ubuntu-.*$$/ { print $$1; exit }'); \
+ fi; \
+ git log "$$baseCommit"..HEAD | \
+ $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
 
 insertchanges:
  @perl -w -f $(DROOT)/scripts/misc/insert-changes.pl $(DROOT) $(DEBIAN)
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[yakkety][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Marcelo Henrique Cerri
In reply to this post by Marcelo Henrique Cerri
Ignore: yes

Currently printchanges/insertchanges do not work for custom kernels
because commit messages for each release follow the format
"UBUNTU: Ubuntu-${flavour}-${prev_fullver}" instead of
"UBUNTU: Ubuntu-${prev_fullver}". Also, for the first release, the
previous version in the changelog does not match the version in the
previous release commit.

This patch makes the base commit selection more flexible, allowing
commit messages in the format "UBUNTU: Ubuntu-*${prev_fullver}" and it
fallbacks to the latest release commit when a exact match is not found
in order to support the custom kernels in their initial releases.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 debian/rules.d/1-maintainer.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 0c579c85195e..d469fc2331b7 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -97,9 +97,14 @@ printenv:
 
 printchanges:
  @baseCommit=$$(git log --pretty=format:'%H %s' | \
- gawk '/UBUNTU: '".*Ubuntu-`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'$$/ { print $$1; exit }'); \
- git log "$$baseCommit"..HEAD | \
- $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
+ gawk '/UBUNTU: '".*Ubuntu-.*`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'(~.*)?$$/ { print $$1; exit }'); \
+ if [ -z "$$baseCommit" ]; then \
+ echo "WARNING: couldn't find a commit for the previous version. Using the lastest one." >&2; \
+ baseCommit=$$(git log --pretty=format:'%H %s' | \
+ gawk '/UBUNTU:\s*Ubuntu-.*$$/ { print $$1; exit }'); \
+ fi; \
+ git log "$$baseCommit"..HEAD | \
+ $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
 
 insertchanges: autoreconstruct
  @perl -w -f $(DROOT)/scripts/misc/insert-changes.pl $(DROOT) $(DEBIAN)
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[zesty][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Marcelo Henrique Cerri
In reply to this post by Marcelo Henrique Cerri
Ignore: yes

Currently printchanges/insertchanges do not work for custom kernels
because commit messages for each release follow the format
"UBUNTU: Ubuntu-${flavour}-${prev_fullver}" instead of
"UBUNTU: Ubuntu-${prev_fullver}". Also, for the first release, the
previous version in the changelog does not match the version in the
previous release commit.

This patch makes the base commit selection more flexible, allowing
commit messages in the format "UBUNTU: Ubuntu-*${prev_fullver}" and it
fallbacks to the latest release commit when a exact match is not found
in order to support the custom kernels in their initial releases.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 debian/rules.d/1-maintainer.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 0c579c85195e..d469fc2331b7 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -97,9 +97,14 @@ printenv:
 
 printchanges:
  @baseCommit=$$(git log --pretty=format:'%H %s' | \
- gawk '/UBUNTU: '".*Ubuntu-`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'$$/ { print $$1; exit }'); \
- git log "$$baseCommit"..HEAD | \
- $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
+ gawk '/UBUNTU: '".*Ubuntu-.*`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'(~.*)?$$/ { print $$1; exit }'); \
+ if [ -z "$$baseCommit" ]; then \
+ echo "WARNING: couldn't find a commit for the previous version. Using the lastest one." >&2; \
+ baseCommit=$$(git log --pretty=format:'%H %s' | \
+ gawk '/UBUNTU:\s*Ubuntu-.*$$/ { print $$1; exit }'); \
+ fi; \
+ git log "$$baseCommit"..HEAD | \
+ $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
 
 insertchanges: autoreconstruct
  @perl -w -f $(DROOT)/scripts/misc/insert-changes.pl $(DROOT) $(DEBIAN)
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[artful][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Marcelo Henrique Cerri
In reply to this post by Marcelo Henrique Cerri
Ignore: yes

Currently printchanges/insertchanges do not work for custom kernels
because commit messages for each release follow the format
"UBUNTU: Ubuntu-${flavour}-${prev_fullver}" instead of
"UBUNTU: Ubuntu-${prev_fullver}". Also, for the first release, the
previous version in the changelog does not match the version in the
previous release commit.

This patch makes the base commit selection more flexible, allowing
commit messages in the format "UBUNTU: Ubuntu-*${prev_fullver}" and it
fallbacks to the latest release commit when a exact match is not found
in order to support the custom kernels in their initial releases.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 debian/rules.d/1-maintainer.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 4864c8e285d6..5612635f18a9 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -98,9 +98,14 @@ printenv:
 
 printchanges:
  @baseCommit=$$(git log --pretty=format:'%H %s' | \
- gawk '/UBUNTU: '".*Ubuntu-`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'$$/ { print $$1; exit }'); \
- git log "$$baseCommit"..HEAD | \
- $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
+ gawk '/UBUNTU: '".*Ubuntu-.*`echo $(prev_fullver) | sed 's/+/\\\\+/'`"'(~.*)?$$/ { print $$1; exit }'); \
+ if [ -z "$$baseCommit" ]; then \
+ echo "WARNING: couldn't find a commit for the previous version. Using the lastest one." >&2; \
+ baseCommit=$$(git log --pretty=format:'%H %s' | \
+ gawk '/UBUNTU:\s*Ubuntu-.*$$/ { print $$1; exit }'); \
+ fi; \
+ git log "$$baseCommit"..HEAD | \
+ $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
 
 insertchanges: autoreconstruct
  @perl -w -f $(DROOT)/scripts/misc/insert-changes.pl $(DROOT) $(DEBIAN)
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [T/Y/Z/A][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Stefan Bader-2
In reply to this post by Marcelo Henrique Cerri
On 10.07.2017 15:46, Marcelo Henrique Cerri wrote:
> Submitting for the remaining series.
>
Hm, no bug report for this? Suppose insertchanges skips "ignore: yes". Still
"[Debian]" feels misleading as a label. Yes, it modifies stuff in the debian
subdirectory but beside that it has no relation to Debian.

Hm, maybe "UBUNTU: SAUCE: [buildenv]..." or so? Others?

-Stefan


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [T/Y/Z/A][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Seth Forshee
On Wed, Jul 12, 2017 at 10:46:56AM +0200, Stefan Bader wrote:
> On 10.07.2017 15:46, Marcelo Henrique Cerri wrote:
> > Submitting for the remaining series.
> >
> Hm, no bug report for this? Suppose insertchanges skips "ignore: yes". Still
> "[Debian]" feels misleading as a label. Yes, it modifies stuff in the debian
> subdirectory but beside that it has no relation to Debian.
>
> Hm, maybe "UBUNTU: SAUCE: [buildenv]..." or so? Others?

We've traditionally used "[Debian]" for changes to the kernel packaging
scripts, not to suggest any relationship to Debian the distribution. Imo
it's appropriate here as the patch modifies the behavior of debian/rules
targets.

Seth

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK / APPLIED[artful]: [T/Y/Z/A][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Seth Forshee
In reply to this post by Marcelo Henrique Cerri
On Mon, Jul 10, 2017 at 10:46:51AM -0300, Marcelo Henrique Cerri wrote:
> Submitting for the remaining series.

Looks good to me.

Acked-by: Seth Forshee <[hidden email]>

Applied to artful/master-next and unstable/master.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [T/Y/Z/A][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Stefan Bader-2
In reply to this post by Marcelo Henrique Cerri
On 10.07.2017 15:46, Marcelo Henrique Cerri wrote:
> Submitting for the remaining series.
>
Acked-by: Stefan Bader <[hidden email]>



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

ACK: [T/Y/Z/A][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Kleber Souza
In reply to this post by Marcelo Henrique Cerri
On 07/10/17 15:46, Marcelo Henrique Cerri wrote:
> Submitting for the remaining series.
>

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED [T/Y/Z]: [T/Y/Z/A][PATCH] UBUNTU: [Debian] Support custom and lts kernels in printchanges/insertchanges

Kleber Souza
In reply to this post by Marcelo Henrique Cerri
Applied to master-next branches of trusty, yakkety and zesty.

Thanks,
Kleber

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team