Changeset 649 for trunk/tools


Ignore:
Timestamp:
Jun 8, 2006, 11:31:13 AM (13 years ago)
Author:
bcornec
Message:

merge -r617:641 $SVN_M/branches/stable

Location:
trunk/tools
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/tools/DISTROS

    r618 r649  
    99rhel_4
    1010suse_10.0
     11suse_10.1
    1112sles_9
    1213gentoo_2006
  • trunk/tools/common-env

    r588 r649  
    1212export TMPDIR=
    1313export TMP=`mktemp -d -p /tmp`
     14
     15umask 022
  • trunk/tools/mknewtag

    r618 r649  
    3535nb=`svn diff $TOOLHOME/.. | wc -l`
    3636if [ $nb -gt 0 ]; then
    37     echo "You'll have to check in order before updating the TAG"
     37    echo "You'll have to check in before updating the TAG"
    3838    echo "$TAG" > $TOOLHOME/TAG
    3939else
     40    for p in mindi mondo; do
     41        grep -q "${VER}-${TAG}" $TOOLHOME/../$p/Changelog
     42        if [ $? -ne 0 ]; then
     43            echo "You'll have to document in ${p}'s Changelog for ${VER}-${TAG} related modifications"
     44            exit -1
     45        fi
     46    done
    4047    echo "$TAG" > $TOOLHOME/TAG
    4148    (cd $TOOLHOME/.. ; svn ci -m "Automatic update of TAG to $TAG" ; svn up)
  • trunk/tools/pkg2mdv

    r600 r649  
    6262    # Use mkrel for mdv
    6363    perl -pi -e 's/define mrel[ \t]+([0-9]+)\..*/define mrel    %mkrel \$1/' rpm/SPECS/\$s
    64     perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org> ([0-9]+)\..*/define mrel   %mkrel \$1/' rpm/SPECS/\$s
     64    perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org> ([0-9]+.*)/ Bruno Cornec <bcornec@mandriva.org> %{version}-%{release}/' rpm/SPECS/\$s
     65    rm -rf rpm/BUILD/*
    6566    rpmbuild -ba rpm/SPECS/\$s 2>&1 | tee -a /tmp/mondorescue.log
    6667done
    6768apkg=\`egrep "^Wrote:" /tmp/mondorescue.log | grep -v debug | cut -d: -f2\`
    68 sudo ftpcontrib \$apkg
    69 rm -f $ppkg
     69aspkg=\`echo \$apkg | egrep "\.src.rpm"\`
     70for d in 2006 200664; do
     71    scp -p \$aspkg chroot\${d}:
     72    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\`"
     73done
     74for p in \$apkg; do
     75    sudo ftpcontrib \$p
     76done
     77rm -f \$ppkg
    7078EOF
    7179chmod 755 /tmp/mkmondo
  • trunk/tools/qemu-vm.txt

    r600 r649  
    44
    55# RPM based : urpmi, yum install, yast2
    6     neon newt-devel slang-devel autoconf automake subversion libtool gcc rpm-build wget vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man docbook-dtd41-sgml groff lynx
     6    neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch
    77
    88# gentoo
     
    4747mkdir -p mondo/tmp build
    4848cat > ~bruno/.rpmmacros << EOF
    49 %_topdir    /home/bruno/build
     49%_topdir    /users/bruno/build
    5050%_tmppath   %{_topdir}/tmp
    5151%packager   Bruno Cornec <bruno@mondorescue.org>
     
    7272wget ftp://ftp.mondorescue.org/src/buffer-1.19-1.src.rpm
    7373rpm -ivh afio-2.4.7-1.src.rpm buffer-1.19-1.src.rpm
    74 rpmbuild -ba RPMS/SPECS/afio.spec
    75 rpmbuild -ba RPMS/SPECS/buffer.spec
    76 chmod 644 RPMS/RPMS/i386/*
    77 scp -p RPMS/RPMS/i386/afio-[0-9]* RPMS/RPMS/i386/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
     74mkdir -p build/BUILD build/RPMS/i386
     75rpmbuild -ba build/SPECS/afio.spec
     76rpmbuild -ba build/SPECS/buffer.spec
     77chmod 644 build/RPMS/i386/*
     78scp -p build/RPMS/i386/afio-[0-9]* build/RPMS/i386/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
    7879
    7980
  • trunk/tools/svn2build

    r600 r649  
    66#
    77
    8 umask 022
    98dname=`dirname $0`
    109prem=`echo $dname |cut -c1`
     
    7574            m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7675
    77             if [ -f $dest/distributions/$ddir/changelog ]; then
    78                 log=$dest/distributions/$ddir/changelog
    79             elif [ -f $dest/distributions/$dfam/changelog ]; then
    80                 log=$dest/distributions/$dfam/changelog
    81             else
    82                 echo "Unable to build RPM changelog for this distro. Please report to authors"
     76            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/$p.spec
     77            if [ $? -ne 0 ]; then
     78                echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
    8379                exit -1
    8480            fi
    8581
    86             echo "Using $log customization to build changelog file"
    8782            ddate=`LANG=C ; date "+%a %b %d %Y"`
    8883            cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
     
    9186
    9287EOF
    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
    96 
    9788        elif [ "$dtype" = "ebuild" ]; then
    9889            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
Note: See TracChangeset for help on using the changeset viewer.