Changeset 537 in MondoRescue for trunk/tools/mkrpm

Timestamp:

May 12, 2006, 2:04:55 AM (18 years ago)

Author:

bcornec

Message:

merge -r 526:534 $SVN_M/branches/stable

File:

• trunk/tools/mkrpm (modified) (3 diffs)

trunk/tools/mkrpm

@@ -18 +18 @@
 
 if [ "$1" = "" ]; then
-    c="mindi mondo"
+    c="mondo-doc mindi mondo"
 else
-    c=$1
+    if [ "$1" = "all" ]; then
+        c="mindi-kernel mondo-doc mindi mondo"
+    else
+        c=$1
+    fi
 fi
 
@@ -48 +52 @@
     opt="rm -rf /usr/lib/mindi ;"
 fi
-if [ "`echo $c | grep  mondo`" != "" ]; then
+if [ "`echo $c | grep mondo-doc`" != "" ]; then
+    cd ${BASE}/svn
+    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo-doc.spec > ${TOPDIR}/SPECS/mondo-doc.spec
+    cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo-doc.spec
+    chmod 644 ${TOPDIR}/SPECS/mondo-doc.spec
+
+    pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg="$pkg $pkg1"
+    rm -f $pkg1
+fi
+
+if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
     cd ${BASE}/svn
     $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
@@ -62 +77 @@
 cd ${TOPDIR}/SPECS
 status=0
-if [ "`echo $c | grep kernel`" != "" ]; then
-    echo "Generating mindi-kernel RPMS"
-    log=/tmp/mindi-kernel-rpm.log
-    rpmbuild -ba mindi-kernel.spec 2> $log 1> $log
+
+for p in $c; do
+    echo "Generating $p RPMS"
+    log=/tmp/$p-rpm.log
+    rpmbuild -ba $p.spec 2> $log 1> $log
     if [ $? != 0 ]; then 
         cat $log
         status=-1
     fi
-fi
-if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
-    echo "Generating mindi RPMS"
-    log=/tmp/mindi-rpm.log
-    rpmbuild -ba mindi.spec 2> $log 1> $log
-    if [ $? != 0 ]; then
-        cat $log
-        status=-1
-    fi
-fi
-if [ "`echo $c | grep mondo`" != "" ]; then
-    echo "Generating mondo RPMS"
-    log=/tmp/mondo-rpm.log
-    rpmbuild -ba mondo.spec 2> $log 1> $log
-    if [ $? != 0 ]; then 
-        cat $log
-        status=-1
-    fi
-fi
+done
 if [ $status = 0 ]; then
     echo "Installing RPMS as root ($pkg)"