[kernel] r15981 - dists/trunk/linux-2.6/debian
Ben Hutchings
benh at alioth.debian.org
Tue Jul 13 00:09:45 UTC 2010
Author: benh
Date: Tue Jul 13 00:09:33 2010
New Revision: 15981
Log:
Name linux-tools packages and perf files using $(VERSION)
Currently the control file template and rules.real are inconsistent,
leading to a build failure.
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/rules.real
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Tue Jul 13 00:03:21 2010 (r15980)
+++ dists/trunk/linux-2.6/debian/changelog Tue Jul 13 00:09:33 2010 (r15981)
@@ -1,6 +1,10 @@
linux-2.6 (2.6.35~rc5-1~experimental.1) UNRELEASED; urgency=low
* New upstream release candidate
+
+ [ Ben Hutchings ]
+ * Consistently name the linux-tools package and perf binary using the
+ upstream version without any -rcN suffix
-- Ben Hutchings <ben at decadent.org.uk> Tue, 13 Jul 2010 00:50:20 +0100
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real Tue Jul 13 00:03:21 2010 (r15980)
+++ dists/trunk/linux-2.6/debian/rules.real Tue Jul 13 00:09:33 2010 (r15981)
@@ -482,7 +482,7 @@
endif
+$(MAKE_SELF) install-base BUILDDEB_ARGS="-Zbzip2"
-install-tools_$(ARCH): PACKAGE_NAME = linux-tools-$(UPSTREAMVERSION)
+install-tools_$(ARCH): PACKAGE_NAME = linux-tools-$(VERSION)
install-tools_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-tools_$(ARCH): DIR = $(BUILD_DIR)/build-tools_$(ARCH)
install-tools_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -494,12 +494,12 @@
+$(MAKE_CLEAN) -C '$(DIR)/tools/perf' $(MAKE_PERF_VARS) \
DESTDIR='$(CURDIR)/$(PACKAGE_DIR)' install install-man
# Rename command and manual pages to include version
- mv $(PACKAGE_DIR)/usr/bin/perf $(PACKAGE_DIR)/usr/bin/perf_$(UPSTREAMVERSION)
+ mv $(PACKAGE_DIR)/usr/bin/perf $(PACKAGE_DIR)/usr/bin/perf_$(VERSION)
for manpage in $(PACKAGE_DIR)/usr/share/man/*/*; do \
- mv "$$manpage" "$$(echo "$$manpage" | sed 's,/perf,&_$(UPSTREAMVERSION),')" || exit; \
+ mv "$$manpage" "$$(echo "$$manpage" | sed 's,/perf,&_$(VERSION),')" || exit; \
done
# Fix up cross-references
- sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(UPSTREAMVERSION)-/g }' \
+ sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(VERSION)-/g }' \
$(PACKAGE_DIR)/usr/share/man/*/*
+$(MAKE_SELF) install-base
More information about the Kernel-svn-changes
mailing list