From 202e4dc8f918ce6931cc0c29b75b72768f13253f Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 28 Mar 2006 21:40:01 +0000 Subject: [PATCH] * debian/rules.real: Symlink scripts dir from kbuild package. * debian/templates/control.headers.in: Depend on kbuild package. svn path=/dists/trunk/linux-2.6/; revision=6324 --- debian/rules.real | 13 ++++--------- debian/templates/control.headers.in | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/debian/rules.real b/debian/rules.real index 8c88734d8..43d621828 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -228,6 +228,7 @@ install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS) +install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR) @@ -291,15 +292,9 @@ install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBA mkdir -p "${PACKAGE_DIR}/lib/modules/${REAL_VERSION}" ln -s "/usr/src/${PACKAGE_NAME}" "${PACKAGE_DIR}/lib/modules/${REAL_VERSION}/build" - - # Populate the scripts directory. The strategy here is to specify what - # *not* to copy, to make things a little bit more robust. We first create - # a file with exclude patterns, then copy everything minus excluded files. - # - cd $(SOURCE_DIR); \ - tar $(foreach t, *.c *.cc *.h *.l *.o *.y *.cmd *.glade *.gperf *POTFILES.in .gitignore *lxdialog* *package* *_shipped, --exclude=$(t)) -chf - scripts | \ - (cd "${DIR}"; umask 000; tar -xvsf -) - + + ln -s "../${PACKAGE_NAME_KBUILD}/scripts" "${DIR}" + $(MAKE) -f debian/rules.real install-base install-headers-all: PACKAGE_NAME = linux-headers-$(VERSION) diff --git a/debian/templates/control.headers.in b/debian/templates/control.headers.in index 88a5c7b8b..4eec82ce8 100644 --- a/debian/templates/control.headers.in +++ b/debian/templates/control.headers.in @@ -1,7 +1,7 @@ Package: linux-headers-@upstreamversion@@abiname@@localversion@ Section: devel Priority: optional -Depends: linux-headers-@upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version}) +Depends: linux-headers-@upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version}), linux-kbuild-@version@ Provides: linux-headers, linux-headers-@major@ Description: Header files for Linux kernel @upstreamversion@ on @class@ machines This package provides the architecture-specific kernel header files