r948 - in trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26: . debian

[Simon Horman]

Author: horms
Date: 2004-07-29 03:09:08 -0600 (Thu, 29 Jul 2004)
New Revision: 948

Modified:
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/rules
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/post-install
Log:
  * Include symlinks to the toplevel kernel-headers.revision and Makefile
    in the kernel-headers-<version>-<arch> packages from the
    kernel-headers-<version> package. (closes Bug#261776)
  * Copy files for different build trees rather than using hard links.
    Also removed customised touch command. The customised touch + hard links
    completely breaks parallised builds as files can be zeroed as the
    customised touch command tries to make a fresh copy of a file while
    another process tries to do the same.



Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog	2004-07-28 22:39:29 UTC (rev 947)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog	2004-07-29 09:09:08 UTC (rev 948)
@@ -2,8 +2,16 @@
 
   * Added myself (Simon Horman <horms@debian.org>) to the list of uploaders,
     as I seem to have missed it the first time around.
+  * Include symlinks to the toplevel kernel-headers.revision and Makefile
+    in the kernel-headers-<version>-<arch> packages from the
+    kernel-headers-<version> package. (closes Bug#261776)
+  * Copy files for different build trees rather than using hard links.
+    Also removed customised touch command. The customised touch + hard links
+    completely breaks parallised builds as files can be zeroed as the
+    customised touch command tries to make a fresh copy of a file while
+    another process tries to do the same.
 
- -- Simon Horman <horms@debian.org>  Fri, 23 Jul 2004 10:57:29 +0900
+ -- Simon Horman <horms@debian.org>  Thu, 29 Jul 2004 10:54:45 +0900
 
 kernel-image-2.4.26-i386 (2.4.26-4) unstable; urgency=low
 

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/rules
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/rules	2004-07-28 22:39:29 UTC (rev 947)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/rules	2004-07-29 09:09:08 UTC (rev 948)
@@ -50,13 +50,12 @@
 	> kernel-source-$(version)/debian/official
 	install post-install kernel-source-$(version)/debian
 	for i in $(flavours); do \
-		cp -al kernel-source-$(version) build-$$i; \
+		cp -a kernel-source-$(version) build-$$i; \
 		cp config/$$i build-$$i/.config; \
 		sed "s/@version@/$(debver)-$$i/g" $(kpm).postinst > \
 			build-$$i/debian/$(kpm)-$(debver)-$$i.postinst; \
 	done
 	cp config/default kernel-source-$(version)/.config
-	ln -s `command -v touch` bin/touch.orig
 
 	touch unpack-stamp
 
@@ -79,7 +78,6 @@
 	dh_testdir
 	rm -f unpack-stamp build-stamp
 	rm -rf kernel-source-$(version) build-* install-*
-	rm -f bin/touch.orig
 	dh_clean
 
 install: build

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/post-install
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/post-install	2004-07-28 22:39:29 UTC (rev 947)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/post-install	2004-07-29 09:09:08 UTC (rev 948)
@@ -60,6 +60,8 @@
 
 mkdir -p $dir/include/linux
 cp -a .config $dir
+ln -s --target-directory=$dir ../kernel-headers-$prefix/Makefile \
+	../kernel-headers-$prefix/kernel-headers.revision
 cd include
 find . -mindepth 1 -maxdepth 1 \
 	! -name config -a ! -name linux \