[Fai-commit] r3067 - people/h01ger/fai-kernels/debian

[fai-repository at svn.debian.org]

Author: h01ger-guest
Date: 2005-11-19 22:44:44 +0000 (Sat, 19 Nov 2005)
New Revision: 3067

Modified:
   people/h01ger/fai-kernels/debian/changelog
   people/h01ger/fai-kernels/debian/control
   people/h01ger/fai-kernels/debian/rules
Log:
- better handling of patch for #328707


Modified: people/h01ger/fai-kernels/debian/changelog
===================================================================
--- people/h01ger/fai-kernels/debian/changelog	2005-11-18 23:39:59 UTC (rev 3066)
+++ people/h01ger/fai-kernels/debian/changelog	2005-11-19 22:44:44 UTC (rev 3067)
@@ -10,9 +10,10 @@
     standard debian kernels with "nfsroot"-initrds for FAI. This will make
     fai-kernel unnecessary so it _then_ can be removed again.
   * updated to use linux-tree-2.6.14 instead of 2.6.8
-  * applied the patch for #328707 to 2.4.27-11 during build-time so that it
-    builds with the latest binutils. Therefore I've added the versioned 
-    dependency on 2.4.27-11
+  * apply the patch for #328707 to kernel-source-2.4.27 during build-time, so 
+    that it builds with the latest binutils. As 2.4.27-12 will hopefully soon
+    be uploaded with the patch included, the patch will only be applied, if it
+    applies cleanly without errors.
   * added support for amd64 and ppc
   * dont merge kernel config snipplets, rather use one config file per arch
     and kernel version (2.4/2.6)
@@ -25,7 +26,7 @@
     a non-deprecated value
   * added myself to maintainers field
 
- -- Holger Levsen <debian at layer-acht.org>  Fri, 18 Nov 2005 23:37:50 +0100
+ -- Holger Levsen <debian at layer-acht.org>  Fri, 19 Nov 2005 22:42:23 +0100
 
 fai-kernels (1.9.1) unstable; urgency=high
 

Modified: people/h01ger/fai-kernels/debian/control
===================================================================
--- people/h01ger/fai-kernels/debian/control	2005-11-18 23:39:59 UTC (rev 3066)
+++ people/h01ger/fai-kernels/debian/control	2005-11-19 22:44:44 UTC (rev 3067)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Holger Levsen <debian at layer-acht.org>
 Standards-Version: 3.6.2
-Build-Depends: linux-tree-2.6.14, kernel-source-2.4.27 (=2.4.27-11), modutils, kernel-package, debhelper (>=4), bin86, fakeroot
+Build-Depends: linux-tree-2.6.14, kernel-source-2.4.27 (>=2.4.27-11), modutils, kernel-package, debhelper (>=4), bin86, fakeroot
 
 Package: fai-kernels
 Architecture: i386 powerpc amd64

Modified: people/h01ger/fai-kernels/debian/rules
===================================================================
--- people/h01ger/fai-kernels/debian/rules	2005-11-18 23:39:59 UTC (rev 3066)
+++ people/h01ger/fai-kernels/debian/rules	2005-11-19 22:44:44 UTC (rev 3067)
@@ -32,7 +32,8 @@
 unpack24: unpack-stamp24
 unpack-stamp24:
 	bzcat /usr/src/$(kname24).tar.bz2 | tar -xf -
-	ln -s $(kname24) linux ; patch  -p0 < 328707.patch ; rm linux 
+	## apply the patch for #328707, if it has not been applied to kernel-source-2.4.27 yet (which will hopefully happen in 2.4.27-12)
+	cd $(kname24) ; patch --dry-run -N -p1 < ../328707.patch && patch -p1 < ../328707.patch 
 	touch unpack-stamp24
 
 # kernel 2.6