[kernel] r6324 - in dists/trunk/linux-2.6/debian: . templates

[Bastian Blank]

Author: waldi
Date: Tue Mar 28 21:40:01 2006
New Revision: 6324

Modified:
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.headers.in
Log:
* debian/rules.real: Symlink scripts dir from kbuild package.
* debian/templates/control.headers.in: Depend on kbuild package.


Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Tue Mar 28 21:40:01 2006
@@ -228,6 +228,7 @@
 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 @@
 	
 	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)

Modified: dists/trunk/linux-2.6/debian/templates/control.headers.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.in	Tue Mar 28 21:40:01 2006
@@ -1,7 +1,7 @@
 Package: linux-headers- at upstreamversion@@abiname@@localversion@
 Section: devel
 Priority: optional
-Depends: linux-headers- at upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version})
+Depends: linux-headers- at upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version}), linux-kbuild- at version@
 Provides: linux-headers, linux-headers- at major@
 Description: Header files for Linux kernel @upstreamversion@ on @class@ machines
  This package provides the architecture-specific kernel header files