r3591 - in trunk/kernel/source/linux-2.6-2.6.12/debian: . templates

[Andres Salomon]

Author: dilinger
Date: 2005-07-19 23:15:07 +0000 (Tue, 19 Jul 2005)
New Revision: 3591

Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
   trunk/kernel/source/linux-2.6-2.6.12/debian/README
   trunk/kernel/source/linux-2.6-2.6.12/debian/templates/header-install.in
Log:
the cp stuff done in headers-install is actually done by kernel-package now;
no need to do it there anymore.  And, while we're at it, nuke $(headers_extra);
if archs really need it, they can add it to headers-install.in (I'd rather
see headers-install.in go away eventually, though).


Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile	2005-07-19 23:04:24 UTC (rev 3590)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile	2005-07-19 23:15:07 UTC (rev 3591)
@@ -130,7 +130,6 @@
 	sed -e 's, at kbpkg@,$(kbpkg),g'				\
 	    -e 's, at ksource_dir@,$(CURDIR)/$(kdir),g'		\
 	    -e 's, at headers_dirs@,$(headers_dirs),g'		\
-	    -e 's, at headers_extra@,$(headers_extra),g'		\
             templates/header-install.in > header-install-$(subarch)
 	chmod u+x header-install-$(subarch)
 #

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/README
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/README	2005-07-19 23:04:24 UTC (rev 3590)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/README	2005-07-19 23:15:07 UTC (rev 3591)
@@ -93,17 +93,6 @@
   
   headers_dirs := sparc | sparc64
 
-headers_extra
-
-  This variable is substituted into the headers-install script,
-  and may be used to specify extra files, which a particular
-  architecture would like to include in the kernel-headers package.
-  Files should be specified with a full path relative to the
-  top-level kernel directory, unquoted and separated by spaces.
-  Note that you normally do not need to specify the files
-  arch/$(karch)/kernel/asm-offsets.s, they are going to be included
-  automatically.
-
 headers_subarch
 
   The subarch to pass to the --subarch option for the make-kpkg

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/templates/header-install.in
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/templates/header-install.in	2005-07-19 23:04:24 UTC (rev 3590)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/templates/header-install.in	2005-07-19 23:15:07 UTC (rev 3591)
@@ -2,32 +2,11 @@
 #
 # This is the make-kpkg hook file, which runs when make-kpkg is invoked
 # (from debian/rules) to create the flavour-independent kernel-headers
-# package. Two major tasks which it performs are a) copying the extra
-# files into the temporary kernel-headers directory and b) removing
-# unneeded include/asm-* directories. 
+# package. The major tasks it performs is removing unneeded
+# include/asm-* directories. 
 #
 set -e
 
-cd @ksource_dir@
-{
-    find . -path './Documentation/*' -prune -o \
-	   -path './debian/*' -prune -o -type f \
-	   \( -name Makefile -o -name 'Kconfig*' -o -path './scripts/*' \) -print
-#
-#   The command below will include all the asm-offsets.s files, which have
-#   have been linked into the linux-headers build directory during the
-#   buildng of the images.
-#
-    find arch -name 'asm-offsets.s' 
-#
-#   And we need to include all the extra files too
-#
-    for i in @headers_extra@; do
-	echo "${i}"
-    done
-} | cpio -pd --preserve-modification-time $OLDPWD
-cd - > /dev/null
-
 # XXX: once we're using a linux-headers-$(version)-$(debnum) that's Arch: all,
 # we'll want to drop this bit of code.  The asm-* directories should remain.