Changeset 589 in MondoRescue

Timestamp:

May 29, 2006, 12:24:29 PM (18 years ago)

Author:

bcornec

Message:

Delivery process to ftp reviewed for 2.0.8

Location:

branches/stable/tools

Files:

• build2qemu (modified) (1 diff)
• mkdeliv (modified) (2 diffs)

branches/stable/tools/build2qemu

@@ -53 +53 @@
 
 $TOOLHOME/build2pkg $LAST
-#$TOOLHOME/mkdeliv
+$TOOLHOME/pkg2ftp
 EOF
 chmod 755 $TMP/mkmondo
 
+$TOOLHOME/files2ftp
 cd $TOOLHOME/..
 tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG

branches/stable/tools/mkdeliv

@@ -1 +1 @@
 #!/bin/bash
 #
-# Deliver RPMs packages and tgz files to ftp.mondorescue.org
+# Deliver packages and tgz files to ftp.mondorescue.org
 #
 # $Id$
@@ -21 +21 @@
 
 . $TOOLHOME/common-env
-. $TOOLHOME/svn-env
-. $TOOLHOME/rpm-env
+. $TOOLHOME/distro-env
+
+# We need to get $VER and $TAG
+if [ "$1" = "" ]; then
+    LAST=`cat ${TOPDIR}/LAST`
+else
+    LAST=$1
+    shift
+fi
+VER=`echo $LAST | cut -d- -f1`
+TAG=`echo $LAST | cut -d- -f2`
+echo "Working on ${VER}-$TAG"
+    
+if [ "$1" = "" ]; then
+    c="mondo-doc mindi mondo"
+else
+    if [ "$1" = "all" ]; then
+        c="mindi-kernel mondo-doc mindi mondo"
+    else
+        c=$1
+    fi
+fi
+
+export pkg=""
+echo "Working under $TOPBUILDDIR"
+cd $TOPBUILDDIR
+
+for p in $c; do
 
 tgz=""
 srpms=""
 rpms=""
-rev=`$TOOLHOME/mksvnversion`
 
-if [ "$1" = "" ]; then
-        c="mondo-doc mindi mondo"
-else
-    c=$1
-fi
 if [ "`echo $c | grep mindi`" != "" ]; then
-    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz
-    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2
-    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}${suf}.src.rpm"
+    cp -a ${TOPBUILDDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPBUILDDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz
+    cp -a ${TOPBUILDDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 ${TOPBUILDDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2
+    tgz="$tgz ${TOPBUILDDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz ${TOPBUILDDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2"
+    rpms="$rpms ${TOPBUILDDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
+    srpms="$srpms ${TOPBUILDDIR}/SRPMS/mindi-${MINDI_VER}-${rev}${suf}.src.rpm"
 fi
 if [ "`echo $c | grep mondo-doc`" != "" ]; then
-    cp -a ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz
-    cp -a ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2
-    tgz="$tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
+    cp -a ${TOPBUILDDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz ${TOPBUILDDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz
+    cp -a ${TOPBUILDDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 ${TOPBUILDDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2
+    tgz="$tgz ${TOPBUILDDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz ${TOPBUILDDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2"
+    rpms="$rpms ${TOPBUILDDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
+    srpms="$srpms ${TOPBUILDDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
 fi
 if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
-    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
-    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2
-    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
+    cp -a ${TOPBUILDDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPBUILDDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
+    cp -a ${TOPBUILDDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 ${TOPBUILDDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2
+    tgz="$tgz ${TOPBUILDDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz ${TOPBUILDDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2"
+    rpms="$rpms ${TOPBUILDDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
+    srpms="$srpms ${TOPBUILDDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
 fi
 echo "Sources delivery to ${ACCOUNT}:${DSTDIR}/src"