Changeset 763 in MondoRescue for branches/stable/tools

Timestamp:

Aug 8, 2006, 12:14:12 AM (18 years ago)

Author:

Bruno Cornec

Message:

• Remove Berlios references where obsolete
• Improve mindi patch for LVM on Debian
• bzip2 now created during svn2build, and used later by othe scripts (rationale: done once and used now a lot)
• Fix a patch for mkannounce

Location:

branches/stable/tools

Files:

• build2pkg (modified) (1 diff)
• file2ftp (modified) (1 diff)
• mkannounce (modified) (1 diff)
• pkg2ftp (modified) (1 diff)
• svn2build (modified) (1 diff)

branches/stable/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

branches/stable/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/stable/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/stable/tools/pkg2ftp

@@ -58 +58 @@
             ar=$ARCH
         fi
-        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
-        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
+        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
+        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
     elif [  _"$dtype" = "_deb" ]; then
         pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"

branches/stable/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