Changeset 317 in MondoRescue for trunk/tools

Timestamp:

Jan 13, 2006, 8:46:06 PM (18 years ago)

Author:

bcornec

Message:

merge -r309:316 $SVN_M/branches/2.06

Location:

trunk/tools

Files:

• mkrpm (modified) (6 diffs)
• rpm-env (modified) (3 diffs)

trunk/tools/mkrpm

@@ -17 +17 @@
 . $TOOLHOME/rpm-env
 
+# To be safe for SVN commands
+cd $TOOLHOME/..
 rev=`$TOOLHOME/mksvnversion`
+
+echo "Generating SVN log file ..."
+svn log -v > /tmp/mondorescue-svn.log
 
 if [ "$1" = "" ]; then
@@ -35 +40 @@
     tar cvfhz ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tgz mindi-kernel-${MINDI_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
-    sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
+    sed "s/^%define mrel..*RRR/%define mrel ${rev}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     rm -f ${TMP}/mindi-kernel*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
 fi
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
@@ -44 +49 @@
     rm -fr mindi-${MINDI_VER}
     cp -a ${VER}/mindi mindi-${MINDI_VER}
-    svn log -v > mindi-${MINDI_VER}/svn.log
+    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
     find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
     find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
@@ -52 +57 @@
     tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
-    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
+    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     rm -f ${TMP}/mindi-*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
     # ATTENTION: This could be dangerous for your setup
     opt="rm -rf /usr/lib/mindi ;"
@@ -63 +68 @@
     rm -rf mondo-${MONDO_VER}
     cp -a ${VER}/mondo mondo-${MONDO_VER}
-    svn log -v > mondo-${MONDO_VER}/svn.log
+    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
     cd mondo-${MONDO_VER}
     echo "Bootstraping mondo ... "
@@ -73 +78 @@
     tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
-    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
+    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     rm -f ${TMP}/mondo-*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
 fi
 cd ${TOPDIR}/SPECS

trunk/tools/rpm-env

@@ -36 +36 @@
     export ddir="mandriva"
     export dver=`awk '{print $4}' /etc/mandriva-release`
-    export suf="${dver}mdk"
+    export suf=".`echo $dver | sed 's/\.//'`mdk"
 elif [ -e /etc/mandrake-release ]; then
     export ddir="mandrake"
     export dver=`awk '{print $3}' /etc/mandrake-release`
-    export suf="${dver}mdk"
+    export suf=".`echo $dver | sed 's/\.//'`mdk"
 elif [ -e /etc/redhat-release ]; then
     grep -q Enterprise /etc/redhat-release
@@ -49 +49 @@
         export ddir="fedora"
         export dver=`awk '{print $4}' /etc/redhat-release`
-        export suf="fc${dver}"
+        export suf=".fc${dver}"
     else
         export ddir="redhat"
         export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
-        export suf="rh${dver}"
+        export suf=".rh${dver}"
     fi
 elif [ -e /etc/SuSE-release ]; then
@@ -70 +70 @@
 
 if [ _"$suf" = _"" ]; then
-    export suf="${ddir}${dver}"
+    export suf=".${ddir}${dver}"
 fi