Changeset 318 in MondoRescue

Timestamp:

Jan 14, 2006, 10:45:10 AM (18 years ago)

Author:

bcornec

Message:

• spec files are now under distributions as well
• rpm build process revised accordingly

Location:

branches/2.06

Files:

• mindi/distributions/common (added)
• mindi/distributions/common/mindi.spec (moved) (moved from branches/2.06/mindi/mindi.spec )
• mondo/distributions/common (added)
• mondo/distributions/common/mondo.spec (moved) (moved from branches/2.06/mondo/mondo.spec )
• tools/mkrpm (modified) (6 diffs)
• tools/rpm-env (modified) (2 diffs)

branches/2.06/tools/mkrpm

@@ -31 +31 @@
 if [ "`echo $c | grep mindi-kernel`" != "" ]; then
     cd ${BASE}/svn
-    echo "Management of mindi-kernel ${MINDI_VER}"
+    echo "Management of mindi-kernel ${MINDI_VER}-$rev"
     rm -fr mindi-kernel-${MINDI_VER}
     cp -a ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
@@ -38 +38 @@
     find mindi-kernel-${MINDI_VER} -type f -name '*~' | xargs rm -rf
     mkdir -p ${TOPDIR}/SOURCES 
+
+    echo "Creating mindi-kernel tar files"
     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}
@@ -46 +48 @@
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     cd ${BASE}/svn
-    echo "Management of mindi ${MINDI_VER}"
+    echo "Management of mindi ${MINDI_VER}-$rev"
     rm -fr mindi-${MINDI_VER}
     cp -a ${VER}/mindi mindi-${MINDI_VER}
@@ -53 +55 @@
     find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
     find mindi-${MINDI_VER} -type f -name '*~' | xargs rm -rf
+    if [ -f mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec ]; then
+        specfile=mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec
+    else
+        specfile=mindi-${MINDI_VER}/distributions/common/mindi.spec
+    fi
+    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MINDI_VER}/" $specfile > ${TOPDIR}/SPECS/mindi.spec
+    rm -rf mindi-${MINDI_VER}/distributions
     rm -f mindi-${MINDI_VER}/parted2fdisk mindi-${MINDI_VER}/parted2fdisk.c mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64 
     mkdir -p ${TOPDIR}/SOURCES 
-    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..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
+
+    echo "Creating mindi tar files"
+    tar cfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
+    tar cfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
     rm -f ${TMP}/mindi-*-root
     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
@@ -65 +75 @@
 if [ "`echo $c | grep  mondo`" != "" ]; then
     cd ${BASE}/svn
-    echo "Management of mondo ${MONDO_VER}"
+    echo "Management of mondo ${MONDO_VER}-$rev"
     rm -rf mondo-${MONDO_VER}
     cp -a ${VER}/mondo mondo-${MONDO_VER}
@@ -76 +86 @@
     find . -type f -name '*~' | xargs rm -rf
     cd ..
-    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..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
+    if [ -f mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec ]; then
+        specfile=mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec
+    else
+        specfile=mondo-${MONDO_VER}/distributions/common/mondo.spec
+    fi
+    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MONDO_VER}/" $specfile > ${TOPDIR}/SPECS/mondo.spec
+    rm -rf mondo-${MONDO_VER}/distributions
+
+    echo "Creating mondo tar files"
+    tar cfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
+    tar cfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
     rm -f ${TMP}/mondo-*-root
     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
 fi
 cd ${TOPDIR}/SPECS
+status=0
 if [ "`echo $c | grep kernel`" != "" ]; then
-    rpmbuild -ba mindi-kernel.spec
+    echo "Generating mindi-kernel RPMS"
+    log=/tmp/mindi-kernel-rpm.log
+    rpmbuild -ba mindi-kernel.spec 2> $log 1> $log
+    if [ $? != 0 ]; then 
+        cat $log
+        status=-1
+    fi
 fi
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
-    rpmbuild -ba mindi.spec
+    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
-    rpmbuild -ba mondo.spec
+    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
-su - -c "$opt rpm -Uvh --force $pkg"
+if [ $status = 0 ]; then
+    echo "Installing RPMS as root ($pkg)"
+    su - -c "$opt rpm -Uvh --force $pkg"
+fi

branches/2.06/tools/rpm-env

@@ -20 +20 @@
 export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
 
-mkdir -p ${BASE}/RPMS
 export TMP=${BASE}/tmp
 mkdir -p ${TMP}
@@ -28 +27 @@
     export TOPDIR=${BASE}/RPMS
 fi
+mkdir -p ${TOPDIR}
 cd ${TOPDIR}
 mkdir -p RPMS SRPMS SPECS SOURCES BUILD