[Lunar-commits] r18859 - in moonbase/trunk: kernel/kernel-headers-2.6 zbeta/x11/xorg-server

[Moritz Heiber]

Author: moe
Date: 2006-02-24 12:52:04 +0000 (Fri, 24 Feb 2006)
New Revision: 18859

Modified:
   moonbase/trunk/kernel/kernel-headers-2.6/BUILD
   moonbase/trunk/kernel/kernel-headers-2.6/DETAILS
   moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD
Log:
Lets move this statement to the kernel-headers module. Its really better
this way. Also bump the headers module so that the fix gets out to the people



Modified: moonbase/trunk/kernel/kernel-headers-2.6/BUILD
===================================================================
--- moonbase/trunk/kernel/kernel-headers-2.6/BUILD	2006-02-24 12:31:35 UTC (rev 18858)
+++ moonbase/trunk/kernel/kernel-headers-2.6/BUILD	2006-02-24 12:52:04 UTC (rev 18859)
@@ -20,6 +20,11 @@
      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
+
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/kernel/kernel-headers-2.6/DETAILS
===================================================================
--- moonbase/trunk/kernel/kernel-headers-2.6/DETAILS	2006-02-24 12:31:35 UTC (rev 18858)
+++ moonbase/trunk/kernel/kernel-headers-2.6/DETAILS	2006-02-24 12:52:04 UTC (rev 18859)
@@ -7,7 +7,7 @@
         SOURCE_VFY=sha1:e72c9b260995b269c9fb9248ed468c18fb01f3fd
           WEB_SITE=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
            ENTERED=20040226
-           UPDATED=20050707
+           UPDATED=20060224
             SHORT="A set of specially patched 2.6 kernel headers"
 cat << EOF
 A set of specially patched 2.6 kernel headers. 

Modified: moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD
===================================================================
--- moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD	2006-02-24 12:31:35 UTC (rev 18858)
+++ moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD	2006-02-24 12:52:04 UTC (rev 18859)
@@ -1,8 +1,3 @@
 default_pre_build 	&&
 cd $SOURCE_DIRECTORY 	&&
-unpack $SOURCE2           &&
-
-cp -v /usr/include/linux/agpgart.h /usr/include/linux/agpgart.h.orig &&
-
-sed -e 's|__u16|unsigned short|g' -e 's|__u32|unsigned|g' \
--i /usr/include/linux/agpgart.h
+unpack $SOURCE2         &&