Changeset 1236 in MondoRescue for branches/2.2.2/tools

Timestamp:

Mar 12, 2007, 12:23:16 AM (17 years ago)

Author:

Bruno Cornec

Message:

Port from stable important patches for 2.2.2:
mindi-busybox:

• Improve Gentoo packaging

mindi:

• Better messages for analyze-my-lvm
• Add support for newer Qlogic drivers (qla2300 & 2400), mpt, dm and ohci
• Fix a bug in mindi for the FAILSAFE support
• PATH fixed for init in restore (/usr/games added for petris)
• Fiw a bug where restore failing because no archive files are found when -G is used
• /media is now completely excluded as per StandardsCompliance

mondo:

• Handle no compression + verify correctly
• various HOWTO fixes
• Fix temporarily a bug when a biggiefile > 32MB was compressed below the size

of a slice (16MB)

• Better module loading in insmod_crucial_modules
• Improve Gentoo packaging
• Small typo fix for mondorestore man page
• Small memory management improvements
• Store NFS config only once
• Fix a flaw in libmondo-mountlist.c (there since rev [1] !!)
• Increased MAX_STR_LEN to 384 to make it divisible without remainder by eight

for 64 bits platforms

• Fix a bug where no bzip2 format file would be found when supporting gzip
• CentOS fixes

Location:

branches/2.2.2/tools

Files:

• DISTROS (modified) (1 diff)
• build2pkg (modified) (2 diffs)
• distro-env (modified) (3 diffs)
• svn2build (modified) (4 diffs)

branches/2.2.2/tools/DISTROS

@@ -18 +18 @@
 gentoo_1.6
 slackware_10.2
+slackware_11.0

branches/2.2.2/tools/build2pkg

@@ -11 +11 @@
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
-if [ ${prem} == "/" ]; then
+if [ _${prem} = _"/" ]; then
     export TOOLHOME=$dname
 else
@@ -125 +125 @@
         export pkg="$pkg $p-${PVER}.deb"
         # Et voila !
-    elif [  _"$dtype" = _"freebsd" ]; then
+    elif [  _"$dtype" = _"port" ]; then
+        cd $TOPBUILDDIR
+        tar xfz $src
+        cd ${p}-${PVER}
+        mv distributions/${ddir}-$dver/* $TOPBUILDDIR
+        cd ..
+        rm -rf ${p}-${PVER}
+        make DISTDIR=$TOPBUILDDIR
     elif [  _"$dfam" = _"slackware" ]; then
         mkdir -p $TOPBUILDDIR/build-${p}/install

branches/2.2.2/tools/distro-env

@@ -29 +29 @@
         elif grep -q CentOS /etc/redhat-release ; then
             export ddir="centos"
-            export dver=`awk '{print $3}' /etc/redhat-release`
+            export dver=`awk '{print $3}' /etc/redhat-release | cut -d. -f1`
         else
             export ddir="redhat"
@@ -64 +64 @@
             export dver = "sid"
         fi
-    elif [ -e /etc/motd && grep -q FreeBSD /etc/motd ]; then
-        export ddir="freebsd"
-        export dver=`awk '{print $2}' /etc/motd | cut -d- -f1`
+    elif [ -e /etc/motd ]; then
+        head -1 /etc/motd | grep -q FreeBSD
+        if [ $? -eq 0 ]; then
+            export ddir="freebsd"
+            export dver=`head -1 /etc/motd | awk '{print $2}' /etc/motd | cut -d- -f1`
+        else
+            export ddir="unknown"
+            export dver=""
+        fi
     else
         export ddir="unknown"
@@ -148 +154 @@
 elif [ _"$dtype" = _"deb" ]; then
     mkdir -p ${TOPBUILDDIR}
+elif [ _"$dtype" = _"port" ]; then
+    mkdir -p ${TOPBUILDDIR}
 elif [ _"$dfam" = _"slackware" ]; then
     mkdir -p ${TOPBUILDDIR}/install

branches/2.2.2/tools/svn2build

@@ -22 +22 @@
 TAG=`cat ${TOOLHOME}/../mondo/TAG`
 DEST=${TOPDIR}/${VER}-$TAG
+TEST="false"
+OPT=""
 mkdir -p $DEST
 
+if [ "$1" = "--test" ]; then
+    TEST="true"
+    OPT="-r BASE"
+    shift
+fi  
+
 if [ "$1" = "" ]; then
-        c="mondo-doc mindi mindi-busybox mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
@@ -43 +51 @@
     dest="$DEST/$p-$v"
     rm -fr $dest
-    svn export ${TOOLHOME}/../$p $dest
+    svn $OPT export ${TOOLHOME}/../$p $dest
     echo "$REVISION" > $dest/REVISION
     echo "Generating SVN log file ..."
-    svn log -v ${TOOLHOME}/../$p > $dest/svn.log
+    svn $OPT log -v ${TOOLHOME}/../$p > $dest/svn.log
 
     for d in `cat ${TOOLHOME}/DISTROS`; do
@@ -72 +80 @@
                 exit -1
             fi
-            echo "Using $inc customization to build SPEC file"
 
             $TOOLHOME/mkchangelog.pl $dtype $p $MONDOTMP/$p.spec
@@ -148 +155 @@
     echo -n "Creating $p tar files (gzip... "
     tar cfphz ${DEST}/$p-$v.tar.gz $p-$v
-    echo -n " bzip2..."
-    tar cfphj ${DEST}/$p-$v.tar.bz2 $p-$v
+    if [ $TEST = "false" ]; then
+        echo -n " bzip2..."
+        tar cfphj ${DEST}/$p-$v.tar.bz2 $p-$v
+    fi
     echo " )"
+    if [ $TEST = "true" ]; then
+        echo "Use source under $DEST/$p-$v"
+    fi
 done