r1031 - linux-kernel-headers/trunk/debian
Author: dan
Date: 2005-10-13 19:20:52 +0000 (Thu, 13 Oct 2005)
New Revision: 1031
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/generate-asm.sh
linux-kernel-headers/trunk/debian/rules
Log:
* Add patch from Andreas Jochens <aj@andaco.de> for biarch ppc / ppc64 /
i386 / amd64 support (Closes: #274920, #321969).
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2005-10-13 18:55:12 UTC (rev 1030)
+++ linux-kernel-headers/trunk/debian/changelog 2005-10-13 19:20:52 UTC (rev 1031)
@@ -3,8 +3,10 @@
* Acknowledge NMU from Adeodato Simó (Closes: #320515). Thanks!
* Add patch from Hirokazu Takata <takata@linux-m32r.org> for m32r
(Closes: #327779).
+ * Add patch from Andreas Jochens <aj@andaco.de> for biarch ppc / ppc64 /
+ i386 / amd64 support (Closes: #274920, #321969).
- -- Daniel Jacobowitz <dan@debian.org> Thu, 13 Oct 2005 14:54:20 -0400
+ -- Daniel Jacobowitz <dan@debian.org> Thu, 13 Oct 2005 15:00:08 -0400
linux-kernel-headers (2.6.13+0rc3-1.1) unstable; urgency=low
Modified: linux-kernel-headers/trunk/debian/generate-asm.sh
===================================================================
--- linux-kernel-headers/trunk/debian/generate-asm.sh 2005-10-13 18:55:12 UTC (rev 1030)
+++ linux-kernel-headers/trunk/debian/generate-asm.sh 2005-10-13 19:20:52 UTC (rev 1031)
@@ -13,13 +13,30 @@
fi
case "$arch" in
+ amd64)
+ define_biarch="#ifdef __i386__"
+ kernel_arch="x86_64"
+ kernel_arch_biarch="i386"
+ ;;
+ i386)
+ define_biarch="#ifdef __x86_64__"
+ kernel_arch="i386"
+ kernel_arch_biarch="x86_64"
+ arch_biarch="amd64"
+ ;;
powerpc)
- define_biarch="__powerpc64__"
+ define_biarch="#ifdef __powerpc64__"
kernel_arch="ppc"
kernel_arch_biarch="ppc64"
;;
+ ppc64)
+ define_biarch="#ifndef __powerpc64__"
+ kernel_arch="ppc64"
+ kernel_arch_biarch="ppc"
+ arch_biarch="powerpc"
+ ;;
sparc)
- define_biarch="__arch64__"
+ define_biarch="#ifdef __arch64__"
kernel_arch="sparc"
kernel_arch_biarch="sparc64"
;;
@@ -28,6 +45,8 @@
exit 1
esac
+[ -z "$arch_biarch" ] && arch_biarch="$kernel_arch_biarch"
+
asm_dir="asm-$kernel_arch"
asm_dir_biarch="asm-$kernel_arch_biarch"
@@ -61,7 +80,7 @@
# common for sparc and sparc64
if [ -f $dir_in/$asm_dir/$h ] && [ -f $dir_in/$asm_dir_biarch/$h ]; then
cat >> $file_out <<EOF
-#ifdef $define_biarch
+$define_biarch
# include <$asm_dir_biarch/$h>
#else
# include <$asm_dir/$h>
@@ -70,7 +89,7 @@
elif [ -f $dir_in/$asm_dir/$h ]; then
cat >> $file_out <<EOF
-#ifdef $define_biarch
+$define_biarch
# error This header is not available for $kernel_arch_biarch
#else
# include <$asm_dir/$h>
@@ -78,7 +97,7 @@
EOF
else
cat >> $file_out <<EOF
-#ifdef $define_biarch
+$define_biarch
# include <$asm_dir_biarch/$h>
#else
# error This header is not available for $kernel_arch
@@ -95,7 +114,7 @@
fi
cp "$autoconf_in"/autoconf-"$arch".h $dir_out/$asm_dir/autoconf.h
-cp "$autoconf_in"/autoconf-"$kernel_arch_biarch".h $dir_out/$asm_dir_biarch/autoconf.h
+cp "$autoconf_in"/autoconf-"$arch_biarch".h $dir_out/$asm_dir_biarch/autoconf.h
file_out="$dir_out/linux/autoconf.h"
h=autoconf.h
@@ -104,7 +123,7 @@
* file in $asm_dir or $asm_dir_biarch.
*/
-#ifdef $define_biarch
+$define_biarch
# include <$asm_dir_biarch/$h>
#else
# include <$asm_dir/$h>
Modified: linux-kernel-headers/trunk/debian/rules
===================================================================
--- linux-kernel-headers/trunk/debian/rules 2005-10-13 18:55:12 UTC (rev 1030)
+++ linux-kernel-headers/trunk/debian/rules 2005-10-13 19:20:52 UTC (rev 1031)
@@ -31,21 +31,13 @@
install -d $(includedir)
install -d $(includedir)/linux
-ifneq (,$(findstring $(DEB_HOST_ARCH), powerpc sparc))
+ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 i386 powerpc ppc64 sparc))
sh debian/generate-asm.sh $(DEB_HOST_ARCH) include $(includedir) autoconfs
else
cp -a include/asm-$(kernel_arch) $(includedir)/asm
cp autoconfs/autoconf-$(DEB_HOST_ARCH).h $(includedir)/linux/autoconf.h
endif
-ifeq ($(kernel_arch),x86_64)
- # install the i386 kernel headers in /usr/include/i386-linux
- mkdir -p $(includedir)/i386-linux
- ln -s ../linux $(includedir)/i386-linux
- ln -s ../asm-generic $(includedir)/i386-linux
- cp -a include/asm-i386 $(includedir)/i386-linux/asm
-endif
-
ifeq ($(kernel_arch),arm)
# ARM needs some extra symlinks.
rm -f $(includedir)/asm/proc
Reply to: