r4260 - in dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27: debian patches

[Sven Luther]

Author: luther
Date: 2005-09-22 17:02:17 +0000 (Thu, 22 Sep 2005)
New Revision: 4260

Modified:
   dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/control
   dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/control-arch-powerpc.m4
   dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
   dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/patches/debian-nubus.diff.gz
Log:
Fixed nubus _SDA_BASE_ linker problem, adapted rules to kernel-tree version 11.


Modified: dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/control
===================================================================
--- dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/control	2005-09-22 10:04:27 UTC (rev 4259)
+++ dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/control	2005-09-22 17:02:17 UTC (rev 4260)
@@ -1,9 +1,9 @@
 Source: kernel-patch-powerpc-2.4.27
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.4.27-10, m4, gcc-3.3
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.4.27-11, m4
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
-Uploaders: Simon Horman <horms at debian.org>
+Uploaders: Sven Luther <luther at debian.org>
 Standards-Version: 3.6.1
 
 Package: kernel-patch-2.4.27-apus
@@ -92,111 +92,3 @@
  Together with kernel-headers-2.4.27-nubus, this package provides the
  infrastructure for building additional modules for 2.4.27-nubus
 
-Package: kernel-patch-2.4.27-powerpc
-Architecture: powerpc
-Depends: kernel-source-2.4.27
-Description: Diffs to the kernel source for nubus
- The PowerPC kernel is maintained in a multitude of source trees
- separate from Linus Torvalds' official copy.  This patch is based on
- the now abandoned linuxppc_2_4-benh tree.
-
-Package: kernel-headers-2.4.27-powerpc
-Section: devel
-Architecture: powerpc
-Provides: kernel-headers, kernel-headers-2.4
-Description: Linux/nubus kernel headers.
- Read /usr/share/doc/kernel-headers-2.4.27-powerpc/debian.README.gz for details.
-
-Package: kernel-image-2.4.27-powerpc
-Section: base
-Architecture: powerpc
-Recommends: kernel-headers-2.4.27-powerpc
-Depends: mkvmlinuz
-Suggests: kernel-doc-2.4.27
-Provides: kernel-image, kernel-image-2.4.27-powerpc-chrp, kernel-image-2.4.27-powerpc-chrp-rs6k, kernel-image-2.4.27-powerpc-pmac, kernel-image-2.4.27-powerpc-prep, kernel-modules-2.4.27-powerpc
-Replaces: kernel-image-2.4.27-powerpc-chrp, kernel-image-2.4.27-powerpc-chrp-rs6k, kernel-image-2.4.27-powerpc-pmac, kernel-image-2.4.27-powerpc-prep, kernel-modules-2.4.27-powerpc
-Conflicts: kernel-image-2.4.27-powerpc-chrp, kernel-image-2.4.27-powerpc-chrp-rs6k, kernel-image-2.4.27-powerpc-pmac, kernel-image-2.4.27-powerpc-prep, kernel-modules-2.4.27-powerpc
-Description: Linux/PowerPC kernel binary image for the powerpc flavour
-Description: Linux/PowerPC kernel binary image for the powerpc flavour
-Description: Linux/PowerPC kernel binary image for the powerpc flavour
- This package contains the Linux/PowerPC kernel image, the
- System.map file, and the modules built by the package.
- .
- This version contains the kernel images for uniprocessor PowerPC machines,
- Using from the ppc601 upto the latest G4 class processors.
- .
- Kernel image packages are generally produced using kernel-package,
- and it is suggested that you install that package if you wish to
- create a custom kernel from the sources.  You will also need
- kernel-patch-2.4.27-powerpc
-
-Package: kernel-build-2.4.27-powerpc
-Section: devel
-Architecture: powerpc
-Depends: kernel-headers-2.4.27-powerpc
-Description: build infrastructure for kernel version 2.4.27-powerpc
- .
- Together with kernel-headers-2.4.27-powerpc, this package provides the
- infrastructure for building additional modules for 2.4.27-powerpc
-
-Package: kernel-image-2.4.27-powerpc-smp
-Section: base
-Architecture: powerpc
-Recommends: kernel-headers-2.4.27-powerpc
-Depends: mkvmlinuz
-Suggests: kernel-doc-2.4.27
-Provides: kernel-image, kernel-image-2.4.27-powerpc-smp-chrp, kernel-image-2.4.27-powerpc-smp-chrp-rs6k, kernel-image-2.4.27-powerpc-smp-pmac, kernel-image-2.4.27-powerpc-smp-prep, kernel-modules-2.4.27-powerpc-smp
-Replaces: kernel-image-2.4.27-powerpc-smp-chrp, kernel-image-2.4.27-powerpc-smp-chrp-rs6k, kernel-image-2.4.27-powerpc-smp-pmac, kernel-image-2.4.27-powerpc-smp-prep, kernel-modules-2.4.27-powerpc-smp
-Conflicts: kernel-image-2.4.27-powerpc-smp-chrp, kernel-image-2.4.27-powerpc-smp-chrp-rs6k, kernel-image-2.4.27-powerpc-smp-pmac, kernel-image-2.4.27-powerpc-smp-prep, kernel-modules-2.4.27-powerpc-smp
-Description: Linux/PowerPC kernel binary image for the powerpc-smp flavour
- This package contains the Linux/PowerPC kernel image, the
- System.map file, and the modules built by the package.
- .
- This version contains the kernel images for multiprocessor PowerPC machines,
- Using from the ppc601 upto the latest G4 class processors.
- .
- Kernel image packages are generally produced using kernel-package,
- and it is suggested that you install that package if you wish to
- create a custom kernel from the sources.  You will also need
- kernel-patch-2.4.27-powerpc
-
-Package: kernel-build-2.4.27-powerpc-smp
-Section: devel
-Architecture: powerpc
-Depends: kernel-headers-2.4.27-powerpc
-Description: build infrastructure for kernel version 2.4.27-powerpc-smp
- .
- Together with kernel-headers-2.4.27-powerpc-smp, this package provides the
- infrastructure for building additional modules for 2.4.27-powerpc-smp
-
-Package: kernel-image-2.4.27-powerpc-small
-Section: base
-Architecture: powerpc
-Recommends: kernel-headers-2.4.27-powerpc
-Suggests: kernel-doc-2.4.27
-Depends: mkvmlinuz
-Provides: kernel-image, kernel-image-2.4.27-powerpc-small-chrp, kernel-image-2.4.27-powerpc-small-chrp-rs6k, kernel-image-2.4.27-powerpc-small-pmac, kernel-image-2.4.27-powerpc-small-prep, kernel-modules-2.4.27-powerpc-small
-Replaces: kernel-image-2.4.27-powerpc-small-chrp, kernel-image-2.4.27-powerpc-small-chrp-rs6k, kernel-image-2.4.27-powerpc-small-pmac, kernel-image-2.4.27-powerpc-small-prep, kernel-modules-2.4.27-powerpc-small
-Conflicts: kernel-image-2.4.27-powerpc-small-chrp, kernel-image-2.4.27-powerpc-small-chrp-rs6k, kernel-image-2.4.27-powerpc-small-pmac, kernel-image-2.4.27-powerpc-small-prep, kernel-modules-2.4.27-powerpc-small
-Description: Linux/PowerPC kernel binary image for the powerpc-small flavour
- This package contains the Linux/PowerPC kernel image, the
- System.map file, and the modules built by the package.
- .
- This version contains the kernel images for use with miboot OldWorld
- PowerMac Machines. It should be used exclusively for debian-installer.
- You probably don't want this package, but kernel-image-2.4.27-powerpc.
- .
- Kernel image packages are generally produced using kernel-package,
- and it is suggested that you install that package if you wish to
- create a custom kernel from the sources.  You will also need
- kernel-patch-2.4.27-powerpc
-
-Package: kernel-build-2.4.27-powerpc-small
-Section: devel
-Architecture: powerpc
-Depends: kernel-headers-2.4.27-powerpc
-Description: build infrastructure for kernel version 2.4.27-powerpc-small
- .
- Together with kernel-headers-2.4.27-powerpc-small, this package provides the
- infrastructure for building additional modules for 2.4.27-powerpc-small
-

Modified: dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/control-arch-powerpc.m4
===================================================================
--- dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/control-arch-powerpc.m4	2005-09-22 10:04:27 UTC (rev 4259)
+++ dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/control-arch-powerpc.m4	2005-09-22 17:02:17 UTC (rev 4260)
@@ -1,7 +1,7 @@
 Source: kernel-patch-powerpc-M4KERNEL
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-M4KERNEL, m4
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-M4KTREE, m4
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>
 Standards-Version: 3.6.1

Modified: dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
===================================================================
--- dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/rules	2005-09-22 10:04:27 UTC (rev 4259)
+++ dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/rules	2005-09-22 17:02:17 UTC (rev 4260)
@@ -26,8 +26,10 @@
 debian	:= $(shell head -1 debian/changelog | sed 's/^.*(.*-\(.*\)).*$$/\1/')
 version	:= $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)).*$$/\1/')
 
+kernel-tree := $(kernel)-11
+
 # some files in debian/ get version numbers and stuff updated on the fly
-M4 = m4 -DM4VERSION="$(version)" -DM4KERNEL="$(kernel)" -DM4ARCH="$(arch)" -DM4SUBARCH="$(subarch)" -DM4FLAVOUR="$(flavour)"
+M4 = m4 -DM4VERSION="$(version)" -DM4KERNEL="$(kernel)" -DM4ARCH="$(arch)" -DM4SUBARCH="$(subarch)" -DM4FLAVOUR="$(flavour)" -DM4KTREE="$(kernel-tree)"
 debian/%: debian/%.m4
 	$(M4) $< > $@
 

Modified: dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/patches/debian-nubus.diff.gz
===================================================================
(Binary files differ)