Changeset 548 in MondoRescue for branches/stable

Timestamp:

May 14, 2006, 1:12:31 AM (18 years ago)

Author:

bcornec

Message:

Introduction of TAG concept (for pkg delivery)

Location:

branches/stable/tools

Files:

• TAG (added)
• common-env (modified) (2 diffs)
• mkcommon (modified) (4 diffs)
• svn-env (copied) (copied from branches/stable/tools/common-env ) (2 diffs)

branches/stable/tools/common-env

@@ -10 +10 @@
 export TOPDIR=${BASE}/RPMS
 mkdir -p ${TOPDIR}
-
-# Should not be modified below
-dname=`dirname $0`
-export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
 export TMP=${BASE}/tmp
 mkdir -p ${TMP}
 
+# Should not be modified below
+export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
 export MINDI_VER=`cat ${BASE}/svn/${SVNBRANCH}/mindi/VERSION`
 export MONDO_VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
@@ -23 +21 @@
 cd $TOOLHOME/..
 export REVISION=`svnversion .`
+export TAG=`cat ${TOOLHOME}/TAG

branches/stable/tools/mkcommon

@@ -34 +34 @@
 cd ${BASE}/svn
 
-for p in "$c"; do
-    v=`cat ${VER}/$p/VERSION`
+for p in $c; do
+    v=`cat ${SVNBRANCH}/$p/VERSION`
     echo "Management of $p $v-$REVISION"
     rm -fr $p-$v
-    svn export ${VER}/$p $p-$v
+    svn export ${SVNBRANCH}/$p $p-$v
     echo "$REVISION" > $p-$v/REVISION
     echo "Generating SVN log file ..."
-    svn log -v ${VER}/$p > $p-$v/svn.log
+    svn log -v ${SVNBRANCH}/$p > $p-$v/svn.log
 
     if [ _"`echo $p | grep mondo-doc`" != _"" ]; then
@@ -58 +58 @@
 
     if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
-        v1=`cat ${VER}/mondo-doc/VERSION`
+        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
@@ -64 +64 @@
         fi
         (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v)
-        rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
+        rm -f $p-$v/rootfs/sbin/parted2fdisk-ia64 
     fi
     if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
-        v1=`cat ${VER}/mondo-doc/VERSION`
+        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
@@ -78 +78 @@
     # Finally creates the tar files
     echo "Creating $p tar files"
-    tar cvfhz ${TOPDIR}/SOURCES/$p-$v.tgz $p-$v
-    tar cvfhj ${TOPDIR}/SOURCES/$p-$v.tar.bz2 $p-$v
+    tar cfhz ${TOPDIR}/SOURCES/$p-$v-$TAG.tgz $p-$v
+    tar cfhj ${TOPDIR}/SOURCES/$p-$v-$TAG.tar.bz2 $p-$v
 done

branches/stable/tools/svn-env

@@ -10 +10 @@
 export TOPDIR=${BASE}/RPMS
 mkdir -p ${TOPDIR}
-
-# Should not be modified below
-dname=`dirname $0`
-export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
 export TMP=${BASE}/tmp
 mkdir -p ${TMP}
 
+# Should not be modified below
+export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
 export MINDI_VER=`cat ${BASE}/svn/${SVNBRANCH}/mindi/VERSION`
 export MONDO_VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
@@ -23 +21 @@
 cd $TOOLHOME/..
 export REVISION=`svnversion .`
+export TAG=`cat ${TOOLHOME}/TAG