r1085 - trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian

Frederik Sch??ler fschueler-guest@haydn.debian.org
Sat, 14 Aug 2004 02:36:40 -0600


Author: fschueler-guest
Date: 2004-08-14 02:35:38 -0600 (Sat, 14 Aug 2004)
New Revision: 1085

Modified:
   trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/changelog
   trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/control
   trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/copyright
   trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/rules
Log:
Added Goswins changes to crosscompile a 64bit kernel on i386.
Fixed dependency on kernel-kbuild-2.6-3.
Rebuilt with kernel-tree-2.5.7-4 .
Updated copyrights.


Modified: trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/changelog
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/changelog	2004-08-14 08:29:03 UTC (rev 1084)
+++ trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/changelog	2004-08-14 08:35:38 UTC (rev 1085)
@@ -1,3 +1,20 @@
+kernel-image-2.6.7-amd64 (2.6.7-6) unstable; urgency=low
+
+  * Goswin von Brederlow:
+    - Add i386 to Architecture: in debian/control
+    - Set KPKG_ARCH=amd64 on i386 for cross builds
+    - Add Build-Depends for biarch gcc-3.4 on i386
+    - Add bin/amd64-linux-* wrappers to use the right gcc and flags
+    - Build-Depend on new enough dpkg-dev that knows amd64
+
+  * Frederik Schüler:
+    - Build-depend on kernel-tree-2.6.7-4
+    - Kernel-headers-* has to depend on kernel-kbuild-2.6-3
+    - Updated copyright
+    - Rebuilt with new 2.6.7-4 kernel tree
+
+ -- Frederik Schüler <fschueler@gmx.net>  Fri, 13 Aug 2004 17:43:53 +0200
+
 kernel-image-2.6.7-amd64 (2.6.7-5) unstable; urgency=low
 
   * Frederik Schüler: 

Modified: trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/control
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/control	2004-08-14 08:29:03 UTC (rev 1084)
+++ trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/control	2004-08-14 08:35:38 UTC (rev 1085)
@@ -3,42 +3,42 @@
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.7-3, module-init-tools
+Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.7-4, module-init-tools, gcc-3.4 (>= 3.4.1-6) [i386], dpkg-dev (>= 1.10.23)
 
-Package: kernel-headers-2.6.7-5
-Architecture: amd64
+Package: kernel-headers-2.6.7-6
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-kbuild-2.6-1 
+Depends: coreutils | fileutils (>= 4.0), kernel-kbuild-2.6-3
 Provides: kernel-headers, kernel-headers-2.6
 Description: Header files related to Linux kernel version 2.6.7
  This package provides kernel header files for version 2.6.7, for sites 
  that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.6.7-5/debian.README.gz for details
+ /usr/share/doc/kernel-headers-2.6.7-6/debian.README.gz for details
 
-Package: kernel-headers-2.6.7-5-amd64-k8
-Architecture: amd64
+Package: kernel-headers-2.6.7-6-amd64-k8
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-5
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-6
 Provides: kernel-headers, kernel-headers-2.6
 Description: Linux kernel headers 2.6.7 on AMD64 systems
  This package provides kernel header files for version 2.6.7 on
  AMD Athlon64, Athlon FX and Opteron, for sites that want the latest 
  kernel headers. Please read 
- /usr/share/doc/kernel-headers-2.6.7-5-amd64-k8/debian.README.gz for details.
+ /usr/share/doc/kernel-headers-2.6.7-6-amd64-k8/debian.README.gz for details.
 
 Package: kernel-headers-2.6-amd64-k8
-Architecture: amd64
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: kernel-headers-2.6.7-5-amd64-k8
+Depends: kernel-headers-2.6.7-6-amd64-k8
 Description: Linux kernel headers 2.6 on AMD64 systems.
  This package will always depend on the latest 2.6 kernel headers available
  for AMD Athlon64, Athlon FX and Opteron.
 
-Package: kernel-image-2.6.7-5-amd64-k8
-Architecture: amd64
+Package: kernel-image-2.6.7-6-amd64-k8
+Architecture: amd64 i386
 Section: base
 Priority: optional
 Provides: kernel-image, kernel-image-2.6
@@ -61,36 +61,36 @@
  create a custom kernel from the sources.
 
 Package: kernel-image-2.6-amd64-k8
-Architecture: amd64
+Architecture: amd64 i386
 Section: base
 Priority: optional
-Depends: kernel-image-2.6.7-5-amd64-k8
+Depends: kernel-image-2.6.7-6-amd64-k8
 Description: Linux kernel image for version 2.6 on AMD64 systems.
  This package will always depend on the latest 2.6 kernel image available
  for AMD Athlon64, Athlon FX and Opteron.
 
-Package: kernel-headers-2.6.7-5-amd64-k8-smp
-Architecture: amd64
+Package: kernel-headers-2.6.7-6-amd64-k8-smp
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-5
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-6
 Provides: kernel-headers, kernel-headers-2.6
 Description: Linux kernel headers 2.6.7 for AMD K8 SMP.
  This package provides kernel header files for version 2.6.7 on AMD Opteron 
  with SMP support, for sites that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.6.7-5-amd64-k8-smp/debian.README.gz for details
+ /usr/share/doc/kernel-headers-2.6.7-6-amd64-k8-smp/debian.README.gz for details
 
 Package: kernel-headers-2.6-amd64-k8-smp
-Architecture: amd64
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: kernel-headers-2.6.7-5-amd64-k8-smp
+Depends: kernel-headers-2.6.7-6-amd64-k8-smp
 Description: Linux kernel headers 2.6 on AMD K8 SMP systems.
  This package will always depend on the latest 2.6 kernel headers available
  for AMD Opteron SMP systems.
 
-Package: kernel-image-2.6.7-5-amd64-k8-smp
-Architecture: amd64
+Package: kernel-image-2.6.7-6-amd64-k8-smp
+Architecture: amd64 i386
 Section: base
 Priority: optional
 Provides: kernel-image, kernel-image-2.6
@@ -114,37 +114,37 @@
  create a custom kernel from the sources.
 
 Package: kernel-image-2.6-amd64-k8-smp
-Architecture: amd64
+Architecture: amd64 i386
 Section: base
 Priority: optional
-Depends: kernel-image-2.6.7-5-amd64-k8-smp
+Depends: kernel-image-2.6.7-6-amd64-k8-smp
 Description: Linux kernel image for version 2.6 on AMD K8 SMP.
  This package will always depend on the latest 2.6 kernel image available
  for AMD Opteron with SMP support.
 
-Package: kernel-headers-2.6.7-5-amd64-generic
-Architecture: amd64
+Package: kernel-headers-2.6.7-6-amd64-generic
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-5
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-6
 Provides: kernel-headers, kernel-headers-2.6
 Description: Linux kernel headers 2.6.7 for generic x86_64 systems.
  This package provides kernel header files for version 2.6.7 on all x86_64 
  systems, for sites that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.6.7-5-amd64-generic/debian.README.gz for 
+ /usr/share/doc/kernel-headers-2.6.7-6-amd64-generic/debian.README.gz for 
  details.
 
 Package: kernel-headers-2.6-amd64-generic
-Architecture: amd64
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: kernel-headers-2.6.7-5-amd64-generic
+Depends: kernel-headers-2.6.7-6-amd64-generic
 Description: Linux kernel headers 2.6 on generic x86_64 systems.
  This package will always depend on the latest 2.6 kernel headers available
  for all x86_64 systems.
 
-Package: kernel-image-2.6.7-5-amd64-generic
-Architecture: amd64
+Package: kernel-image-2.6.7-6-amd64-generic
+Architecture: amd64 i386
 Section: base
 Priority: optional
 Provides: kernel-image, kernel-image-2.6
@@ -168,37 +168,37 @@
  create a custom kernel from the sources.
 
 Package: kernel-image-2.6-amd64-generic
-Architecture: amd64
+Architecture: amd64 i386
 Section: base
 Priority: optional
-Depends: kernel-image-2.6.7-5-amd64-generic
+Depends: kernel-image-2.6.7-6-amd64-generic
 Description: Linux kernel image for version 2.6 on generic x86_64 systems.
  This package will always depend on the latest 2.6 kernel image available
  for all x86_64 systems.
 
-Package: kernel-headers-2.6.7-5-amd64-xeon
-Architecture: amd64
+Package: kernel-headers-2.6.7-6-amd64-xeon
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-5
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-6
 Provides: kernel-headers, kernel-headers-2.6
 Description: Linux kernel headers 2.6.7 for Intel amd64 systems.
  This package provides kernel header files for version 2.6.7 on all amd64 
  compatible (aka "e64mt") Intel Xeon DP systems, for sites that want the 
  latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.6.7-5-amd64-xeon/debian.README.gz for details
+ /usr/share/doc/kernel-headers-2.6.7-6-amd64-xeon/debian.README.gz for details
 
 Package: kernel-headers-2.6-amd64-xeon
-Architecture: amd64
+Architecture: amd64 i386
 Section: devel
 Priority: optional
-Depends: kernel-headers-2.6.7-5-amd64-xeon
+Depends: kernel-headers-2.6.7-6-amd64-xeon
 Description: Linux kernel headers 2.6 on Intel nocona systems.
  This package will always depend on the latest 2.6 kernel headers available
  for all amd64 compatible (aka "e64mt") Intel Xeon DP systems.
 
-Package: kernel-image-2.6.7-5-amd64-xeon
-Architecture: amd64
+Package: kernel-image-2.6.7-6-amd64-xeon
+Architecture: amd64 i386
 Section: base
 Priority: optional
 Provides: kernel-image, kernel-image-2.6
@@ -222,10 +222,10 @@
  create a custom kernel from the sources.
 
 Package: kernel-image-2.6-amd64-xeon
-Architecture: amd64
+Architecture: amd64 i386
 Section: base
 Priority: optional
-Depends: kernel-image-2.6.7-5-amd64-xeon
+Depends: kernel-image-2.6.7-6-amd64-xeon
 Description: Linux kernel image for version 2.6 on Intel nocona systems.
  This package will always depend on the latest 2.6 kernel image available
  for all amd64 compatible (aka "e64mt") Intel Xeon DP systems.

Modified: trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/copyright
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/copyright	2004-08-14 08:29:03 UTC (rev 1084)
+++ trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/copyright	2004-08-14 08:35:38 UTC (rev 1085)
@@ -1,18 +1,21 @@
-This is the Debian GNU/Linux prepackaged version of the Linux kernel.
+This is the Debian GNU/Linux prepackaged version of the Linux kernel for amd.
 Linux was written by Linus Torvalds <Linus.Torvalds@cs.Helsinki.FI>
 and others.
 
-This package was put together by Simon Shapiro <Shimon@i-Connect.Net>, from
-sources retrieved from directories under
+This package was put together in April 2004 by Frederik Schüler 
+<fschueler@gmx.net>, based on kernel-image-2.6.3-i386-2.6.3 from Herbert Xu 
+<herbert@debian.org>. 
+
+The original work was  put together by Simon Shapiro <Shimon@i-Connect.Net>, 
+from sources retrieved from directories under
 ftp.cs.helsinki.fi:/pub/Software/Linux/Kernel/
 The sources may be found at most Linux ftp sites, including 
 ftp://ftp.kernel.org/pub/linux/kernel/
 
-This package was then maintained by Sven Rudolph.
+This package is maintained by Goswin von Brederlow 
+<brederlo@informatik.uni-tuebingen.de> and Frederik Schüler 
+<fschueler@gmx.net>.
 
-This package has been maintained by Herbert Xu <herbert@debian.org>
-since March 1997.
-
 Linux is copyrighted by Linus Torvalds and others.
 
    This program is free software; you can redistribute it and/or modify

Modified: trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/rules
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/rules	2004-08-14 08:29:03 UTC (rev 1084)
+++ trunk/kernel/amd64/kernel-image-2.6.7-amd64-2.6.7/debian/rules	2004-08-14 08:35:38 UTC (rev 1085)
@@ -4,8 +4,10 @@
 #
 # GNU copyright 1997 to 1999 by Joey Hess.
 # Copyright (c) 1999-2002 Herbert Xu <herbert@debian.org>
+# Copyright (c) 2004 Goswin von Brederlow <brederlo@informatik.uni-tuebingen.de>
+# Copyright (c) 2004 Frederik Schüler <fschueler@gmx.net>
 #
-# $Id: rules,v 1.12 2004/04/27 11:41:35 herbert Exp $
+## $Id$
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -13,6 +15,16 @@
 # This is the debhelper compatability version to use.
 export DH_COMPAT=2
 
+# Cross-compile for amd64 under i386
+debarch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ifeq ($(debarch),i386)
+export KPKG_ARCH=amd64
+endif
+# Remember real tocuh binary for later use
+TOUCH := $(shell sh -c "command -v touch")
+# Set PATH for bin/touch always and for amd64-linux-* wrapers for i386
+export PATH := $(shell pwd)/bin:$(PATH)
+
 SHELL := sh -e
 
 khsed := s/^Package: kernel-headers-\(.*\)\(-[[:digit:]]*\)$$/\1 \2/
@@ -58,7 +70,7 @@
 		cp config/$$i build-$$i/.config; \
 	done
 	cp config/default kernel-source-$(version)/.config
-	ln -s `command -v touch` bin/touch.orig
+	ln -s $(TOUCH) bin/touch.orig
 	sed 's/@kbpkg@/$(kbpkg)/g' header-install > header-install.out
 	chmod u+x header-install.out
 
@@ -67,7 +79,6 @@
 build: build-stamp
 build-stamp: unpack-stamp
 	dh_testdir
-	PATH=$$PWD/bin:$$PATH; \
 	for i in $(flavours); do \
 		cd build-$$i; \
 		make-kpkg --append_to_version $(debnum)-$$i build; \
@@ -97,7 +108,6 @@
 # Build architecture-dependent files here.
 binary-arch: install
 	dh_testdir
-
 	cd kernel-source-$(version); \
 		 HEADER_CLEAN_HOOK=$(CURDIR)/header-install.out \
 			 make-kpkg $(appvan) kernel-headers
@@ -112,6 +122,20 @@
 		cat install-$$i/debian/files >> debian/files; \
 		rm -rf install-$$i; \
 	done
+ifeq ($(debarch),i386)
+# Rebuild amd64 debs for i386
+	set -e; \
+	for DEB in *_amd64.deb; do \
+	  DIR=`echo $$DEB | cut -d"_" -f1`; \
+	  mkdir -p debian/$$DIR/DEBIAN; \
+	  dpkg -x $$DEB debian/$$DIR/; \
+	  dpkg -e $$DEB debian/$$DIR/DEBIAN/; \
+	  sed 's/Architecture: amd64/Architecture: i386/' < debian/$$DIR/DEBIAN/control > debian/$$DIR/DEBIAN/control2; \
+	  mv debian/$$DIR/DEBIAN/control2 debian/$$DIR/DEBIAN/control; \
+	  dpkg-deb -b debian/$$DIR ..; \
+	  rm $$DEB; \
+	done
+endif
 	mv *.deb ..
 
 binary: binary-indep binary-arch