Changeset 939 in MondoRescue

Timestamp:

Nov 17, 2006, 1:41:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r931:938 $SVN_M/branches/stable

Location:

trunk/mindi

Files:

• distributions/debian/rules (modified) (1 diff)
• distributions/gentoo/mindi.ebuild (modified) (1 diff)
• distributions/rpm/mindi.spec (modified) (2 diffs)
• install.sh (modified) (4 diffs)
• mindi (modified) (4 diffs)

trunk/mindi/distributions/debian/rules

@@ -26 +26 @@
     dh_installdirs
     # Build the installation tree:
-    ( export RPMBUILDMINDI=true && export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
+    ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export PREFIX=/usr && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
 
 # Build architecture-independent files here.

trunk/mindi/distributions/gentoo/mindi.ebuild

@@ -26 +26 @@
 
 src_install() {
-    export PREFIX="${D}/usr"
-    export CONFDIR="${D}/etc"
+    export HEAD="${D}"
+    export PREFIX="/usr"
+    export CONFDIR="/etc"
+    export MANDIR="${PREFIX}/share/man"
+    export DOCDIR="${PREFIX}/share/doc"
+    export LIBDIR="${PREFIX}/lib"
     export DONT_RELINK=1
     export RPMBUILDMINDI="true"

trunk/mindi/distributions/rpm/mindi.spec

@@ -36 +36 @@
 export DONT_RELINK=1
 
-export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
-export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
+export HEAD=${RPM_BUILD_ROOT}
+export PREFIX=%{_exec_prefix}
+# Bug on x86_64 on _sysconfdir on rhel4 at least
+%ifarch x86_64
+export CONFDIR=/etc
+%else
+export CONFDIR=%{_sysconfdir}
+%endif
+export MANDIR=%{_mandir}
+export DOCDIR=%{_docdir}
+export LIBDIR=%{_libdir}
 export RPMBUILDMINDI="true"
 
@@ -44 +53 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
-
-%post
-if [ -f /usr/local/sbin/mindi ]; then
-    echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"
-fi
 
 %files

trunk/mindi/install.sh

@@ -10 +10 @@
 
 if [ "_$PREFIX" != "_" ]; then
-    local=$PREFIX
+    local=${HEAD}$PREFIX
+    sublocal=$PREFIX
     if [ -f /usr/local/sbin/mindi ]; then
-        echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove it !"
+        echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual installation !"
     fi
-    conf=$CONFDIR/mindi
+    if [ "_$CONFDIR" != "_" ]; then
+        conf=${HEAD}$CONFDIR/mindi
+        subconf=$CONFDIR/mindi
+    else
+        echo "CONFDIR should be defined if PREFIX is defined"
+        exit -1
+    fi
     echo $PATH | grep /usr/sbin > /dev/null || echo "Warning - your PATH environmental variable is BROKEN. Please add /usr/sbin to your PATH."
 else
     local=/usr/local
+    sublocal=$local
     if [ -f /usr/sbin/mindi ]; then
         echo "WARNING: /usr/sbin/mindi exists. You should probably remove the mindi package !"
     fi
     conf=$local/etc/mindi
+    subconf=$conf
     echo $PATH | grep $local/sbin > /dev/null || echo "Warning - your PATH environmental variable is BROKEN. Please add $local/sbin to your PATH."
 fi
@@ -27 +36 @@
 if uname -a | grep Knoppix > /dev/null || [ -e "/ramdisk/usr" ] ; then
     local=/ramdisk/usr
+    sublocal=$local
+    conf=/ramdisk/etc
+    subconf=$conf
     export PATH=/ramdisk/usr/sbin:/ramdisk/usr/bin:/$PATH
 fi
@@ -34 +46 @@
 echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
 
-DOCDIR=$local/share/doc/mindi-$MINDIVER
-MANDIR=$local/share/man/man8
-
-ARCH=`/bin/arch`
-echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
-echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
-echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
-export ARCH
+if [ _"$MANDIR" == _"" ]; then
+    MANDIR=$local/share/man/man8
+else
+    MANDIR=${HEAD}$MANDIR/man8
+fi
+if [ _"$DOCDIR" == _"" ]; then
+    DOCDIR=$local/share/doc/mindi-$MINDIVER
+else
+    DOCDIR=${HEAD}$DOCDIR/mindi-$MINDIVER
+fi
+if [ _"$LIBDIR" == _"" ]; then
+    ARCH=`/bin/arch`
+    echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
+    echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
+    echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
+    sublocallib="$locallib/mindi"
+else
+    locallib=${HEAD}$LIBDIR
+    sublocallib="$LIBDIR/mindi"
+fi
 
 echo "Creating target directories ..."
@@ -72 +96 @@
 perl -pi -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~ ; s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" $locallib/mindi/rootfs/sbin/init
 
-# Substirute variables for mindi
-if [ "$RPMBUILDMINDI" = "true" ]; then
-    sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=/usr~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=/etc/mindi~" -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~" -e "s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" mindi > $local/sbin/mindi
-else
-    sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$local~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$conf~" -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~" -e "s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" mindi > $local/sbin/mindi
-fi
+# Substitute variables for mindi
+sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~" -e "s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" mindi > $local/sbin/mindi
 chmod 755 $local/sbin/mindi
 install -m 755 parted2fdisk.pl $local/sbin

trunk/mindi/mindi

@@ -33 +33 @@
 MINDI_CONF=YYY
 MINDI_SBIN=${MINDI_PREFIX}/sbin
-
-if [ "$ARCH" = "x86_64" ] ; then
-    MINDI_LIB=${MINDI_PREFIX}/lib64/mindi
-else
-    MINDI_LIB=${MINDI_PREFIX}/lib/mindi
-fi
+MINDI_LIB=LLL
 
 MINDI_CONFIG_DIST="$MINDI_CONF/mindi.conf.dist"
@@ -525 +520 @@
         ln -sf $vanilla_lib_name $outdir$optimized_lib_name
         echo "Excluding $optimized_lib_name" >> $LOGFILE
-        grep -Fvx "$optimized_lib_name $filelist" > $filelist.tmp
+        grep -Fvx "$optimized_lib_name" "$filelist" > $filelist.tmp
         echo "Replacing it with $vanilla_lib_name" >> $LOGFILE
         echo "$vanilla_lib_name" >> $filelist.tmp
@@ -2787 +2782 @@
     elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
         MONDOTMP=$2
-        BIDON=$3
+        CACHE_LOC=$3
+        if [ _"$CACHE_LOC" != _"" ]; then
+            mkdir -p $CACHE_LOC
+        fi
         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
 ###
@@ -2846 +2844 @@
         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
         MONDO_ROOT=`echo $CACHEDIR | sed 's/\(.*\)\/.*/\1/'`
-        [ "$MONDO_ROOT" = "" ] && Die "MONDO_ROOT is undefined"
+        if [ _"$MONDO_ROOT" != _"" ]; then
+            mkdir -p $MONDO_ROOT
+        else
+            Die "MONDO_ROOT is undefined"
+        fi
     else
         echo "Syntax: mindi (--custom ....)" >> /dev/stderr