r1046 - in trunk: . scripts/patches scripts/scripts/target-scripts

ryan at linuxfromscratch.org ryan at linuxfromscratch.org
Thu Jan 12 00:57:44 PST 2006


Author: ryan
Date: 2006-01-12 01:57:42 -0700 (Thu, 12 Jan 2006)
New Revision: 1046

Added:
   trunk/scripts/patches/linux-2.6.14-fix_generic_get_unaligned.patch
Modified:
   trunk/
   trunk/scripts/scripts/target-scripts/target-kernel.sh
Log:
 r1082 at rei:  lfs | 2006-01-12 19:19:16 +1100
 Update for kernel 2.6.14



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1081
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564
   + 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1082
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564

Added: trunk/scripts/patches/linux-2.6.14-fix_generic_get_unaligned.patch
===================================================================
--- trunk/scripts/patches/linux-2.6.14-fix_generic_get_unaligned.patch	2006-01-12 08:57:23 UTC (rev 1045)
+++ trunk/scripts/patches/linux-2.6.14-fix_generic_get_unaligned.patch	2006-01-12 08:57:42 UTC (rev 1046)
@@ -0,0 +1,21 @@
+--- linux-2.6.14/include/asm-generic/unaligned.h.~1~	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/include/asm-generic/unaligned.h	2005-11-10 14:37:58.356107194 +0100
+@@ -78,7 +78,7 @@ static inline void __ustw(__u16 val, __u
+ 
+ #define __get_unaligned(ptr, size) ({		\
+ 	const void *__gu_p = ptr;		\
+-	__typeof__(*(ptr)) val;			\
++	unsigned long val;			\
+ 	switch (size) {				\
+ 	case 1:					\
+ 		val = *(const __u8 *)__gu_p;	\
+@@ -95,7 +95,7 @@ static inline void __ustw(__u16 val, __u
+ 	default:				\
+ 		bad_unaligned_access_length();	\
+ 	};					\
+-	val;					\
++	(__typeof__(*(ptr)))val;		\
+ })
+ 
+ #define __put_unaligned(val, ptr, size)		\
+

Modified: trunk/scripts/scripts/target-scripts/target-kernel.sh
===================================================================
--- trunk/scripts/scripts/target-scripts/target-kernel.sh	2006-01-12 08:57:23 UTC (rev 1045)
+++ trunk/scripts/scripts/target-scripts/target-kernel.sh	2006-01-12 08:57:42 UTC (rev 1046)
@@ -70,7 +70,11 @@
       # fix gcc4 compilation issues
       # Note: you cannot compile kernel < 2.6.9 with gcc4
       case ${target_gcc_ver} in
-         4.* ) apply_patch linux-2.6.11-gcc4_fixes -Np0 ;;
+         4.* ) 
+            case ${KERNEL_VER} in
+               2.6.9* | 2.6.1[01]* ) apply_patch linux-2.6.11-gcc4_fixes -Np0 ;;
+            esac
+         ;;
       esac
 
       # update cx88 driver (applies 2.6.10 + 2.6.11, need to check 2.6.12+ )
@@ -82,7 +86,15 @@
       # This is to remove some gnu-specific expr syntax and invoke depmod.pl
       # instead of depmod since we need a depmod that is not a target-native
       # binary.
-      apply_patch linux-2.6-lfh-Makefile
+      case ${KERNEL_VER} in
+         2.6.[4-9]* | 2.6.1[01]* ) apply_patch linux-2.6-lfh-Makefile ;;
+         2.6.14* )
+            apply_patch linux-2.6-lfh-Makefile-2 
+            # TODO: interim fix only - see http://lkml.org/lkml/2005/11/10/146
+            apply_patch linux-2.6.14-fix_generic_get_unaligned
+         ;;
+         2.6.1[2-9]* ) apply_patch linux-2.6-lfh-Makefile-2 ;;
+      esac
    ;;
 esac
 




More information about the cross-lfs mailing list