Changeset 597 for branches/2.0.8


Ignore:
Timestamp:
May 30, 2006, 10:51:12 PM (13 years ago)
Author:
bcornec
Message:

Build process fixes following first attempt to deliver 2.0.8

Location:
branches/2.0.8
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0.8/mondo-doc/distributions/rpm/mondo-doc.spec

    r568 r597  
    55# if mandriva official build (rpm --with is_official)
    66%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    7 %define rel     RRR
     7%define mrel    RRR
    88%define tag     TTT
    99
     
    1313Name:       mondo-doc
    1414Version:    VVV
    15 Release:    %{rel}
     15Release:    %{mrel}
    1616License:    GPL
    1717Group:      GRP
  • branches/2.0.8/tools/build2pkg

    r576 r597  
    7777        echo "Generating $p RPMS"
    7878        cd SPECS
    79         tar xfz $src $pv/distributions/$ddir/$p.spec
    80         mv $pv/distributions/$ddir/$p.spec .
     79        tar xfz $src $pv/distributions/${ddir}-$dver/$p.spec
     80        mv $pv/distributions/${ddir}-$dver/$p.spec .
    8181        rm -rf $pv
     82        rm -rf ${TOPBUILDDIR}/RPMS/${ar}/*
     83        rm -rf ${TOPBUILDDIR}/SRPMS/*
    8284
    8385        rpmbuild -ba $p.spec 2> $log 1> $log
     86        egrep '^Wrote:' $log
    8487        if [ $? != 0 ]; then
    8588            cat $log
    8689            status=-1
    8790        fi
     91        rm -rf ${TOPBUILDDIR}/BUILD/*
    8892        cd ..
    8993    elif [  _"$dtype" = _"ebuild" ]; then
    9094        log=/tmp/$p-gentoo.log
    9195        ln -sf $src .
    92         tar xfz $src $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild
     96        tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
    9397        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    9498            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    97101
    98102        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    99         mv $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
     103        mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
    100104        rm -rf $pv
    101105
  • branches/2.0.8/tools/build2qemu

    r591 r597  
    3939if [ _"$1" == _"" ]; then
    4040    export VMS=`cat ${TOOLHOME}/DISTROS`
     41    single=0
    4142else
    42     export VMS="$1"
     43    export VMS="$*"
     44    single=1
    4345fi
    4446
     
    5254export TOOLHOME=$TOOLHOME
    5355
    54 $TOOLHOME/build2pkg $LAST
    55 $TOOLHOME/pkg2ftp
     56$TOOLHOME/build2pkg $LAST < /dev/null
     57$TOOLHOME/pkg2ftp $LAST
    5658EOF
    5759chmod 755 $TMP/mkmondo
    5860
    59 $TOOLHOME/files2ftp
     61if [ $single -eq 0 ]; then
     62    $TOOLHOME/file2ftp
     63fi
    6064cd $TOOLHOME/..
    6165tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
     
    6872            exit -1
    6973    fi
     74    export sp=2222
    7075    ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
    71     export sp=2222
    7276    if [ $? -ne 0 ]; then
    7377        # Virtual machine alreday started
     
    7680        sleep 300
    7781    fi
     82    ssh -p $sp root@localhost "perl -pi -e 's|/home/bruno|/users/bruno|' /etc/passwd /home/bruno/.rpmmacros ; mv /home /users; rpm -e tetex tetex-latex passivetex jadetex texinfo xmltex linuxdoc-tools xmlto docbook-utils-pdf subversion tetex-context tetex-dvips docbook-utils"
    7883    scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
    79     ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
     84    ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
    8085    #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo ; rm -f $TMP" | tee $TMP/mkvm.log
    8186    if [ $vmp -eq 1 ]; then
    8287        ssh -p $sp root@localhost "halt -p"
    8388        sleep 300
    84         proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu | awk '{print $2}'`
     89        proces=`ps auxww | grep qemu | grep -v grep | grep /users/qemu/$m.qemu | awk '{print $2}'`
    8590        if [ "$proces" != "" ]; then
    8691            kill $proces
  • branches/2.0.8/tools/distro-env

    r591 r597  
    8787    dfam="redhat"
    8888    dtype="rpm"
    89     dver=`echo ${dver} | sed "s/\.//"`
     89    dver1=`echo ${dver} | sed "s/\.//"`
    9090    if [ $ddir = "fedora" ]; then
    91         suf=".fc${dver}"
     91        suf=".fc${dver1}"
    9292    elif [ $ddir = "redhat" ]; then
    93         suf=".rh${dver}"
     93        suf=".rh${dver1}"
    9494    else
    95         suf=".rhel${dver}"
     95        suf=".rhel${dver1}"
    9696    fi
    9797    BUILDDIR=${TOPDIR}/SPECS
  • branches/2.0.8/tools/pkg2mdv

    r593 r597  
    6363    perl -pi -e 's/define mrel[ \t]+([0-9]+)\..*/define mrel    %mkrel \$1/' rpm/SPECS/\$s
    6464    rpmbuild -ba rpm/SPECS/\$s 2>&1 | tee -a /tmp/mondorescue.log
    65     #ftpcontrib
    6665done
    6766apkg=\`egrep "^Wrote:" /tmp/mondorescue.log | grep -v debug | cut -d: -f2\`
    68 #sudo ftpcontrib \$apkg
    69 #rm -f $ppkg
     67sudo ftpcontrib \$apkg
     68rm -f $ppkg
    7069EOF
    7170chmod 755 /tmp/mkmondo
    72 #scp -p ${spkg} /tmp/mkmondo ${ACCOUNT}:
     71scp -p ${spkg} /tmp/mkmondo ${ACCOUNT}:
    7372scp -p /tmp/mkmondo ${ACCOUNT}:
    7473echo "Packages rebuild on ${DSTNODE}"
  • branches/2.0.8/tools/svn2build

    r595 r597  
    6262EOF
    6363
    64         mkdir -p $dest/distributions/$ddir
     64        mkdir -p $dest/distributions/$ddir $dest/distributions/${ddir}-$dver
    6565        if [ "$dtype" = "rpm" ]; then
    6666            if [ -f $dest/distributions/$ddir/spec.m4 ]; then
     
    7373            fi
    7474            echo "Using $inc customization to build SPEC file"
    75             m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/$ddir/$p.spec
     75            m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7676
    7777            if [ -f $dest/distributions/$ddir/changelog ]; then
     
    8686            echo "Using $log customization to build changelog file"
    8787            ddate=`LANG=C ; date "+%a %b %d %Y"`
    88             cat > $dest/distributions/$ddir/$p.changelog.new << EOF
     88            cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
    8989* $ddate Bruno Cornec <bruno@mondorescue.org> VVV-RRR
    9090- Updated to VVV-r${REVISION}
    9191
    9292EOF
    93             cat $log >> $dest/distributions/$ddir/$p.changelog.new
    94             m4 /tmp/mondorescue.mc $dest/distributions/$ddir/$p.changelog.new >> $dest/distributions/$ddir/$p.spec
    95             rm -f $dest/distributions/$ddir/$p.changelog.new
     93            cat $log >> $dest/distributions/${ddir}-$dver/$p.changelog.new
     94            m4 /tmp/mondorescue.mc $dest/distributions/${ddir}-$dver/$p.changelog.new >> $dest/distributions/${ddir}-${dver}/$p.spec
     95            rm -f $dest/distributions/${ddir}-$dver/$p.changelog.new
    9696
    9797        elif [ "$dtype" = "ebuild" ]; then
    98             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/$ddir/$p-$v-r$TAG.ebuild
     98            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
    9999        elif [ "$dtype" = "deb" ]; then
    100100            # To be developped
Note: See TracChangeset for help on using the changeset viewer.