Changeset 921 for branches


Ignore:
Timestamp:
Nov 4, 2006, 6:00:13 PM (13 years ago)
Author:
bruno
Message:

Attempt to deliver Mandriva official 2.2.0 packages from build system

Location:
branches/2.2.0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.0/mondo-doc/Makefile.man

    r568 r921  
    3838
    3939%.8.ps: %.8
    40     @man2dvi ./$< > $<.dvi
    41     @dvips -q $<.dvi -o $@
    42     @rm -f $<.dvi
     40    @groff -Tps -mandoc ./$< > $@
    4341
    4442%.8.pdf: %.8.ps
  • branches/2.2.0/tools/mdv-env

    r594 r921  
    88export ACCOUNT="bcornec@kenobi.mandriva.com"
    99export DSTNODE="-t ssh n3.mandriva.com"
     10export SVNMDV=$HOME/mandriva
  • branches/2.2.0/tools/pkg2mdv

    r825 r921  
    4040fi
    4141
    42 export pkg=""
    43 echo "Working under $TOPBUILDDIR"
    44 cd $TOPBUILDDIR
    45 
    46 ppkg=""
    47 spkg=""
    4842
    4943for p in $c; do
    50     # s= stable; t = trunk; 1-9 = official version
    51     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
    52     pv=`basename $src .tar.gz`
    53     spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
    54     ppkg="$ppkg $pv-${TAG}${suf}.src.rpm"
     44    src=${TOPDIR}/${VER}-$TAG/$p-[1-9]*.tar.bz2
     45    distro=`ls -d ${TOPDIR}/${VER}-$TAG/$p-[1-9]*/distributions/mandriva-* | tail -1`
     46    spec=${distro}/$p.spec
     47    echo "Updating Mandriva package in $SVNMDV/$p"
     48    mkdir -p $SVNMDV/$p/SOURCES $SVNMDV/$p/SPECS
     49    rm -f $SVNMDV/$p/SOURCES/$p-*.tar.bz2 $SVNMDV/$p/SPECS/$p.spec
     50    cp -a $src $SVNMDV/$p/SOURCES
     51    cp -a $spec $SVNMDV/$p/SPECS
     52    # Use mkrel for mdv
     53    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $TAG/" $SVNMDV/$p/SPECS/$p.spec
     54    perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bcornec@mandriva.org> %{version}-%{release}/' $SVNMDV/$p/SPECS/$p.spec
     55    # Changelog management
     56    echo "Committing from $SVNMDV/$p into Mandriva's SVN"
     57    cd $SVNMDV/$p
     58    bm
     59    if [ $? -eq 0 ]; then
     60        rm -rf BUILD RPMS SRPMS
     61        #svn ci
     62    fi
    5563done
    5664
    57 echo "Packages delivery to ${ACCOUNT}"
    58 cat > /tmp/mkmondo << EOF
    59 rm -f /tmp/mondorescue.log
    60 for p in $ppkg ; do
    61     rpm -ivh \$p
    62     s=\`rpm -qlp \$p | egrep '\.spec'\`
    63     # Use mkrel for mdv
    64     perl -pi -e "s/define Release:[ \t]+..*/define Release: %mkrel $TAG/" rpm/SPECS/\$s
    65     perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bcornec@mandriva.org> %{version}-%{release}/' rpm/SPECS/\$s
    66     rm -rf rpm/BUILD/*
    67     rpmbuild -ba rpm/SPECS/\$s 2>&1 | tee -a /tmp/mondorescue.log
    68 done
    69 apkg=\`egrep "^Wrote:" /tmp/mondorescue.log | grep -v debug | cut -d: -f2\`
    70 aspkg=\`echo \$apkg | egrep "\.src.rpm"\`
    71 for d in 2006 200664; do
    72     scp -p \$aspkg chroot\${d}:
    73     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\`"
    74 done
    75 for p in \$apkg; do
    76     sudo ftpcontrib \$p
    77 done
    78 rm -f \$ppkg
    79 EOF
    80 chmod 755 /tmp/mkmondo
    81 scp -p ${spkg} /tmp/mkmondo ${ACCOUNT}:
    82 scp -p /tmp/mkmondo ${ACCOUNT}:
    83 echo "Packages rebuild on ${DSTNODE}"
    84 ssh ${ACCOUNT} ${DSTNODE} "./mkmondo"
     65    #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\`"
    8566) 2>&1 | tee /tmp/pk2mdv.log
Note: See TracChangeset for help on using the changeset viewer.