[Lunar-commits] CVS: moonbase/libs/glibc BUILD, 1.25, 1.26 BUILD.sparc64, 1.3, 1.4 POST_INSTALL, 1.6, 1.7

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/libs/glibc
In directory espresso.foo-projects.org:/tmp/cvs-serv10405

Modified Files:
	BUILD BUILD.sparc64 POST_INSTALL 
Log Message:
Stripping the header generation as this is now done by
the new kernel-headers-2.4 module


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/glibc/BUILD,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- BUILD	14 Dec 2004 21:24:20 -0000	1.25
+++ BUILD	21 Jan 2005 20:04:21 -0000	1.26
@@ -102,22 +102,6 @@
   # And now we install the new
   make install                                &&
 
-  # Make kernel header files for kernel-headers module
-
-  cd /usr/src/linux/include && 
-  HDRS_VER="$(uname -s)-$(uname -r | sed 's/[-a-z].*//')-$(uname -m | sed 's/i[3456]/i3/')" &&
-
-  if [ ! -e /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 ] ; then
-    touch /tmp/lunar-kernel-header-install &&
-    tar -cjf /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 linux 
-  fi &&
-  if [ ! -e /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 ] ; then
-    touch /tmp/lunar-kernel-header-install &&
-    tar -cjf /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 asm/* 
-  fi &&
-
-  cd $INSTALL_ROOT
-
   # Now optionally perform debug symbol stripping only
   if [ "$STRIP" == "y" ] ; then
     for FN in ld-2.3.3.so libanl-2.3.3.so libBrokenLocale-2.3.3.so libc-2.3.3.so   \

Index: BUILD.sparc64
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/glibc/BUILD.sparc64,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD.sparc64	14 Dec 2004 21:36:43 -0000	1.3
+++ BUILD.sparc64	21 Jan 2005 20:04:21 -0000	1.4
@@ -79,25 +79,6 @@
   # And now we install the new
   make install                                &&
 
-  # Make kernel header files for kernel-headers module
-
-  cd /usr/src/linux/include && 
-  HDRS_VER="$(uname -s)-$(uname -r | sed 's/[-a-z].*//')-sparc" &&
-
-  if [ ! -e /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 ] ; then
-    touch /tmp/lunar-kernel-header-install &&
-    tar -cjf /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 linux 
-  fi &&
-  if [ ! -e /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 ] ; then
-    touch /tmp/lunar-kernel-header-install &&
-    tar -cjf /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 asm/* 
-  fi &&
-
-  # restore the kernel symlink for the asm dir back to sparc64 now
-  rm asm && ln -sf asm-sparc64 asm &&
-  
-  cd $INSTALL_ROOT
-
   # Now optionally perform debug symbol stripping only
   if [ "$STRIP" == "y" ] ; then
     for FN in ld-2.3.3.so libanl-2.3.3.so libBrokenLocale-2.3.3.so libc-2.3.3.so   \

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/glibc/POST_INSTALL,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- POST_INSTALL	21 Jan 2005 17:33:32 -0000	1.6
+++ POST_INSTALL	21 Jan 2005 20:04:21 -0000	1.7
@@ -1,10 +1,7 @@
 # Install the kernel headers which we created in BUILD
 
 if ! module_installed kernel-headers-2.6 ; then
-    if [ -e /tmp/lunar-kernel-header-install ] ; then
-	mv /var/lock/installing.glibc /var/lock/installing.$$
-	lin -c kernel-headers-2.4
-	mv /var/lock/installing.$$ /var/lock/installing.glibc
-	rm -f /tmp/lunar-kernel-header-install
-    fi
+  mv /var/lock/installing.glibc /var/lock/installing.$$
+  lin -c kernel-headers-2.4
+  mv /var/lock/installing.$$ /var/lock/installing.glibc
 fi