Changeset 649 in MondoRescue for trunk/tools

Timestamp:

Jun 8, 2006, 11:31:13 AM (18 years ago)

Author:

bcornec

Message:

merge -r617:641 $SVN_M/branches/stable

Location:

trunk/tools

Files:

• DISTROS (modified) (1 diff)
• common-env (modified) (1 diff)
• mkchangelog.pl (copied) (copied from branches/stable/tools/mkchangelog.pl )
• mknewtag (modified) (1 diff)
• pkg2mdv (modified) (1 diff)
• qemu-vm.txt (modified) (3 diffs)
• svn2build (modified) (3 diffs)

trunk/tools/DISTROS

@@ -9 +9 @@
 rhel_4
 suse_10.0
+suse_10.1
 sles_9
 gentoo_2006

trunk/tools/common-env

@@ -12 +12 @@
 export TMPDIR=
 export TMP=`mktemp -d -p /tmp`
+
+umask 022

trunk/tools/mknewtag

@@ -35 +35 @@
 nb=`svn diff $TOOLHOME/.. | wc -l`
 if [ $nb -gt 0 ]; then
-    echo "You'll have to check in order before updating the TAG"
+    echo "You'll have to check in before updating the TAG"
     echo "$TAG" > $TOOLHOME/TAG
 else
+    for p in mindi mondo; do
+        grep -q "${VER}-${TAG}" $TOOLHOME/../$p/Changelog
+        if [ $? -ne 0 ]; then
+            echo "You'll have to document in ${p}'s Changelog for ${VER}-${TAG} related modifications"
+            exit -1
+        fi
+    done
     echo "$TAG" > $TOOLHOME/TAG
     (cd $TOOLHOME/.. ; svn ci -m "Automatic update of TAG to $TAG" ; svn up)

trunk/tools/pkg2mdv

@@ -62 +62 @@
     # Use mkrel for mdv
     perl -pi -e 's/define mrel[ \t]+([0-9]+)\..*/define mrel    %mkrel \$1/' rpm/SPECS/\$s
-    perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org> ([0-9]+)\..*/define mrel   %mkrel \$1/' rpm/SPECS/\$s
+    perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org> ([0-9]+.*)/ 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\`
-sudo ftpcontrib \$apkg
-rm -f $ppkg
+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

trunk/tools/qemu-vm.txt

@@ -4 +4 @@
 
 # RPM based : urpmi, yum install, yast2
-    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
+    neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch
 
 # gentoo
@@ -47 +47 @@
 mkdir -p mondo/tmp build
 cat > ~bruno/.rpmmacros << EOF
-%_topdir    /home/bruno/build
+%_topdir    /users/bruno/build
 %_tmppath   %{_topdir}/tmp
 %packager   Bruno Cornec <bruno@mondorescue.org>
@@ -72 +72 @@
 wget ftp://ftp.mondorescue.org/src/buffer-1.19-1.src.rpm
 rpm -ivh afio-2.4.7-1.src.rpm buffer-1.19-1.src.rpm
-rpmbuild -ba RPMS/SPECS/afio.spec
-rpmbuild -ba RPMS/SPECS/buffer.spec
-chmod 644 RPMS/RPMS/i386/*
-scp -p RPMS/RPMS/i386/afio-[0-9]* RPMS/RPMS/i386/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
+mkdir -p build/BUILD build/RPMS/i386
+rpmbuild -ba build/SPECS/afio.spec
+rpmbuild -ba build/SPECS/buffer.spec
+chmod 644 build/RPMS/i386/*
+scp -p build/RPMS/i386/afio-[0-9]* build/RPMS/i386/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
 
 

trunk/tools/svn2build

@@ -6 +6 @@
 #
 
-umask 022
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -75 +74 @@
             m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
-            if [ -f $dest/distributions/$ddir/changelog ]; then
-                log=$dest/distributions/$ddir/changelog
-            elif [ -f $dest/distributions/$dfam/changelog ]; then
-                log=$dest/distributions/$dfam/changelog
-            else
-                echo "Unable to build RPM changelog for this distro. Please report to authors"
+            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/$p.spec
+            if [ $? -ne 0 ]; then
+                echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
                 exit -1
             fi
 
-            echo "Using $log customization to build changelog file"
             ddate=`LANG=C ; date "+%a %b %d %Y"`
             cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
@@ -91 +86 @@
 
 EOF
-            cat $log >> $dest/distributions/${ddir}-$dver/$p.changelog.new
-            m4 /tmp/mondorescue.mc $dest/distributions/${ddir}-$dver/$p.changelog.new >> $dest/distributions/${ddir}-${dver}/$p.spec
-            rm -f $dest/distributions/${ddir}-$dver/$p.changelog.new
-
         elif [ "$dtype" = "ebuild" ]; then
             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild