Changeset 932 in MondoRescue for trunk/tools

Timestamp:

Nov 15, 2006, 12:40:15 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r913:931 $SVN_M/branches/stable

Location:

trunk/tools

Files:

• TAG (deleted)
• build2pkg (modified) (2 diffs)
• build2qemu (modified) (2 diffs)
• distro-env (modified) (4 diffs)
• file2ftp (modified) (2 diffs)
• livwww (modified) (3 diffs)
• mdv-changelog.pl (copied) (copied from branches/stable/tools/mdv-changelog.pl )
• mdv-env (modified) (1 diff)
• mkchangelog.pl (modified) (3 diffs)
• mknewtag (modified) (2 diffs)
• mknewversion (modified) (2 diffs)
• pkg2fc (modified) (3 diffs)
• pkg2ftp (modified) (3 diffs)
• pkg2mdv (modified) (1 diff)
• qemu-vm.txt (modified) (1 diff)
• svn-env (modified) (1 diff)
• svn2build (modified) (4 diffs)

trunk/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

trunk/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"

trunk/tools/distro-env

@@ -27 +27 @@
             export ddir="fedora"
             export dver=`awk '{print $4}' /etc/redhat-release`
+        elif grep -q CentOS /etc/redhat-release ; then
+            export ddir="centos"
+            export dver=`awk '{print $3}' /etc/redhat-release`
         else
             export ddir="redhat"
@@ -81 +84 @@
     dtype="rpm"
     suf=".${ddir}${dver}"
-elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" ]; then
+elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" -o $ddir = "centos" ]; then
     dfam="redhat"
     dtype="rpm"
@@ -87 +90 @@
     if [ $ddir = "fedora" ]; then
         suf=".fc${dver1}"
+    elif [ $ddir = "centos" ]; then
+        dver1=`echo ${dver} | sed "s/\.[0-9]//"`
+        suf=".centos${dver1}"
     elif [ $ddir = "redhat" ]; then
         suf=".rh${dver1}"
@@ -118 +124 @@
 
 if [ _"$dtype" = _"rpm" ]; then
+    export TOPBUILDDIR=`rpmquery -E '%{_topdir}' 2> /dev/null`
     export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
-    if [ -f ${HOME}/.rpmmacros ]; then
-        export TOPBUILDDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
+    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
+    if [ $? -ne 0 ]; then
+        echo "Please ensure that you can write into ${TOPBUILDDIR}"
+        echo "Solution: setup _topdir in your ~/.rpmmacros or"
+        echo "chown the ${TOPBUILDDIR} to your uid"
+        exit -1
     fi
-    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
 elif [ _"$dtype" = _"deb" ]; then
     mkdir -p ${TOPBUILDDIR}

trunk/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

trunk/tools/livwww

@@ -48 +48 @@
 if [ $force -eq 1 ]; then
     echo "Purging $LOCALDIR"
-    rm -rf $LOCALDIR
+    rm -rf $LOCALDIR/* $LOCALDIR/.??*
 fi
 
@@ -55 +55 @@
 if [ $force -eq 1 ]; then
     echo "Purging $LOCALDOC"
-    rm -rf $LOCALDOC
+    rm -rf $LOCALDOC/* $LOCALDOC/.??*
 fi
 
@@ -69 +69 @@
     make -f Makefile.howto
     make -f Makefile.man
-    mv $LOCALDOC $LOCALDIR/docs
+    mkdir -p $LOCALDIR/docs
+    mv $LOCALDOC/* $LOCALDIR/docs
     #
     # Man pages corrections

trunk/tools/mdv-env

@@ -8 +8 @@
 export ACCOUNT="bcornec@kenobi.mandriva.com"
 export DSTNODE="-t ssh n3.mandriva.com"
+export SVNMDV=$HOME/mandriva

trunk/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 {

trunk/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

trunk/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

trunk/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/*

trunk/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"

trunk/tools/pkg2mdv

@@ -36 +36 @@
         c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
-        c=$1
+        c="$*"
     fi
 fi
 
-export pkg=""
-echo "Working under $TOPBUILDDIR"
-cd $TOPBUILDDIR
-
-ppkg=""
-spkg=""
 
 for p in $c; do
-    # s= stable; t = trunk; 1-9 = official version
-    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"
+    src=${TOPDIR}/${VER}-$TAG/$p-[1-9]*.tar.bz2
+    s=`basename $src`
+    oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
+    newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
+    distro=`ls -d ${TOPDIR}/${VER}-$TAG/$p-[1-9]*/distributions/mandriva-* | tail -1`
+    spec=${distro}/$p.spec
+    echo "Updating Mandriva package in $SVNMDV/$p"
+    cd $SVNMDV/$p
+    mkdir -p SOURCES SPECS
+    echo "Modifying $oldver => $newver"
+    svn del --force SOURCES/$p-*.tar.bz2 
+    cp -a $src SOURCES/$p-$newver.tar.bz2
+    tar xfj SOURCES/$p-$newver.tar.bz2
+    mv $p-$oldver $p-$newver
+    perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
+    tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
+    rm -rf $p-$newver
+    svn add SOURCES/$p-$newver.tar.bz2
+    cp -a $spec SPECS
+    # Use mkrel for mdv
+    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
+    $TOOLHOME/mdv-changelog.pl SPECS/$p.spec
+    # Changelog management
+    echo "Building packages"
+    bm
+    if [ $? -eq 0 ]; then
+        rm -rf BUILD RPMS SRPMS BUILDROOT
+        echo "Committing from $SVNMDV/$p into Mandriva's SVN"
+        svn ci -F $MONDOTMP/cmt.spec
+        if [ $? -eq 0 ]; then
+            svn up
+            rm -f $MONDOTMP/cmt.spec
+            echo "Building on Mandriva's cluster"
+            ssh $ACCOUNT $DSTNODE "yr $p"
+        fi
+    fi
 done
 
-echo "Packages delivery to ${ACCOUNT}"
-cat > /tmp/mkmondo << EOF
-rm -f /tmp/mondorescue.log
-for p in $ppkg ; do
-    rpm -ivh \$p
-    s=\`rpm -qlp \$p | egrep '\.spec'\`
-    # Use mkrel for mdv
-    perl -pi -e "s/define Release:[ \t]+..*/define Release: %mkrel $TAG/" rpm/SPECS/\$s
-    perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bcornec@mandriva.org> %{version}-%{release}/' rpm/SPECS/\$s
-    rm -rf rpm/BUILD/*
-    rpmbuild -ba rpm/SPECS/\$s 2>&1 | tee -a /tmp/mondorescue.log
-done
-apkg=\`egrep "^Wrote:" /tmp/mondorescue.log | grep -v debug | cut -d: -f2\`
-aspkg=\`echo \$apkg | egrep "\.src.rpm"\`
-for d in 2006 200664; do
-    scp -p \$aspkg chroot\${d}:
-    ssh chroot\${d} "for p in $aspkg; do rpm -ivh \`basename \$p\` ; rpmbuild -ba rpm/SPECS/\$s | tee -a /tmp/mondorescue.log ; done ; sudo ftp\${d}contrib \`egrep '^Wrote:' /tmp/mondorescue.log | grep -v debug | cut -d: -f2\`"
-done
-for p in \$apkg; do
-    sudo ftpcontrib \$p
-done
-rm -f \$ppkg
-EOF
-chmod 755 /tmp/mkmondo
-scp -p ${spkg} /tmp/mkmondo ${ACCOUNT}:
-scp -p /tmp/mkmondo ${ACCOUNT}:
-echo "Packages rebuild on ${DSTNODE}"
-ssh ${ACCOUNT} ${DSTNODE} "./mkmondo"
+rm -rf $MONDOTMP
+
 ) 2>&1 | tee /tmp/pk2mdv.log

trunk/tools/qemu-vm.txt

@@ -4 +4 @@
 
 # RPM based : urpmi, yum install, yast2
+# Mandriva
 urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gvim/vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo
+
+#Fedora
+yum install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gvim/vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch
+
 
 # gentoo

trunk/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`

trunk/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