Commit 6c987510 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Tim Gardner

UBUNTU: [debian] insertchanges -- fix to work across major version changes

Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
parent b4757501
...@@ -11,6 +11,8 @@ revision ?= $(word $(words $(revisions)),$(revisions)) ...@@ -11,6 +11,8 @@ revision ?= $(word $(words $(revisions)),$(revisions))
prev_revisions := $(filter-out $(revision),0.0 $(revisions)) prev_revisions := $(filter-out $(revision),0.0 $(revisions))
prev_revision := $(word $(words $(prev_revisions)),$(prev_revisions)) prev_revision := $(word $(words $(prev_revisions)),$(prev_revisions))
prev_fullver ?= $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -o1 -c1 | sed -ne 's/^Version: *//p')
family=ubuntu family=ubuntu
# This is an internally used mechanism for the daily kernel builds. It # This is an internally used mechanism for the daily kernel builds. It
......
...@@ -88,10 +88,9 @@ printenv: ...@@ -88,10 +88,9 @@ printenv:
@echo "arch = $(arch)" @echo "arch = $(arch)"
@echo "kmake = $(kmake)" @echo "kmake = $(kmake)"
prev_release="$(release)-$(prev_revision)"
printchanges: printchanges:
@baseCommit=$$(git log --pretty=format:'%H %s' | \ @baseCommit=$$(git log --pretty=format:'%H %s' | \
awk '/UBUNTU: '".*Ubuntu-$(prev_release)"'$$/ { print $$1; exit }'); \ awk '/UBUNTU: '".*Ubuntu-$(prev_fullver)"'$$/ { print $$1; exit }'); \
git log "$$baseCommit"..HEAD | \ git log "$$baseCommit"..HEAD | \
perl -w -f $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts) perl -w -f $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment