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

[fai-repository at svn.debian.org]

Author: h01ger-guest
Date: 2005-12-14 13:03:00 +0000 (Wed, 14 Dec 2005)
New Revision: 3179

Modified:
   people/h01ger/fai-kernels/debian/changelog
   people/h01ger/fai-kernels/debian/control
   people/h01ger/fai-kernels/debian/rules
Log:
- fixes to build on alpha


Modified: people/h01ger/fai-kernels/debian/changelog
===================================================================
--- people/h01ger/fai-kernels/debian/changelog	2005-12-13 14:54:10 UTC (rev 3178)
+++ people/h01ger/fai-kernels/debian/changelog	2005-12-14 13:03:00 UTC (rev 3179)
@@ -4,6 +4,9 @@
     (That means fai-kernels builds with kernel-source-2.4.27-12 in sid.)
   * increased CONFIG_BLK_DEV_RAM_SIZE=8192 as this is needed for the new
     fai-cd and also matches the debian default kernels
+  * added arch specific build-depends on kernel sources
+  * bugfix: don't copy the 2.6 kernel config on alpha - the real fix (tm)
+    should be to build 2.6 fai-kernels on alpha...
 
  -- Holger Levsen <debian at layer-acht.org>  Sat, 10 Dec 2005 15:03:20 +0100
 

Modified: people/h01ger/fai-kernels/debian/control
===================================================================
--- people/h01ger/fai-kernels/debian/control	2005-12-13 14:54:10 UTC (rev 3178)
+++ people/h01ger/fai-kernels/debian/control	2005-12-14 13:03:00 UTC (rev 3179)
@@ -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, gcc-3.3
+Build-Depends: linux-tree-2.6.14 [!alpha], kernel-source-2.4.27 (>=2.4.27-11) [i386,alpha], modutils, kernel-package, debhelper (>=4), bin86, fakeroot, gcc-3.3
 
 Package: fai-kernels
 Architecture: i386 powerpc amd64 alpha

Modified: people/h01ger/fai-kernels/debian/rules
===================================================================
--- people/h01ger/fai-kernels/debian/rules	2005-12-13 14:54:10 UTC (rev 3178)
+++ people/h01ger/fai-kernels/debian/rules	2005-12-14 13:03:00 UTC (rev 3179)
@@ -56,6 +56,7 @@
 	touch stamp-24
 
 # build 2.4 and 2.6 only on i386, only 2.4 on alpha, only 2.6 on amd64 and powerpc
+# this is gettin ugly...
 build:	
 ifeq ($(DEB_HOST_ARCH),i386)
 	debian/rules kernel24 
@@ -92,10 +93,15 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs
+	# this is getting ugly...
 ifeq ($(DEB_HOST_ARCH),i386)
 	cp -p $(kname24)/.config `pwd`/debian/fai-kernels/usr/share/doc/fai-kernels/config-$(kversion24)
 endif	
+ifeq	($(DEB_HOST_ARCH),alpha)
+	cp -p $(kname24)/.config `pwd`/debian/fai-kernels/usr/share/doc/fai-kernels/config-$(kversion24)
+else
 	cp -p $(kname)/.config `pwd`/debian/fai-kernels/usr/share/doc/fai-kernels/config-$(kversion)
+endif
 	dh_installchangelogs 
 	dh_compress
 	dh_fixperms