[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gobolinux-commits
Subject:    [gobolinux-commits] tools/BuildLiveCD bin/CompressAndBuildISO
From:       detsch () gobolinux ! org (=?UTF-8?Q?Andr=C3=A9_Detsch?=)
Date:       2006-04-26 23:01:28
Message-ID: E1FYsAB-0008Et-Uc () savannah ! gnu ! org
[Download RAW message or body]

CVSROOT:	/sources/goboscripts
Module name:	tools
Branch: 	
Changes by:	André Detsch <detsch@savannah.gnu.org>	06/04/26 22:07:11

Modified files:
	BuildLiveCD/bin: CompressAndBuildISO MakeInitRDTree 
Added files:
	BuildLiveCD/Data: Packages-Devel-i686 
	BuildLiveCD/bin: UpdateEnvironment 
Removed files:
	BuildLiveCD/bin: FetchExt MakeMasterEnvironment 

Log message:
	Combined FetchExt and MakeMaster into UpdateEnvironment.
	Make it more update friendly by adding a separate file with urls and md5s.
	Getting our tools from CVS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/goboscripts/tools/BuildLiveCD/Data/Packages-Devel-i686?rev=1.1
 http://cvs.savannah.gnu.org/viewcvs/goboscripts/tools/BuildLiveCD/bin/CompressAndBuildISO.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
 http://cvs.savannah.gnu.org/viewcvs/goboscripts/tools/BuildLiveCD/bin/MakeInitRDTree.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
 http://cvs.savannah.gnu.org/viewcvs/goboscripts/tools/BuildLiveCD/bin/UpdateEnvironment?rev=1.1


Patches:
Index: tools/BuildLiveCD/bin/CompressAndBuildISO
diff -u tools/BuildLiveCD/bin/CompressAndBuildISO:1.8 \
                tools/BuildLiveCD/bin/CompressAndBuildISO:1.9
--- tools/BuildLiveCD/bin/CompressAndBuildISO:1.8	Wed Apr 26 16:58:08 2006
+++ tools/BuildLiveCD/bin/CompressAndBuildISO	Wed Apr 26 22:07:11 2006
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-kernel_version="2.6.16.2-Gobo"
+kernel_version=`sed -n 's,.*--\(.*\)--kernel.*,\1,p' \
/Programs/BuildLiveCD/Current/Data/Packages-Devel-i686`  
 if [ "$1" = "--help" ]
 then
@@ -47,7 +47,7 @@
 
     # Add few items to layer1
     mkdir -p Output/Layer1/Files
-    cp -ar External/Gobo-Files/* Output/Layer1/Files
+    cp -ar LocalCVS/files/* Output/Layer1/Files
     cp -ar External/Files-Fonts/* Output/Layer1/Files
     mkdir -p Output/Layer1/Files/Documentation
     cp -ar External/Linux-Kernel/* Output/Layer1
Index: tools/BuildLiveCD/bin/MakeInitRDTree
diff -u tools/BuildLiveCD/bin/MakeInitRDTree:1.6 \
                tools/BuildLiveCD/bin/MakeInitRDTree:1.7
--- tools/BuildLiveCD/bin/MakeInitRDTree:1.6	Wed Apr  5 06:16:51 2006
+++ tools/BuildLiveCD/bin/MakeInitRDTree	Wed Apr 26 22:07:11 2006
@@ -3,41 +3,14 @@
 if [ "$1" == "--help" ]
 then
    echo "Usage:"
-   echo "   MakeInitRDTree [ --network ] [ <cvs-account> [ <local-account> ] ]"
+   echo "   MakeInitRDTree"
    echo
    echo "Run this inside the GoboLinux LiveCD mastering environment"
    echo "to rebuild the InitRD tree."
-   echo "Network access is only performed if --network is passed."
-   echo "If you have CVS write access, pass your savannah"
-   echo "username as a parameter and, optionally,"
-   echo "the username in the current machine"
-   echo "which holds your savannah SSH credentials,"
-   echo "if it is not the same as your savannah username."
-   echo "(Only the first run, usually called by MakeMasterEnvironment,"
-   echo "requires account names to be given.)"
    echo
    exit 0
 fi
 
-network=no
-if [ "$1" == "--network" ]
-then
-   network=yes
-   shift
-fi
-
-if [ "$1" ]
-then
-   cvsuser="$1"
-   if [ "$2" ]
-   then localuser="$2"
-   else localuser="$1"
-   fi
-else
-   cvsuser=anonymous
-fi
-
-
 if [ "$UID" != 0 ]
 then
    echo "Must be run as superuser."
@@ -45,7 +18,6 @@
 fi
 
 root=$PWD/Output/InitRD
-localcvs=$PWD/LocalCVS/
 archives=$PWD/Archives/InitRD
 
 rm -rf $root
@@ -60,59 +32,12 @@
 today=`date +%Y%m%d`
 arch=`uname -m`
 
-irdscripts_tarbz2=InitRDScripts--$today--$arch.tar.bz2
-
 packages=(
    BusyBox-InitRD--20060202-SVN--$arch.tar.bz2
    MiniUdev--0.1--$arch.tar.bz2
-   $irdscripts_tarbz2
+   InitRDScripts--$today--$arch.tar.bz2
 )
 
-if [ "$network" = "yes" ]
-then
-   
-   cd $archives
-   
-   for package in "${packages[@]}"
-   do
-      wget -c "http://gobo.calica.com/initrd-packages/$package" &> /dev/null
-   done
-   
-   mkdir -p $localcvs
-   cd $localcvs
-   
-   if [ -e InitRDScripts ]
-   then
-      cd InitRDScripts
-      cvs up
-   else
-      if [ "$cvsuser" = "anonymous" ]
-      then
-         cvs -d :pserver:anonymous@cvs.sv.gnu.org:/sources/goboscripts co -d \
                InitRDScripts tools/InitRDScripts
-      else
-         export CVS_RSH=ssh
-         chown $localuser .
-         sudo -H -u $localuser cvs -d \
:ext:$cvsuser@cvs.sv.gnu.org:/sources/goboscripts co -d InitRDScripts \
                tools/InitRDScripts
-      fi
-   fi
-fi
-
-cd $archives
-
-rm -rf InitRDScripts
-pkgdir=InitRDScripts/$today
-mkdir -p $pkgdir
-cp -R $localcvs/InitRDScripts/* $pkgdir
-cd $archives/$pkgdir
-find -type d -name CVS | xargs rm -rf 
-cd $archives/InitRDScripts
-ln -nfs $today Current
-cd $archives
-
-rm $irdscripts_tarbz2
-tar cjvpf $irdscripts_tarbz2 InitRDScripts
-rm -rf InitRDScripts
-
 cd $root
 
 ####################################################
@@ -334,10 +259,4 @@
 # Hack?
 ####################################################
 
-if [ "$network" = "yes" ]
-then
-   cd $archives
-   wget -c "http://gobo.calica.com/initrd-packages/usb-storage.ko"
-fi
-
 cp $archives/usb-storage.ko $root/System/Kernel/Modules


[prev in list] [next in list] [prev in thread] [next in thread]