[Lunar-commits] CVS: moonbase/kernel/kernel-headers-2.4 BUILD, 1.1, 1.2 DETAILS, 1.1, 1.2

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/kernel/kernel-headers-2.4
In directory espresso.foo-projects.org:/tmp/cvs-serv10114

Modified Files:
	BUILD DETAILS 
Log Message:
New kernel-headers-2.4 module

* Replaces the header generation of glibc
* Tested by Ratler on 2.4.x and me on 2.6.x


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/kernel-headers-2.4/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	14 Dec 2004 20:57:42 -0000	1.1
+++ BUILD	21 Jan 2005 20:03:27 -0000	1.2
@@ -1,13 +1,18 @@
 (
+  KVERSION="`readlink /usr/src/linux | sed 's/linux-*//g' | cut -d. -f2 | cut -d- -f1`"
 
-  if [ -f $SOURCE_CACHE/$SOURCE -a -f $SOURCE_CACHE/$SOURCE2 ] ; then
-    # oh yes we do want to do this:
-    prepare_install &&
-    # Unpack and install both sources
-    cd /usr/include &&
-    rm -rf asm linux                        &&
-    tar -xvjf $SOURCE_CACHE/$SOURCE         &&
-    tar -xvjf $SOURCE_CACHE/$SOURCE2
+  prepare_install &&
+  if [ $KVERSION == "4" ]; then
+    if [ -d /usr/include/asm ] && [ -d /usr/include/linux ]; then
+	rm -rf /usr/include/asm /usr/include/linux
+    fi
+
+    mkdir -p /usr/include/asm /usr/include/linux
+    cp -r /usr/src/linux/include/asm/* /usr/include/asm/
+    cp -r /usr/src/linux/include/linux/* /usr/include/linux/
+  else
+    message "${PROBLEM_COLOR}You can only use these headers with Linux 2.4.x!${DEFAULT_COLOR}"
+    exit 1
   fi
 
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/kernel-headers-2.4/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS	14 Dec 2004 20:57:42 -0000	1.1
+++ DETAILS	21 Jan 2005 20:03:27 -0000	1.2
@@ -1,20 +1,13 @@
           MODULE=kernel-headers-2.4
          VERSION="$(uname -s)-$(uname -r | sed 's/[-a-z].*//')-$(uname -m | sed 's/i[456]/i3/')"
-          SOURCE=kernel-headers-$VERSION.tar.bz2
-         SOURCE2=asm-headers-$VERSION.tar.bz2
-      SOURCE_URL=$PATCH_URL/
-     SOURCE2_URL=$PATCH_URL/
         WEB_SITE=http://lunar-linux.org/
          ENTERED=20031008
-         UPDATED=20031008
-           SHORT="System kernel headers, automagically match the current running kernel"
+         UPDATED=20050121
+           SHORT="Kernel headers for kernel 2.4.x based sytems"
 cat << EOF
 The system kernel headers are taken from a (configured) kernel source and
 may be re-installed after changes in kernel (which also ought to generally
 be followed by a rebuild of glibc. This module is normally generated by
 the glibc build. This module generates the '/usr/include' copies of the
 kernel headers directly from the /usr/src/linux installed kernel sources.
-
-"kernel-headers/Versioned" versions of this module may be supported in the
-moonbase to allow for fixed-versions to be supported by Lunar.
 EOF