Changeset 551 in MondoRescue for branches/stable/tools/svn2build

Timestamp:

May 16, 2006, 1:37:07 AM (18 years ago)

Author:

bcornec

Message:

mondo-doc & mindi-kernel structure updated for build management

File:

• branches/stable/tools/svn2build (modified) (7 diffs)

branches/stable/tools/svn2build

@@ -44 +44 @@
 
     for d in `cat ${TOOLHOME}/DISTROS`; do
-        ddir=`echo $d | cut -f'_' -d1`
-        dver=`echo $d | cut -f'_' -d2`
+        ddir=`echo $d | cut -d_ -f1`
+        dver=`echo $d | cut -d_ -f2`
         echo "Generating build files for $ddir ($dver)"
         if [ $ddir = "debian" ]; then
@@ -62 +62 @@
             suf=".${dfam}${dver}"
             BUILDDIR=${TOPDIR}/slack 
-        elif [ $ddir = "sles" || $ddir = "suse" ]; then
+        elif [ $ddir = "sles" -o $ddir = "suse" ]; then
             dfam="suse"
             dtype="rpm"
             suf=".${ddir}${dver}"
             BUILDDIR=${TOPDIR}/SPECS 
-        elif [ $ddir = "fedora" || $ddir = "redhat" || $ddir = "rhel" ]; then
+        elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" ]; then
             dfam="redhat"
             dtype="rpm"
@@ -79 +79 @@
             fi
             BUILDDIR=${TOPDIR}/SPECS 
-        elif [ $ddir = "mandrake" || $ddir = "mandriva" ]; then
+        elif [ $ddir = "mandrake" -o $ddir = "mandriva" ]; then
             dfam="mandriva"
             dtype="rpm"
@@ -94 +94 @@
         mkdir -p ${BUILDDIR}
 
+        ddd=`LANG=C ; date '+%Y-%m-%d'`
+        cat > /tmp/mondorescue.mc << EOF
+define(\`RRR', ${TAG}${suf})dnl
+define(\`VVV', ${v})dnl
+define(\`DDD', ${ddd})dnl
+EOF
+
+        mkdir -p $p-$v/distributions/$ddir
         if [ $dtype = "rpm" ]; then
             if [ -f $p-$v/distributions/$ddir/spec.m4 ]; then
@@ -103 +111 @@
                 exit -1
             fi
-            cp $inc /tmp/mondorescue.mc
-            ddd=`LANG=C ; date '+%Y-%m-%d'`
-            cat >> /tmp/mondorescue.mc << EOF
-define(\`RRR', ${TAG}${suf})dnl
-define(\`VVV', ${v})dnl
-define(\`DDD', ${ddd})dnl
-EOF
             echo "Using $inc customization to build SPEC file"
-            m4 /tmp/mondorescue.mc $p-$v/distributions/rpm/$p.spec > $p-$v/distributions/$ddir/$p.spec
+            m4 /tmp/mondorescue.mc $inc $p-$v/distributions/rpm/$p.spec > $p-$v/distributions/$ddir/$p.spec
 
             if [ -f $p-$v/distributions/$ddir/changelog ]; then
@@ -134 +135 @@
 
         elif [ $dtype = "ebuild" ]; then
-            echo "Gentoo Buid"
+            echo "Gentoo Build"
         else
-            echo "Unknown Buid"
+            echo "Unknown Build"
         fi
     done
@@ -178 +179 @@
     # Finally creates the tar files
     echo "Creating $p tar files"
-    tar cfhz ${TOPDIR}/SOURCES/$p-$v-$TAG.tgz $p-$v
-    tar cfhj ${TOPDIR}/SOURCES/$p-$v-$TAG.tar.bz2 $p-$v
+    tar cfhz ${TOPDIR}/SOURCES/$p-$v-$TAG.tar.gz $p-$v
+    gzip -cd ${TOPDIR}/SOURCES/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${TOPDIR}/SOURCES/$p-$v-$TAG.tar.bz2
+    #tar cfhj ${TOPDIR}/SOURCES/$p-$v-$TAG.tar.bz2 $p-$v
 done