Package: linux-kernel-headers Version: 2.6.16.20-5 Severity: wishlist Tags: patch
Hello, thank you for uploading the new version of linux-kernel-headers which is based on linux 2.6.16. The new common 'powerpc' subdirectory which can be used by the 32-bit 'powerpc' port and the 64-bit 'ppc64' port is a real progress compared to previous versions. To make the new version work for the 'ppc64' case, a small patch (see below) is needed. Without this patch, I get the following error, when building 'linux-kernel-headers' on ppc64/unstable: install -d debian/linux-kernel-headers/usr/include install -d debian/linux-kernel-headers/usr/include/linux cp -a include/asm-ppc64 debian/linux-kernel-headers/usr/include/asm cp: cannot stat `include/asm-ppc64': No such file or directory make: *** [stamp-lkh-install] Error 1 The attached patch fixes this by changing debian/make-autoconfs.sh and debian/rules to use 'powerpc' as the karch/kernel_arch for ppc64. Additionally, the patch changes debian/patches/linux-types-long-long.patch to make sure that the '__extension__' keyword is used on ppc64 like on the other architectures. Otherwise the build test fails on ppc64. Regards Andreas Jochens diff -urN ../tmp-orig/linux-kernel-headers-2.6.16.20/debian/make-autoconfs.sh ./debian/make-autoconfs.sh --- ../tmp-orig/linux-kernel-headers-2.6.16.20/debian/make-autoconfs.sh 2006-06-12 06:39:26.000000000 +0000 +++ ./debian/make-autoconfs.sh 2006-06-12 06:38:51.000000000 +0000 @@ -10,6 +10,8 @@ karch=mips elif test $arch = hppa; then karch=parisc + elif test $arch = ppc64; then + karch=powerpc elif test $arch = amd64; then karch=x86_64 else diff -urN ../tmp-orig/linux-kernel-headers-2.6.16.20/debian/rules ./debian/rules --- ../tmp-orig/linux-kernel-headers-2.6.16.20/debian/rules 2006-06-12 06:39:26.000000000 +0000 +++ ./debian/rules 2006-06-12 06:38:30.000000000 +0000 @@ -17,6 +17,7 @@ kernel_arch := $(patsubst hppa,parisc,$(kernel_arch)) kernel_arch := $(patsubst mipsel,mips,$(kernel_arch)) kernel_arch := $(patsubst amd64,x86_64,$(kernel_arch)) +kernel_arch := $(patsubst ppc64,powerpc,$(kernel_arch)) other_headers := $(wildcard others/asm-$(kernel_arch)-*) other_headers_inst := $(patsubst others/asm-$(kernel_arch)-%,%,$(other_headers)) diff -urN ../tmp-orig/linux-kernel-headers-2.6.16.20/debian/patches/linux-types-long-long.patch ./debian/patches/linux-types-long-long.patch --- ../tmp-orig/linux-kernel-headers-2.6.16.20/debian/patches/linux-types-long-long.patch 2006-06-12 06:39:26.000000000 +0000 +++ ./debian/patches/linux-types-long-long.patch 2006-06-12 06:38:05.000000000 +0000 @@ -152,7 +152,10 @@ =================================================================== --- include/asm-powerpc/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400 +++ include/asm-powerpc/posix_types.h 2006-06-10 00:18:06.002313076 -0400 -@@ -46,7 +46,7 @@ +@@ -44,9 +44,9 @@ + +-#ifdef __powerpc64__ ++#if defined(__powerpc64__) && !defined(__GNUC__) typedef long long __kernel_loff_t; #else #ifdef __GNUC__ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]