*lockdep*,linux-perf: Remove '-rcN' from installation paths

Where we include the 'version' in paths, it needs to be what
debian/rules.real calls UPSTREAMVERSION (no -rcN, no Debian revision).

(We should really make the naming of version variables consistent
across all our makefiles.)
This commit is contained in:
Ben Hutchings 2016-04-29 10:38:27 +02:00
parent fc5b920758
commit e2f5aae4d1
2 changed files with 2 additions and 1 deletions

1
debian/changelog vendored
View File

@ -6,6 +6,7 @@ linux (4.6~rc5-1~exp1) UNRELEASED; urgency=medium
* [armhf] Enable EFI, RTC_DRV_EFI
* Update config for renaming/removal/replacement/merging/splitting of various
symbols
* *lockdep*,linux-perf: Remove '-rcN' from installation paths
[ Martin Michlmayr ]
* [armel, armhf] Use new Marvell CESA driver.

2
debian/rules.real vendored
View File

@ -485,7 +485,7 @@ install-source: $(BUILD_DIR)/$(SOURCE_PACKAGE_NAME)-source-$(UPSTREAMVERSION).ta
+$(MAKE_SELF) install-base BUILDDEB_ARGS='-Zgzip -z1'
define make-tools
+mkdir -p $(BUILD_DIR)/build-tools/$(1) && $(MAKE_CLEAN) -C $(BUILD_DIR)/build-tools/$(1) -f $(CURDIR)/debian/rules.d/$(1)/Makefile top_srcdir=$(CURDIR) top_rulesdir=$(CURDIR)/debian/rules.d OUTDIR=$(1) VERSION=$(UPSTREAMVERSION)
+mkdir -p $(BUILD_DIR)/build-tools/$(1) && $(MAKE_CLEAN) -C $(BUILD_DIR)/build-tools/$(1) -f $(CURDIR)/debian/rules.d/$(1)/Makefile top_srcdir=$(CURDIR) top_rulesdir=$(CURDIR)/debian/rules.d OUTDIR=$(1) VERSION=$(VERSION)
endef
$(STAMPS_DIR)/build-tools: