[Lunar-commits] r26130 - moonbase/branches/crater/kernel/kernel-headers-2.6

[Moritz Heiber]

Author: moe
Date: 2007-10-08 22:08:58 +0200 (Mon, 08 Oct 2007)
New Revision: 26130

Modified:
   moonbase/branches/crater/kernel/kernel-headers-2.6/BUILD
Log:
This module WORKS! WOO!



Modified: moonbase/branches/crater/kernel/kernel-headers-2.6/BUILD
===================================================================
--- moonbase/branches/crater/kernel/kernel-headers-2.6/BUILD	2007-10-08 20:08:56 UTC (rev 26129)
+++ moonbase/branches/crater/kernel/kernel-headers-2.6/BUILD	2007-10-08 20:08:58 UTC (rev 26130)
@@ -1,25 +1,31 @@
 (
 
   if [ ! -e /tmp/glibc-post_install ] ; then
-    message "${PROBLEM_COLOR}This module is only to be called by the glibc \
-            POST_INSTALL script!"
+    message "${BOLD}${PROBLEM_COLOR}This module is only to be called by the glibc POST_INSTALL script!${DEFAULT_COLOR}"
     exit 1
   fi &&
 
   KERNEL_DIR="/usr/src/linux"
 
   if grep -q headers_install ${KERNEL_DIR}/Makefile; then
-    mkdir ${SOURCE_DIRECTORY}/tmp-headers;
-    cd ${KERNEL_DIR};
-    make headers_check;
-    prepare_install;
-    make INSTALL_HDR_PATH=${SOURCE_DIRECTORY}/tmp-headers headers_install;
-    cp -R ${SOURCE_DIRECTORY}/tmp-headers/include/* /usr/include/;
+    mkdir ${SOURCE_DIRECTORY}/tmp-headers
+
+    # Ready the headers
+    cd ${KERNEL_DIR}
+    make headers_check
+    make INSTALL_HDR_PATH=${SOURCE_DIRECTORY}/tmp-headers headers_install
+
+    # Remove some of them since they are provided by glibc already
+    rm -rf $SOURCE_DIRECTORY/tmp-headers/include/scsi
+
+    prepare_install
+
+    cp -R ${SOURCE_DIRECTORY}/tmp-headers/include/* /usr/include/
   
   else
-    message "${PROBLEM_COLOR}This module requires at least linux-2.6 >= 2.6.18!";
-    message "Please update your kernel.${DEFAULT_COLOR}";
-    exit 1;
+    message "${PROBLEM_COLOR}This module requires at least linux-2.6 >= 2.6.18!"
+    message "Please update your kernel.${DEFAULT_COLOR}"
+    exit 1
   fi &&
 
   # Cleanup