[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1650 - in linux-kernel-headers/trunk/debian: . patches



Author: schizo
Date: 2006-06-10 22:36:17 +0000 (Sat, 10 Jun 2006)
New Revision: 1650

Modified:
   linux-kernel-headers/trunk/debian/changelog
   linux-kernel-headers/trunk/debian/make-autoconfs.sh
   linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
   linux-kernel-headers/trunk/debian/rules
Log:
  * Fix byteorder-const.patch on arm. 
  * debian/make-autoconfs.sh: stop munging powerpc into ppc
  * debian/rules: likewise


Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog	2006-06-10 22:34:18 UTC (rev 1649)
+++ linux-kernel-headers/trunk/debian/changelog	2006-06-10 22:36:17 UTC (rev 1650)
@@ -1,3 +1,11 @@
+linux-kernel-headers (2.6.16.20-3) unstable; urgency=low
+
+  * Fix byteorder-const.patch on arm. 
+  * debian/make-autoconfs.sh: stop munging powerpc into ppc
+  * debian/rules: likewise
+
+ -- Clint Adams <schizo@debian.org>  Sat, 10 Jun 2006 18:26:40 -0400
+
 linux-kernel-headers (2.6.16.20-2) unstable; urgency=low
 
   * Fix byteorder-const.patch on arm. 

Modified: linux-kernel-headers/trunk/debian/make-autoconfs.sh
===================================================================
--- linux-kernel-headers/trunk/debian/make-autoconfs.sh	2006-06-10 22:34:18 UTC (rev 1649)
+++ linux-kernel-headers/trunk/debian/make-autoconfs.sh	2006-06-10 22:36:17 UTC (rev 1650)
@@ -10,8 +10,6 @@
     karch=mips
   elif test $arch = hppa; then
     karch=parisc
-  elif test $arch = powerpc; then
-    karch=ppc
   elif test $arch = amd64; then
     karch=x86_64
   else

Modified: linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/byteorder-const.patch	2006-06-10 22:34:18 UTC (rev 1649)
+++ linux-kernel-headers/trunk/debian/patches/byteorder-const.patch	2006-06-10 22:36:17 UTC (rev 1650)
@@ -7,8 +7,8 @@
 
 Index: include/asm-alpha/byteorder.h
 ===================================================================
---- include/asm-alpha/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-alpha/byteorder.h	2006-06-10 15:12:45.875830675 -0400
+--- include/asm-alpha/byteorder.h.orig	2006-06-10 15:21:47.000000000 -0400
++++ include/asm-alpha/byteorder.h	2006-06-10 18:26:17.731398881 -0400
 @@ -7,7 +7,7 @@
  
  #ifdef __GNUC__
@@ -20,8 +20,8 @@
  	 * Unfortunately, we can't use the 6 instruction sequence
 Index: include/asm-m68k/byteorder.h
 ===================================================================
---- include/asm-m68k/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-m68k/byteorder.h	2006-06-10 15:12:45.875830675 -0400
+--- include/asm-m68k/byteorder.h.orig	2006-06-10 15:21:47.000000000 -0400
++++ include/asm-m68k/byteorder.h	2006-06-10 18:26:17.731398881 -0400
 @@ -6,7 +6,7 @@
  
  #ifdef __GNUC__
@@ -33,8 +33,8 @@
  	return val;
 Index: include/asm-parisc/byteorder.h
 ===================================================================
---- include/asm-parisc/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-parisc/byteorder.h	2006-06-10 15:12:45.879831073 -0400
+--- include/asm-parisc/byteorder.h.orig	2006-06-10 15:21:46.000000000 -0400
++++ include/asm-parisc/byteorder.h	2006-06-10 18:26:17.735399284 -0400
 @@ -6,7 +6,7 @@
  
  #ifdef __GNUC__
@@ -82,8 +82,8 @@
  	__u32 t2 = ___arch__swab32((__u32) (x >> 32));
 Index: include/asm-sh/byteorder.h
 ===================================================================
---- include/asm-sh/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-sh/byteorder.h	2006-06-10 15:12:45.879831073 -0400
+--- include/asm-sh/byteorder.h.orig	2006-06-10 15:21:46.000000000 -0400
++++ include/asm-sh/byteorder.h	2006-06-10 18:26:17.735399284 -0400
 @@ -8,7 +8,7 @@
  #include <asm/types.h>
  #include <linux/compiler.h>
@@ -104,8 +104,8 @@
  		: "=r" (x)
 Index: include/asm-sh64/byteorder.h
 ===================================================================
---- include/asm-sh64/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-sh64/byteorder.h	2006-06-10 15:12:45.879831073 -0400
+--- include/asm-sh64/byteorder.h.orig	2006-06-10 15:21:46.000000000 -0400
++++ include/asm-sh64/byteorder.h	2006-06-10 18:26:17.735399284 -0400
 @@ -14,7 +14,7 @@
  
  #include <asm/types.h>
@@ -126,8 +126,8 @@
  		"shari		%0, 48, %0"
 Index: include/asm-v850/byteorder.h
 ===================================================================
---- include/asm-v850/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-v850/byteorder.h	2006-06-10 15:12:45.879831073 -0400
+--- include/asm-v850/byteorder.h.orig	2006-06-10 15:21:46.000000000 -0400
++++ include/asm-v850/byteorder.h	2006-06-10 18:26:17.735399284 -0400
 @@ -19,14 +19,14 @@
  
  #ifdef __GNUC__
@@ -147,8 +147,8 @@
  	__asm__ ("bsh %1, %0" : "=r" (res) : "r" (half_word));
 Index: include/asm-x86_64/byteorder.h
 ===================================================================
---- include/asm-x86_64/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-x86_64/byteorder.h	2006-06-10 15:12:45.883831471 -0400
+--- include/asm-x86_64/byteorder.h.orig	2006-06-10 15:21:46.000000000 -0400
++++ include/asm-x86_64/byteorder.h	2006-06-10 18:26:17.739399686 -0400
 @@ -6,13 +6,13 @@
  
  #ifdef __GNUC__
@@ -167,8 +167,8 @@
  	return x;
 Index: include/linux/byteorder/swab.h
 ===================================================================
---- include/linux/byteorder/swab.h.orig	2006-06-10 15:12:45.531796435 -0400
-+++ include/linux/byteorder/swab.h	2006-06-10 15:12:45.883831471 -0400
+--- include/linux/byteorder/swab.h.orig	2006-06-10 18:26:17.395365057 -0400
++++ include/linux/byteorder/swab.h	2006-06-10 18:26:17.739399686 -0400
 @@ -130,7 +130,7 @@
  #endif /* OPTIMIZE */
  
@@ -198,8 +198,8 @@
  	__u32 h = x >> 32;
 Index: include/asm-cris/arch-v10/byteorder.h
 ===================================================================
---- include/asm-cris/arch-v10/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-cris/arch-v10/byteorder.h	2006-06-10 15:12:45.883831471 -0400
+--- include/asm-cris/arch-v10/byteorder.h.orig	2006-06-10 15:21:46.000000000 -0400
++++ include/asm-cris/arch-v10/byteorder.h	2006-06-10 18:26:17.739399686 -0400
 @@ -9,14 +9,14 @@
   * them together into ntohl etc.
   */
@@ -219,8 +219,8 @@
  	
 Index: include/asm-powerpc/byteorder.h
 ===================================================================
---- include/asm-powerpc/byteorder.h.orig	2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-powerpc/byteorder.h	2006-06-10 15:12:45.883831471 -0400
+--- include/asm-powerpc/byteorder.h.orig	2006-06-10 15:21:46.000000000 -0400
++++ include/asm-powerpc/byteorder.h	2006-06-10 18:26:17.743400089 -0400
 @@ -40,7 +40,7 @@
  	__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
  }
@@ -241,14 +241,14 @@
  
 Index: include/asm-arm/byteorder.h
 ===================================================================
---- include/asm-arm/byteorder.h.orig	2006-06-10 15:13:11.000000000 -0400
-+++ include/asm-arm/byteorder.h	2006-06-10 15:13:35.468767665 -0400
+--- include/asm-arm/byteorder.h.orig	2006-06-10 15:21:46.000000000 -0400
++++ include/asm-arm/byteorder.h	2006-06-10 18:26:34.469083606 -0400
 @@ -18,7 +18,7 @@
  #include <linux/compiler.h>
  #include <asm/types.h>
  
 -static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
-+static inline __u32 ___arch__swab32(__u32 x)
++static __inline__ __u32 ___arch__swab32(__u32 x)
  {
  	__u32 t;
  

Modified: linux-kernel-headers/trunk/debian/rules
===================================================================
--- linux-kernel-headers/trunk/debian/rules	2006-06-10 22:34:18 UTC (rev 1649)
+++ linux-kernel-headers/trunk/debian/rules	2006-06-10 22:36:17 UTC (rev 1650)
@@ -14,7 +14,6 @@
 
 kernel_arch := $(DEB_HOST_ARCH)
 kernel_arch := $(patsubst armeb,arm,$(kernel_arch))
-kernel_arch := $(patsubst powerpc,ppc,$(kernel_arch))
 kernel_arch := $(patsubst hppa,parisc,$(kernel_arch))
 kernel_arch := $(patsubst mipsel,mips,$(kernel_arch))
 kernel_arch := $(patsubst amd64,x86_64,$(kernel_arch))



Reply to: