Package: kernel-package
Version: 9.001
Severity: important
Tags: patch
Hi Manoj,
Please consider adding the attached patch to kernel-package. It will be needed
as soon as the ppc64 biarch compiler is out, to build ppc64 kernels, as well
as included the mkvmlinuz support logic in part here and in part in the actual
kernel tree. This second step is still a bit primitive, but as you will see
completely orthogonal to the rest of the stuff, and i have to see how i bring
this mkvmlinuz support patch upstream.
Anyway, i would have liked to have this in for the 2.6.12 kernel release, but
as dilinger wants to upload today, i don't think this is going to happen.
Friendly,
Sven Luther
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: powerpc (ppc)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-powerpc
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Versions of packages kernel-package depends on:
ii dpkg 1.13.10 Package maintenance system for Deb
ii dpkg-dev 1.13.10 Package building tools for Debian
ii gcc [c-compiler] 4:3.3.6-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.6-7 The GNU C compiler
ii make 3.80-9 The GNU version of the "make" util
ii perl 5.8.7-3 Larry Wall's Practical Extraction
Versions of packages kernel-package recommends:
ii bzip2 1.0.2-7 high-quality block-sorting file co
ii libc6-dev [libc-dev] 2.3.2.ds1-22 GNU C Library: Development Librari
-- no debconf information
--- zzz/kernel-package/kernel/rules 2005-06-13 08:11:32.000000000 +0200
+++ kernel-package-9.001.sven1/kernel/rules 2005-07-15 15:21:30.000000000
+0200
@@ -327,15 +327,33 @@
##### PowerPC64
ifeq ($(strip $(architecture)), powerpc64)
- KERNEL_ARCH=ppc64
- kimage := vmlinux
- loader=NoLoader
- target = $(kimage)
- kimagesrc = vmlinux
- kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
- DEBCONFIG= $(CONFDIR)/config.$(KPKG_SUBARCH)
- kelfimagesrc = vmlinux
- kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+ ifneq (,$(findstring $(KPKG_SUBARCH), official-powerpc official-powerpc64))
+ ifneq (,$(findstring $(KPKG_SUBARCH), official-powerpc64))
+ KERNEL_ARCH:=ppc64
+ endif
+ ifneq (,$(findstring $(KPKG_SUBARCH), official-powerpc))
+ KERNEL_ARCH:=ppc
+ NEED_POWERPC_MKVMLINUZ_SUPPORT = YES
+ INSTALL_MKVMLINUZ_PATH =
$(SRCTOP)/$(IMAGE_TOP)/usr/lib/kernel-image-${version}
+ endif
+ target := zImage
+ loaderdep=mkvmlinuz
+ loader=NoLoader
+ kimagesrc = vmlinux
+ kimage := vmlinux
+ kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+ DEBCONFIG= $(CONFDIR)/config.$(KPKG_SUBARCH)
+ else
+ KERNEL_ARCH=ppc64
+ kimage := vmlinux
+ loader=NoLoader
+ target = $(kimage)
+ kimagesrc = vmlinux
+ kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+ DEBCONFIG= $(CONFDIR)/config.$(KPKG_SUBARCH)
+ kelfimagesrc = vmlinux
+ kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+ endif
endif
### PowerPC
@@ -363,12 +381,29 @@
#endif
endif
- ifeq (,$(findstring $(KPKG_SUBARCH),apus prpmc chrp mbx pmac prep Amiga APUs
CHRP MBX PReP chrp-rs6k nubus ))
+ ifeq (,$(findstring $(KPKG_SUBARCH),apus prpmc chrp mbx pmac prep Amiga APUs
CHRP MBX PReP chrp-rs6k nubus official-powerpc official-ppc64 ))
KPKG_SUBARCH:=$(GUESS_SUBARCH)
endif
KERNEL_ARCH:=ppc
+ ifneq (,$(findstring $(KPKG_SUBARCH), official-powerpc official-powerpc64))
+ ifneq (,$(findstring $(KPKG_SUBARCH), official-powerpc64))
+ KERNEL_ARCH:=ppc64
+ endif
+ ifneq (,$(findstring $(KPKG_SUBARCH), official-powerpc))
+ KERNEL_ARCH:=ppc
+ NEED_POWERPC_MKVMLINUZ_SUPPORT = YES
+ INSTALL_MKVMLINUZ_PATH =
$(SRCTOP)/$(IMAGE_TOP)/usr/lib/kernel-image-${version}
+ endif
+ target := zImage
+ loaderdep=mkvmlinuz
+ kimagesrc = vmlinux
+ kimage := vmlinux
+ kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+ DEBCONFIG= $(CONFDIR)/config.$(KPKG_SUBARCH)
+ endif
+
ifneq (,$(findstring $(KPKG_SUBARCH),APUs apus Amiga))
KPKG_SUBARCH:=apus
loader := NoLoader
@@ -2503,6 +2538,10 @@
IMAGE_TOP=$(IMAGE_TOP) STEM=$(INT_STEM) version=$(version) \
debian/post-install; \
fi
+ifeq ($(strip $(NEED_POWERPC_MKVMLINUZ_SUPPORT)),YES)
+ $(MAKE) INSTALL_MKVMLINUZ=$(INSTALL_MKVMLINUZ_PATH) ARCH=$(KERNEL_ARCH)
\
+ -C arch/ppc/boot mkvmlinuz_support_install
+endif
ifneq ($(strip $(image_clean_hook)),)
(cd $(IMAGE_TOP); \
test -x $(image_clean_hook) && $(image_clean_hook))
