[Lunar-commits] r21704 - moonbase/trunk/kernel/kernel-headers-2.6

[Moritz Heiber]

Author: moe
Date: 2006-10-07 09:34:35 +0000 (Sat, 07 Oct 2006)
New Revision: 21704

Added:
   moonbase/trunk/kernel/kernel-headers-2.6/DEPENDS
Modified:
   moonbase/trunk/kernel/kernel-headers-2.6/BUILD
   moonbase/trunk/kernel/kernel-headers-2.6/DETAILS
Log:
Update to kernel-headers-2.6 to install the latest headers. Note: This
is now the recommened way of doing this. Once everybody is using 2.6.18
we can move this to linux-2.6 and have the kernel-headers-2.6 package
removed (or at least remove the remaining legacy code).



Modified: moonbase/trunk/kernel/kernel-headers-2.6/BUILD
===================================================================
--- moonbase/trunk/kernel/kernel-headers-2.6/BUILD	2006-10-07 07:17:02 UTC (rev 21703)
+++ moonbase/trunk/kernel/kernel-headers-2.6/BUILD	2006-10-07 09:34:35 UTC (rev 21704)
@@ -1,11 +1,23 @@
 (
-  cd ${SOURCE_DIRECTORY}/include/ &&
-    
-  # asm is a special case, since it is arch specific
-  mv asm-i386 asm &&
-    
-  prepare_install &&
+  
+  if grep headers_install /usr/src/linux/Makefile &> /dev/null; then
+    cd /usr/src/linux;
+    make headers_check;
+    prepare_install;
 
+    cd include;
+    for dir in asm linux scsi sound mtd net media ; do
+      cp -RL $dir /usr/include/;
+    done;
+
+  else
+
+  # Legacy code here until everyone is savely past 2.6.18
+
+  cd ${SOURCE_DIRECTORY}/include/;
+  mv asm-i386 asm;
+  prepare_install;
+
   for dir in asm linux scsi sound mtd
   do
      cp    -a $dir      /usr/include/
@@ -20,11 +32,12 @@
      do
         chmod 644 $file
      done
-  done &&
+  done;
 
   # XOrg X11R7 will not build without this
   # Incase of an update: Remove this!
   sed -e 's|__u16|unsigned short|g' -e 's|__u32|unsigned|g' \
-	-i /usr/include/linux/agpgart.h
+	-i /usr/include/linux/agpgart.h;
+  fi
 
 ) > $C_FIFO 2>&1

Added: moonbase/trunk/kernel/kernel-headers-2.6/DEPENDS
===================================================================
--- moonbase/trunk/kernel/kernel-headers-2.6/DEPENDS	                        (rev 0)
+++ moonbase/trunk/kernel/kernel-headers-2.6/DEPENDS	2006-10-07 09:34:35 UTC (rev 21704)
@@ -0,0 +1 @@
+depends unifdef

Modified: moonbase/trunk/kernel/kernel-headers-2.6/DETAILS
===================================================================
--- moonbase/trunk/kernel/kernel-headers-2.6/DETAILS	2006-10-07 07:17:02 UTC (rev 21703)
+++ moonbase/trunk/kernel/kernel-headers-2.6/DETAILS	2006-10-07 09:34:35 UTC (rev 21704)
@@ -7,7 +7,7 @@
         SOURCE_VFY=sha1:e72c9b260995b269c9fb9248ed468c18fb01f3fd
           WEB_SITE=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
            ENTERED=20040226
-           UPDATED=20060224
+           UPDATED=20061007
             SHORT="A set of specially patched 2.6 kernel headers"
 cat << EOF
 A set of specially patched 2.6 kernel headers.