From 221d96db71e6ab6f936f2d67ca700a95d6752a1d Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@debian.org>
Date: Mon, 31 Oct 2005 08:00:52 +0000
Subject: [PATCH] Add missing kernel-arch and kernel-header-dirs to defines    
 so headers get included. (closes: #336521)     N.B: I only filled in arches
 where other's hadn't done so alread.          Please fix if its wrong.

svn path=/dists/trunk/linux-2.6/; revision=4695
---
 debian/arch/alpha/defines | 2 ++
 debian/arch/arm/defines   | 2 ++
 debian/arch/hppa/defines  | 2 ++
 debian/arch/i386/defines  | 2 ++
 debian/arch/ia64/defines  | 2 ++
 debian/arch/m68k/defines  | 2 ++
 debian/arch/s390/defines  | 2 ++
 debian/changelog          | 6 +++++-
 8 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/arch/alpha/defines b/debian/arch/alpha/defines
index 7e8d3ed14..e01cacb39 100644
--- a/debian/arch/alpha/defines
+++ b/debian/arch/alpha/defines
@@ -1,6 +1,8 @@
 [base]
 compiler: gcc-3.3
 flavours: alpha-generic alpha-smp
+kernel-arch: alpha
+kernel-header-dirs: alpha
 suggests: aboot, fdutils
 
 kernel-arch: alpha
diff --git a/debian/arch/arm/defines b/debian/arch/arm/defines
index 474fd0b6a..e7396f872 100644
--- a/debian/arch/arm/defines
+++ b/debian/arch/arm/defines
@@ -5,4 +5,6 @@ flavours:
  ixp4xx
  rpc
  s3c2410
+kernel-arch: arm
+kernel-header-dirs: arm
 suggests: fdutils
diff --git a/debian/arch/hppa/defines b/debian/arch/hppa/defines
index 3343e2eab..22d71906e 100644
--- a/debian/arch/hppa/defines
+++ b/debian/arch/hppa/defines
@@ -4,6 +4,8 @@ flavours:
  32-smp
  64
  64-smp
+kernel-arch: parisc
+kernel-header-dirs: parisc
 suggests: palo
 
 [32]
diff --git a/debian/arch/i386/defines b/debian/arch/i386/defines
index c253bbff9..67ec2c045 100644
--- a/debian/arch/i386/defines
+++ b/debian/arch/i386/defines
@@ -5,6 +5,8 @@ flavours:
  686-smp
  k7
  k7-smp
+kernel-arch: i386
+kernel-header-dirs: i386
 suggests: lilo (>= 19.1) | grub, fdutils
 
 [686]
diff --git a/debian/arch/ia64/defines b/debian/arch/ia64/defines
index a5d957c8c..f7cb19ef3 100644
--- a/debian/arch/ia64/defines
+++ b/debian/arch/ia64/defines
@@ -4,6 +4,8 @@ flavours:
  itanium-smp
  mckinley
  mckinley-smp
+kernel-arch: ia64
+kernel-header-dirs: ia64
 suggests: elilo, fdutils
 
 [itanium]
diff --git a/debian/arch/m68k/defines b/debian/arch/m68k/defines
index 38b4ad199..efb705645 100644
--- a/debian/arch/m68k/defines
+++ b/debian/arch/m68k/defines
@@ -10,6 +10,8 @@ flavours:
  mvme16x
  q40
  sun3
+kernel-arch: m68k
+kernel-header-dirs: m68k
 suggests: vmelilo, fdutils
 
 [amiga]
diff --git a/debian/arch/s390/defines b/debian/arch/s390/defines
index 168882c4d..0117bdae3 100644
--- a/debian/arch/s390/defines
+++ b/debian/arch/s390/defines
@@ -2,6 +2,8 @@
 desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
 flavours: s390 s390x
 suggests: s390-tools
+kernel-arch: s390
+kernel-header-dirs: s390
 
 [s390]
 class: IBM S/390
diff --git a/debian/changelog b/debian/changelog
index eac7039ed..b9e2ce7fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ linux-2.6 (2.6.14-2) UNRELEASED; urgency=low
     This fix, included as part of the 2.6.13.4 patch in
     2.6.13+2.6.14-rc4-0experimental.1 is CVE-2005-3181
   * Fix genearation of .extraversion, again (closes: #333842)
+  * Add missing kernel-arch and kernel-header-dirs to defines
+    so headers get included. (closes: #336521)
+    N.B: I only filled in arches where other's hadn't done so alread.
+         Please fix if its wrong.
 
   [ dann frazier ]
   * Update hppa.diff to 2.6.14-pa0
@@ -23,7 +27,7 @@ linux-2.6 (2.6.14-2) UNRELEASED; urgency=low
   * Deactivate AUDITSYSCALL globally, it slows down the kernel and is not
     needed for selinux at all.
 
- -- Norbert Tretkowski <nobse@debian.org>  Fri, 28 Oct 2005 19:26:34 +0200
+ -- Simon Horman <horms@debian.org>  Mon, 31 Oct 2005 16:57:56 +0900
 
 linux-2.6 (2.6.14-1) unstable; urgency=low