On second thoughts, move scripts to /usr/share/perf_<version>-core
svn path=/dists/trunk/linux-2.6/; revision=16421
This commit is contained in:
parent
3fd8f69aad
commit
c86844648a
|
@ -7,8 +7,7 @@ linux-2.6 (2.6.36~rc7-1~experimental.1) UNRELEASED; urgency=low
|
|||
* [x86] Staging: fix Makefile so brcm80211 will actually build
|
||||
(Closes: #599465)
|
||||
* [x86] Enable modular IDEAPAD_ACPI (Closes: #599444)
|
||||
* perf: Move scripts to /usr/share/perf-core in linux-base package
|
||||
(Closes: #599624)
|
||||
* perf: Move scripts to /usr/share/perf_<version>-core (Closes: #599624)
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Thu, 07 Oct 2010 03:24:21 +0100
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DIS
|
|||
MAKE_CLEAN = $(setup_env) $(MAKE)
|
||||
MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES)
|
||||
MAKEOVERRIDES =
|
||||
MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf-core NO_PERL=1 V=2
|
||||
MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2
|
||||
|
||||
#
|
||||
# Targets
|
||||
|
@ -503,8 +503,6 @@ install-tools_$(ARCH): $(STAMPS_DIR)/build-tools_$(ARCH)
|
|||
# Fix up cross-references
|
||||
sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(VERSION)-/g }' \
|
||||
$(PACKAGE_DIR)/usr/share/man/*/*
|
||||
# Remove scripts
|
||||
rm -rf $(PACKAGE_DIR)/usr/share/perf-core
|
||||
+$(MAKE_SELF) install-base
|
||||
|
||||
install-patch: PACKAGE = linux-patch-debian-$(VERSION)
|
||||
|
@ -544,20 +542,12 @@ install-firmware: $(STAMPS_DIR)/source
|
|||
+$(MAKE_SELF) install-base
|
||||
|
||||
install-linux-base: PACKAGE_NAME = linux-base
|
||||
install-linux-base: PACKAGE_DIR = debian/$(PACKAGE_NAME)
|
||||
install-linux-base: DH_OPTIONS := -p$(PACKAGE_NAME)
|
||||
install-linux-base:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_prep
|
||||
dh_install debian/bin/perf /usr/bin
|
||||
dh_installdirs /usr/share/perf-core
|
||||
for source in debian/build/source/tools/perf/perf-*.sh; do \
|
||||
dest=usr/share/perf-core/"$$(basename $$source .sh)"; \
|
||||
cp -dp "$$source" $(PACKAGE_DIR)/"$$dest" || exit; \
|
||||
done
|
||||
cp -dpR debian/build/source/tools/perf/scripts \
|
||||
$(PACKAGE_DIR)/usr/share/perf-core/scripts
|
||||
dh_installman debian/perf.1
|
||||
dh_installdebconf
|
||||
+$(MAKE_SELF) install-base
|
||||
|
|
|
@ -1,10 +1,14 @@
|
|||
Package: linux-tools-@version@
|
||||
Architecture: alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, linux-base (>= 2.6.32-16)
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Recommends: linux-base (>= 2.6.32-16)
|
||||
Suggests: linux-doc-@version@
|
||||
Description: Performance analysis tools for Linux @upstreamversion@
|
||||
This package contains the 'perf' performance analysis tools for Linux
|
||||
kernel version @upstreamversion@.
|
||||
.
|
||||
The linux-base package contains a 'perf' command which will invoke the
|
||||
appropriate version for the running kernel.
|
||||
|
||||
Package: linux-source-@version@
|
||||
Architecture: all
|
||||
|
@ -93,5 +97,5 @@ Architecture: all
|
|||
Depends: libuuid-perl, ${misc:Depends}, util-linux (>= 2.16-1) | udev (<< 146-1)
|
||||
Description: Linux image base package
|
||||
This package contains files and support scripts for all Linux
|
||||
images and for the 'perf' tools.
|
||||
images.
|
||||
|
||||
|
|
Loading…
Reference in New Issue