Package: kernel-package
Version: 8.121
Severity: normal

Please apply the attached patch (or a variation thereof) to add
powerpc/nubus support.

Friendly,

Sven Luther

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: powerpc (ppc)
Kernel: Linux 2.6.10-powerpc
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages kernel-package depends on:
ii  dpkg                         1.10.27     Package maintenance system for Deb
ii  dpkg-dev                     1.10.27     Package building tools for Debian
ii  gcc [c-compiler]             4:3.3.5-1   The GNU C compiler
ii  gcc-2.95 [c-compiler]        1:2.95.4-22 The GNU C compiler
ii  gcc-3.3 [c-compiler]         1:3.3.5-8   The GNU C compiler
ii  gcc-3.4 [c-compiler]         3.4.3-9     The GNU C compiler
ii  make                         3.80-9      The GNU version of the "make" util
ii  perl                         5.8.4-6     Larry Wall's Practical Extraction 

-- no debconf information
--- rules.orig  2005-02-22 10:09:43.000000000 +0100
+++ rules       2005-02-22 16:24:33.431949360 +0100
@@ -301,7 +301,7 @@
     endif
   endif
 
-  ifeq (,$(findstring $(KPKG_SUBARCH),apus prpmc chrp mbx pmac prep Amiga APUs 
CHRP MBX PReP chrp-rs6k ))
+  ifeq (,$(findstring $(KPKG_SUBARCH),apus prpmc chrp mbx pmac prep Amiga APUs 
CHRP MBX PReP chrp-rs6k nubus))
     KPKG_SUBARCH:=$(GUESS_SUBARCH)
   endif
 
@@ -379,32 +379,41 @@
   endif
 
   ifneq (,$(findstring $(KPKG_SUBARCH),pmac))
-    KPKG_SUBARCH:=pmac
-    target := zImage
-    ifeq ($(DEB_BUILD_ARCH),powerpc)
-      # This is only meaningful when building on a PowerPC
-      ifneq (,$(shell grep NewWorld /proc/cpuinfo))
+    ifeq (,$(shell grep NuBus /proc/cpuinfo))
+      KPKG_SUBARCH:=pmac
+      target := zImage
+      ifeq ($(DEB_BUILD_ARCH),powerpc)
+        # This is only meaningful when building on a PowerPC
+        ifneq (,$(shell grep NewWorld /proc/cpuinfo))
+          loaderdep=yaboot
+          loader=yaboot
+          #loaderdoc=
+        else
+          loaderdep=quik
+          loader=quik
+          loaderdoc=QuikDefault
+        endif
+      else
         loaderdep=yaboot
         loader=yaboot
-        #loaderdoc=
-      else
-        loaderdep=quik
-        loader=quik
-        loaderdoc=QuikDefault
       endif
-    else
-      loaderdep=yaboot
-      loader=yaboot
+      kimagesrc = vmlinux
+      kimage := vmlinux
+      kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+      HAVE_COFF_IMAGE = YES
+      coffsrc = $(shell if [ -d arch/$(KERNEL_ARCH)/coffboot ]; then \
+           echo arch/$(KERNEL_ARCH)/coffboot/$(kimage).coff ; else \
+           echo arch/$(KERNEL_ARCH)/boot/images/$(kimage).coff ; fi)
+      coffdest=$(INT_IMAGE_DESTDIR)/vmlinux.coff-$(version)
+      DEBCONFIG = $(CONFDIR)/config.pmac
+    else # We are on NuBus
+      KPKG_SUBARCH := nubus
+      target := zImage
+      loader= NoLoader
+      kimagesrc = arch/$(KERNEL_ARCH)/appleboot/Mach\ Kernel
+      kimage := vmlinux
+      kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(version)
     endif
-    kimagesrc = vmlinux
-    kimage := vmlinux
-    kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
-    HAVE_COFF_IMAGE = YES
-    coffsrc = $(shell if [ -d arch/$(KERNEL_ARCH)/coffboot ]; then \
-         echo arch/$(KERNEL_ARCH)/coffboot/$(kimage).coff ; else \
-         echo arch/$(KERNEL_ARCH)/boot/images/$(kimage).coff ; fi)
-    coffdest=$(INT_IMAGE_DESTDIR)/vmlinux.coff-$(version)
-    DEBCONFIG = $(CONFDIR)/config.pmac
   endif
 
   ifneq (,$(findstring $(KPKG_SUBARCH),PReP prep))

Reply via email to