Changeset 924 in MondoRescue

Timestamp:

Nov 13, 2006, 9:57:05 AM (17 years ago)

Author:

Bruno Cornec

Message:

TAG is now per package and not shared anymore + build process adapted

Location:

branches/stable

Files:

• mindi-busybox/TAG (copied) (copied from branches/stable/tools/TAG )
• mindi-kernel/TAG (copied) (copied from branches/stable/tools/TAG )
• mindi/TAG (copied) (copied from branches/stable/tools/TAG )
• mondo-doc/TAG (moved) (moved from branches/stable/tools/TAG )
• mondo/TAG (copied) (copied from branches/stable/tools/TAG )
• tools/build2pkg (modified) (2 diffs)
• tools/build2qemu (modified) (2 diffs)
• tools/file2ftp (modified) (2 diffs)
• tools/mkchangelog.pl (modified) (3 diffs)
• tools/mknewtag (modified) (2 diffs)
• tools/mknewversion (modified) (2 diffs)
• tools/pkg2fc (modified) (3 diffs)
• tools/pkg2ftp (modified) (3 diffs)
• tools/pkg2mdv (modified) (2 diffs)
• tools/svn-env (modified) (1 diff)
• tools/svn2build (modified) (4 diffs)

branches/stable/tools/build2pkg

@@ -37 +37 @@
         c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi
@@ -79 +79 @@
         rm -rf $p-${PVER}
 
+        # set LANGUAGE to check for correct log messages
+        export LANGUAGE=C
         rpmbuild -ba $p.spec 2>&1 | tee $log
         if [ $? != 0 ]; then 

branches/stable/tools/build2qemu

@@ -21 +21 @@
     export TOOLHOME=${PWD}/$dname
 fi
-
 
 . $TOOLHOME/common-env
@@ -89 +88 @@
     ssh -p $sp root@localhost "date $rdate"
     ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo " | tee $MONDOTMP/mkvm.log
-    #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo ; rm -f $MONDOTMP" | tee $MONDOTMP/mkvm.log
     if [ $vmp -eq 1 ]; then
         ssh -p $sp root@localhost "halt -p"

branches/stable/tools/file2ftp

@@ -11 +11 @@
 prem=`echo $dname |cut -c1`
 if [ ${prem} == "/" ]; then
-        export TOOLHOME=$dname
+    export TOOLHOME=$dname
 else
     export TOOLHOME=${PWD}/$dname
@@ -37 +37 @@
         c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi

branches/stable/tools/mkchangelog.pl

@@ -25 +25 @@
 my $ver2 = "";
 my $date = "";
+my $tag = "";
 
 # For date handling
@@ -58 +59 @@
     }
 }
+$tmp="$TOOLHOME/../$pkg/TAG"
+if (-f "$tmp") {
+    open(TAG,"$tmp") || die "Unable to open $tmp";
+    $tag = <TAG>;
+    chomp($tag);
+} else {
+    die "Unable to find a TAG file for $pkg\n";
+}
 #print "Using $chglog as input ChangeLog file for $pkg\n";
 
@@ -90 +99 @@
         if ($ver !~ /-/) {
             if ($first eq 1) {
-                $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
+                $ver2 = "$ver-$tag"."$ENV{suf}";
                 $first=0;
             } else {

branches/stable/tools/mknewtag

@@ -16 +16 @@
 fi
 
-. $TOOLHOME/common-env
-. $TOOLHOME/distro-env
+if [ "$1" = "" ]; then
+    mods="mindi mondo mondo-doc mindi-busybox mindi-kernel"
+else
+    mods="$*"
+fi
 
-# We need to get $VER and $TAG
-if [ "$1" = "" ]; then
-    LAST=`cat ${TOPDIR}/LAST`
-else
-    LAST=$1
-    shift
-fi
-VER=`echo $LAST | cut -d- -f1`
-
-TAG=`echo $LAST | cut -d- -f2`
-echo -n "Changing TAG of version $VER value from $TAG to "
-((TAG=$TAG+1))
-echo "$TAG"
-nb=`svn diff $TOOLHOME/.. | wc -l`
+cd $TOOLHOME/..
+nb=`svn diff | wc -l`
 if [ $nb -gt 0 ]; then
     echo "You'll have to check in before updating the TAG"
     exit -1
 else
-    for p in mindi mondo mindi-busybox mindi-kernel; do
-        v=`cat $TOOLHOME/../$p/VERSION`
-        grep -q "${v}" $TOOLHOME/../$p/ChangeLog
+    for p in $mods; do
+        grep -q "${v}" $p/ChangeLog
         if [ $? -ne 0 ]; then
             echo "You'll have to document in ${p}'s ChangeLog for ${v} related modifications"
@@ -45 +35 @@
         fi
     done
-    echo "$TAG" > $TOOLHOME/TAG
-    (cd $TOOLHOME/.. ; svn ci -m "Automatic update of TAG to $TAG" ; svn up)
+    for p in $mods; do
+        TAG=`cat $p/TAG`
+        v=`cat $p/VERSION`
+        echo -n "Changing TAG of $p-$v value from $TAG to "
+        ((TAG=$TAG+1))
+        echo "$TAG"
+        echo "$TAG" > $p/TAG
+    done
+    svn ci -m "Automatic update of TAGs" ; svn up
 fi

branches/stable/tools/mknewversion

@@ -16 +16 @@
 fi
 
-. $TOOLHOME/common-env
-. $TOOLHOME/distro-env
-
 # We need to get $VER
 if [ "$1" = "" ]; then
-    LAST=`cat ${TOPDIR}/LAST`
+    echo "Syntax: mknewversion version"
+    exit -1
 else
-    LAST=$1
+    VER=$1
     shift
 fi
-VER=`echo $LAST | cut -d- -f1`
-MAJVER=`echo $VER | cut -d. -f1-2`
-MINDIMAJVER=`echo $VER | cut -d. -f1`
-MINDIMINVER=`echo $VER | cut -d. -f2`
-((MINDIMAJVER=$MINDIMAJVER-1))
-MINVER=`echo $VER | cut -d. -f3`
-TAG=1
-((MINVER=$MINVER+1))
-VER=${MAJVER}.${MINVER}
-echo "Changing Version $LAST to ${VER}-${TAG}"
+
 grep -q stable $TOOLHOME/../mondo/VERSION
 if [ $? -ne 0 ]; then
@@ -41 +30 @@
     exit -1
 fi
+
 nb=`svn diff $TOOLHOME/.. | wc -l`
 if [ $nb -gt 0 ]; then
     echo "You'll have to check in before changing version"
-else
-    svn copy $SVN_M/branches/stable $SVN_M/branches/${VER}
-    cd $TOOLHOME/../..
-    svn co $SVN_M/branches/${VER} ${VER}
-    cd ${VER}
-    echo "$TAG" > tools/TAG
-    for p in mindi mondo mondo-doc mindi-kernel mindi-busybox; do
-        v=${VER}
-        if [ $p == "mindi" ]; then
-            v=${MINDIMAJVER}.${MINDIMINVER}.${MINVER}
-        fi
-        echo "$v" > $p/VERSION
-        if [ -f $p/ChangeLog ]; then
-            grep -q "${v}-${TAG}" $p/ChangeLog
-            if [ $? -ne 0 ]; then
-                echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
-                exit -1
-            fi
-        fi
-    done
-    svn ci -m "Creation of ${VER}-$TAG"
-    svn up
+    exit -1
 fi
+
+svn copy $SVN_M/branches/stable $SVN_M/branches/${VER}
+cd $TOOLHOME/../..
+svn co $SVN_M/branches/${VER} ${VER}
+cd ${VER}
+
+for p in mindi mondo mondo-doc mindi-kernel mindi-busybox; do
+    # Reset TAG - This maybe an issue for mindi-busybox only
+    echo "1" > $p/TAG
+    v=$VER
+    echo $p | grep -q mindi 
+    if [ $? -eq 0 ]; then
+        echo "Please give new $p version for this $VER mondo version ? "
+        read v
+    fi
+    echo "$v" > $p/VERSION
+done
+svn ci -m "Creation of mondo ${VER}-$TAG"
+svn up

branches/stable/tools/pkg2fc

@@ -36 +36 @@
         c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi
@@ -51 +51 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
-    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
-    ppkg="$ppkg $pv-${TAG}${suf}.src.rpm"
+    tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"` 
+    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${tag}${suf}.src.rpm"
+    ppkg="$ppkg $pv-${tag}${suf}.src.rpm"
 done
 
@@ -62 +63 @@
     s=\`rpm -qlp \$p | egrep '\.spec'\`
     # Use dist for fc
-    perl -pi -e "s/define Release:[ \t]+[0-9]+..*/define Release:   $TAG%{?dist}/" rpm/SPECS/\$s
+    perl -pi -e "s/define Release:[ \t]+([0-9]+)..*/define Release: $1%{?dist}/" rpm/SPECS/\$s
     perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bruno@mondorescue.org> %{version}-%{release}/' rpm/SPECS/\$s
     rm -rf rpm/BUILD/*

branches/stable/tools/pkg2ftp

@@ -37 +37 @@
         c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi
@@ -52 +52 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
+    tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"`
     if [  _"$dtype" = _"rpm" ]; then
         if [ _"$p" = _"mondo-doc" ]; then
@@ -58 +59 @@
             ar=$ARCH
         fi
-        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
-        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
+        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${tag}${suf}.${ar}.rpm"
+        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${tag}${suf}.src.rpm"
     elif [  _"$dtype" = "_deb" ]; then
         pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"

branches/stable/tools/pkg2mdv

@@ -36 +36 @@
         c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi
@@ -62 +62 @@
     cp -a $spec SPECS
     # Use mkrel for mdv
-    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $TAG/" SPECS/$p.spec
+    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $tag/" SPECS/$p.spec
     perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
     perl -pi -e 's/mindi >= ..*,/mindi/' SPECS/$p.spec

branches/stable/tools/svn-env

@@ -6 +6 @@
 #
 
-export VER=`cat ${TOOLHOME}/../mondo/VERSION`
-
 # To be safe for SVN commands
 export REVISION=`(cd $TOOLHOME/.. ; svnversion .)`
-export TAG=`cat ${TOOLHOME}/TAG`

branches/stable/tools/svn2build

@@ -19 +19 @@
 . ./svn-env
 
+VER=`cat ${TOOLHOME}/../mondo/VERSION`
+TAG=`cat ${TOOLHOME}/../mondo/TAG`
 DEST=${TOPDIR}/${VER}-$TAG
 mkdir -p $DEST
@@ -28 +30 @@
             c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi
@@ -37 +39 @@
 for p in $c; do
     v=`cat ${TOOLHOME}/../$p/VERSION`
-    echo "Management of $p $v-$TAG (rev $REVISION)"
+    tag=`cat ${TOOLHOME}/../$p/TAG`
+    echo "Management of $p $v-$tag (rev $REVISION)"
     dest="$DEST/$p-$v"
     rm -fr $dest
@@ -53 +56 @@
         ddd=`LANG=C ; date '+%Y-%m-%d'`
         cat > $MONDOTMP/mondorescue.mc << EOF
-define(\`TTT', ${TAG})dnl
-define(\`RRR', ${TAG}${suf})dnl
+define(\`TTT', ${tag})dnl
+define(\`RRR', ${tag}${suf})dnl
 define(\`VVV', ${v})dnl
 define(\`DDD', ${ddd})dnl