[Lunar-commits] r17165 - moonbase/trunk/kernel/linux-2.6

[Moritz Heiber]

Author: moe
Date: 2005-11-03 15:11:11 +0000 (Thu, 03 Nov 2005)
New Revision: 17165

Modified:
   moonbase/trunk/kernel/linux-2.6/BUILD
   moonbase/trunk/kernel/linux-2.6/DETAILS
Log:
Fixes for Janne and x86_64



Modified: moonbase/trunk/kernel/linux-2.6/BUILD
===================================================================
--- moonbase/trunk/kernel/linux-2.6/BUILD	2005-11-03 14:37:03 UTC (rev 17164)
+++ moonbase/trunk/kernel/linux-2.6/BUILD	2005-11-03 15:11:11 UTC (rev 17165)
@@ -21,16 +21,19 @@
 
 ) && (
 
+  # Needed for x86_64
+  MYARCH="`arch | egrep -q "i?86" && echo i386 || arch`"
+
   yes n | make oldconfig
   LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.stable
-  rm -f arch/i386/boot/bzImage
+  rm -f arch/${MYARCH}/boot/bzImage
 
   make ${MAKES:+-j$MAKES} bzImage           &&
   make ${MAKES:+-j$MAKES} modules           &&
   backup_mods_krnl $VERSION	            &&
   prepare_install                           &&
   make modules_install                      &&
-  cp arch/i386/boot/bzImage /boot/$VERSION  &&
+  cp arch/${MYARCH}/boot/bzImage /boot/$VERSION  &&
   cp System.map /boot/System.map-$VERSION
   
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/kernel/linux-2.6/DETAILS
===================================================================
--- moonbase/trunk/kernel/linux-2.6/DETAILS	2005-11-03 14:37:03 UTC (rev 17164)
+++ moonbase/trunk/kernel/linux-2.6/DETAILS	2005-11-03 15:11:11 UTC (rev 17165)
@@ -1,18 +1,18 @@
           MODULE=linux-2.6
-         VERSION=2.6.13.4
-	    BASE=2.6.13
+         VERSION=2.6.14
+	    BASE=2.6.14
           SOURCE=linux-${BASE}.tar.bz2
- 	 SOURCE2=patch-${VERSION}.bz2
+# 	 SOURCE2=patch-${VERSION}.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/linux-$VERSION
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
    SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
-  SOURCE2_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
-  SOURCE2_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
-      SOURCE_VFY=sha1:62a42196f4d13452c8acbd39461e1b7faa445380
-     SOURCE2_VFY=sha1:8e69a84acab9240def81e011cd0c7bdae2d05bf0
+#  SOURCE2_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
+#  SOURCE2_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
+      SOURCE_VFY=sha1:e8024d1c65b5fd14be0d64904ff9bb904a290526
+#     SOURCE2_VFY=sha1:8e69a84acab9240def81e011cd0c7bdae2d05bf0
         WEB_SITE=http://www.kernel.org
          ENTERED=20041019
-         UPDATED=20051011
+         UPDATED=20051103
            SHORT="The Linux kernel is the core of a Linux GNU Operating System."
      KEEP_SOURCE=on
            TMPFS=off