Changeset 779 in MondoRescue for branches

Timestamp:

Aug 9, 2006, 1:51:09 AM (19 years ago)

Author:

Bruno Cornec

Message:

Build process updated from stable.

Location:

branches/2.0.9/tools

Files:

• build2pkg (modified) (3 diffs)
• file2ftp (modified) (1 diff)
• mkannounce (modified) (1 diff)
• mkchangelog.pl (modified) (1 diff)
• pkg2ftp (modified) (1 diff)
• svn2build (modified) (1 diff)

branches/2.0.9/tools/build2pkg

@@ -71 +71 @@
 
         if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
-            echo "Generating bzip2 files ($dfam)"
-            gzip -cd $src | bzip2 -c3 > SOURCES/$pv.tar.bz2
+            echo "Using bzip2 files ($dfam)"
+            ln -sf $pv.tar.bz2 SOURCES/
         else
+            echo "Using gzip files ($dfam)"
             ln -sf $src SOURCES/
         fi
@@ -95 +96 @@
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
-        log=$TMP/$p-gentoo.log
         tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
@@ -107 +107 @@
 
         cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
+        ebuild $p-${PVER}.ebuild digest
         if [ $? != 0 ]; then 
-            cat $log
             status=-1
         fi
-        ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
+        ebuild $p-${PVER}.ebuild package
         if [ $? != 0 ]; then 
-            cat $log
             status=-1
         fi
     elif [  _"$dtype" = _"deb" ]; then
-        log=$TMP/$p-deb.log
         export TMPDIR=/tmp
         cd $TOPBUILDDIR

branches/2.0.9/tools/file2ftp

@@ -46 +46 @@
 
 for p in $c; do
-    src="$src ${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz"
+    src1="${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz"
+    src2=`echo $src1 | sed 's/\.tar\.gz//'`
+    src="$src $src1 $src2.tar.bz2"
 done
+
 
 echo "Sources delivery to ${ACCOUNT}:${DSTDIR}/src"

branches/2.0.9/tools/mkannounce

@@ -30 +30 @@
 TAG=`echo $LAST | cut -d- -f2`
 
-SEARCH=`echo $LAST | cut -c2-`
+SEARCH=`echo $VER | cut -c2-`
 
 rm -f $TMP/announce.tmp
 cat > $TMP/announce.tmp << EOF
-MondoRescue $LAST is now available</p>
+MondoRescue $VER is now available</p>
 
-<p>I'm happy to announce the availability of a newest version of mondoescue $LAST. Enjoy it as usual!</p>
+<p>I'm happy to announce the availability of a newest version of mondoescue $VER. Enjoy it as usual!</p>
 <p>
 Now available at <a href="ftp://ftp.mondorescue.org/">ftp://ftp.mondorescue.org/

branches/2.0.9/tools/mkchangelog.pl

@@ -89 +89 @@
     if ($dtype eq "rpm") {
         if ($ver !~ /-/) {
-            if ($first -eq 1) {
+            if ($first eq 1) {
                 $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
             } else {

branches/2.0.9/tools/pkg2ftp

@@ -63 +63 @@
         pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
         spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
+    elif [  _"$dtype" = "_ebuild" ]; then
+        spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
+        pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
     fi
 done

branches/2.0.9/tools/svn2build

@@ -138 +138 @@
     echo "Creating $p tar files"
     tar cfphz ${DEST}/$p-$v.tar.gz $dest
-    #gzip -cd ${DEST}/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${DEST}/$p-$v-$TAG.tar.bz2
-    #tar cfhj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
+    tar cfphj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
 done