CVS: moonbase/libs/glibc BUILD,1.20,1.21 POST_INSTALL,1.1,1.2

[elaine at lunar-linux.org]

Update of /var/cvs/lunar/moonbase/libs/glibc
In directory dbguin.lunar-linux.org:/tmp/cvs-serv15482

Modified Files:
	BUILD POST_INSTALL 
Log Message:
Don't make/install headers if we already have the tarballs
Not a perfect solution but I can't think of anything better atm


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/glibc/BUILD,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- BUILD	9 Oct 2003 16:35:12 -0000	1.20
+++ BUILD	17 Oct 2003 20:53:31 -0000	1.21
@@ -107,9 +107,16 @@
   # 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/[456]/3/')" &&
-  tar -cjf /var/spool/lunar/kernel-headers-"$HDRS_VER".tar.bz2 linux &&
-  tar -cjf /var/spool/lunar/asm-headers-"$HDRS_VER".tar.bz2 asm/* &&
+  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
 

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/glibc/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL	9 Oct 2003 16:35:12 -0000	1.1
+++ POST_INSTALL	17 Oct 2003 20:53:31 -0000	1.2
@@ -1,5 +1,8 @@
 # Install the kernel headers which we created in BUILD
 
-mv /var/lock/installing.glibc /var/lock/installing.$$
-lin -c kernel-headers
-mv /var/lock/installing.$$ /var/lock/installing.glibc
+if [ -e /tmp/lunar-kernel-header-install ] ; then
+  mv /var/lock/installing.glibc /var/lock/installing.$$
+  lin -c kernel-headers
+  mv /var/lock/installing.$$ /var/lock/installing.glibc
+  rm -f /tmp/lunar-kernel-header-install
+fi