Changeset 306 in MondoRescue

Timestamp:

Jan 12, 2006, 7:12:27 PM (18 years ago)

Author:

bcornec

Message:

mindi now support x86_64 installation under /usr/lib64

File:

• branches/2.06/mindi/install.sh (modified) (4 diffs)

branches/2.06/mindi/install.sh

@@ -34 +34 @@
 MANDIR=$local/share/man/man8
 
+ARCH=`/bin/arch`
+echo $ARCH | grep -x "i[0-9]86" &> /dev/null && ARCH=i386 && locallib=$local/lib
+# For the moment, we don't build specific x86_64 busybox binaries
+echo $ARCH | grep -x "x86_64" &> /dev/null && ARCH=i386 && locallib=$local/lib64
+export ARCH
+
 echo "Creating target directories ..."
-install -m 755 -d $conf $local/lib/mindi $MANDIR $local/sbin $DOCDIR
+install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $DOCDIR
 
 echo "Copying files ..."
-install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $local/lib/mindi
+install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
 install -m 644 deplist.txt $conf
 
-cp -af rootfs aux-tools Mindi $local/lib/mindi
-chmod 755 $local/lib/mindi/rootfs/bin/*
-chmod 755 $local/lib/mindi/rootfs/sbin/*
-chmod 755 $local/lib/mindi/aux-tools/sbin/*
+cp -af rootfs aux-tools Mindi $locallib/mindi
+chmod 755 $locallib/mindi/rootfs/bin/*
+chmod 755 $locallib/mindi/rootfs/sbin/*
+chmod 755 $locallib/mindi/aux-tools/sbin/*
 
 if [ "$RPMBUILDMINDI" = "true" ]; then
@@ -57 +63 @@
 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
 
-ARCH=`/bin/arch`
-echo $ARCH | grep -x "i[0-9]86" &> /dev/null && ARCH=i386
-# For the moment, we don't build specific x86_64 busybox binaries
-echo $ARCH | grep -x "x86_64" &> /dev/null && ARCH=i386
-export ARCH
-
 # Managing busybox
-if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH ]; then
+if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH ]; then
         echo "Installing busybox ..."
-        install -s -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH $local/lib/mindi/rootfs/bin/busybox
+        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH $locallib/mindi/rootfs/bin/busybox
 else
         echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
 fi
 if [ "$ARCH" = "i386" ] ; then
-    if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
+    if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
         echo "Installing busybox.net ..."
-        install -s -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH.net $local/lib/mindi/rootfs/bin/busybox.net
+        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH.net $locallib/mindi/rootfs/bin/busybox.net
     else
         echo "WARNING: no busybox.net found, mindi will not work on this arch ($ARCH) with network"
@@ -79 +79 @@
 fi
 # Remove left busybox
-rm -f $local/lib/mindi/rootfs/bin/busybox-*
+rm -f $locallib/mindi/rootfs/bin/busybox-*
 
 # Managing parted2fdisk
 if [ "$ARCH" = "ia64" ] ; then
     (cd $local/sbin && ln -sf parted2fdisk.pl parted2fdisk)
-    make -f Makefile.parted2fdisk DEST=$local/lib/mindi install
-    if [ -f $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then
+    make -f Makefile.parted2fdisk DEST=$locallib/mindi install
+    if [ -f $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then
         echo "Installing parted2fdisk ..."
-        install -s -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/lib/mindi/rootfs/sbin/parted2fdisk
-        install -s -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
+        install -s -m 755 $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH $locallib/mindi/rootfs/sbin/parted2fdisk
+        install -s -m 755 $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
     else
         echo "WARNING: no parted2fdisk found, mindi will not work on this arch ($ARCH)"
@@ -96 +96 @@
     (cd $local/sbin && ln -sf /sbin/fdisk parted2fdisk)
     echo "Symlinking fdisk to parted2fdisk"
-    ( cd $local/lib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
+    ( cd $locallib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
 fi
 # Remove left parted2fdisk
-rm -f $local/lib/mindi/rootfs/sbin/parted2fdisk-*
+rm -f $locallib/mindi/rootfs/sbin/parted2fdisk-*
 
 if [ "$RPMBUILDMINDI" != "true" ]; then
-    chown -R root:root $local/lib/mindi $conf $DOCDIR
+    chown -R root:root $locallib/mindi $conf $DOCDIR
     chown root:root $local/sbin/mindi $MANDIR/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl 
     if [ "$ARCH" = "ia64" ] ; then