Changeset 922 in MondoRescue for branches

Timestamp:

Nov 4, 2006, 11:52:59 PM (17 years ago)

Author:

Bruno Cornec

Message:

Delivery to MDV is now OK

Location:

branches/stable/tools

Files:

• mdv-changelog.pl (added)
• mdv-env (modified) (1 diff)
• pkg2mdv (modified) (1 diff)

branches/stable/tools/mdv-env

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

branches/stable/tools/pkg2mdv

@@ -40 +40 @@
 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