debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Revert previous changes to debian/rules.real and move to debian/build/tools/perf/Makefile 

svn path=/dists/trunk/linux-tools/; revision=21645
This commit is contained in:
Ben Hutchings 2014-07-29 19:18:10 +00:00
parent d72e351ea7
commit a00c00dda5
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/build/tools/perf/Makefile vendored
View File

@ -39,7 +39,10 @@ MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=
all:
ifdef KERNEL_ARCH_PERF
-mkdir out
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf -f Makefile.perf O=$(CURDIR)/out all VERSION=$(VERSION)
# perf changes some default directories depending on whether DESTDIR is
# set. We must define it even when building to avoid a rebuild when we
# run 'make install'.
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf -f Makefile.perf O=$(CURDIR)/out all VERSION=$(VERSION) DESTDIR=dummy
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf/Documentation O=$(CURDIR)/out man VERSION=$(VERSION)
endif

15
debian/rules.real vendored
View File

@ -15,12 +15,10 @@ endif
build: $(STAMPS_DIR)/build
$(STAMPS_DIR)/build: build-kbuild build-tools build-usbip
$(STAMPS_DIR)/build:
$(MAKE) -C $(BUILD_DIR) top_srcdir=$(CURDIR)
touch '$@'
build-kbuild:
$(MAKE) -C $(BUILD_DIR)/scripts top_srcdir=$(CURDIR)
install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
install-kbuild: DH_OPTIONS = -p$(PACKAGE_NAME)
install-kbuild: BASE_DIR = /usr/lib/$(PACKAGE_NAME)
@ -42,12 +40,6 @@ install-kbuild: $(STAMPS_DIR)/build
dh_md5sums
dh_builddeb
build-tools:
# perf changes some default directories depending on whether DESTDIR is
# set. We must define it even when building to avoid a rebuild when we
# run 'make install'.
$(MAKE) -C $(BUILD_DIR)/tools top_srcdir=$(CURDIR) DESTDIR=dummy
install-tools: PACKAGE_NAME = linux-tools-$(VERSION)
install-tools: DH_OPTIONS = -p$(PACKAGE_NAME)
install-tools: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
@ -69,9 +61,6 @@ install-tools: $(STAMPS_DIR)/build
dh_md5sums
dh_builddeb
build-usbip:
$(MAKE) -C $(BUILD_DIR)/drivers/staging/usbip top_srcdir=$(CURDIR)
install-usbip: DH_OPTIONS = -plibusbip-dev -pusbip
install-usbip: DIR = $(CURDIR)/debian/tmp
install-usbip: override VERSION := $(shell sed -ne 's,^#define PACKAGE_VERSION "\(.*\)"$$,\1,p' $(BUILD_DIR)/drivers/staging/usbip/userspace/config.h)