UBUNTU: Ubuntu-4.14.0-11.13

[mirror_ubuntu-bionic-kernel.git] / debian / rules.d / 1-maintainer.mk

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 0c579c85195e2d114ffb2696c21966cba03ca640..5612635f18a96beeccc9c1e1752c80468c2031ff 100644 (file)
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -59,6 +59,7 @@ printenv:
        @echo "prev_revisions    = $(prev_revisions)"
        @echo "prev_revision     = $(prev_revision)"
        @echo "abinum            = $(abinum)"
+       @echo "upstream_tag      = $(upstream_tag)"
        @echo "gitver            = $(gitver)"
        @echo "flavours          = $(flavours)"
        @echo "skipabi           = $(skipabi)"
@@ -97,15 +98,20 @@ 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) 
 
 autoreconstruct:
-       $(DROOT)/scripts/misc/gen-auto-reconstruct $(release) $(DEBIAN)/reconstruct $(DROOT)/source/options
+       $(DROOT)/scripts/misc/gen-auto-reconstruct $(upstream_tag) $(DEBIAN)/reconstruct $(DROOT)/source/options
 
 diffupstream:
        @git diff-tree -p refs/remotes/linux-2.6/master..HEAD $(shell ls | grep -vE '^(ubuntu|$(DEBIAN)|\.git.*)')