Context Navigation

Changeset 839 in MondoRescue for trunk/mindi

Timestamp:

Sep 26, 2006, 9:47:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r814:838 $SVN_M/branches/stable

Location:

trunk/mindi

Files:

-              r764
+              r839
 MINDI CHANGES
+.2.0 (2006-09-25)
+- busybox is now a separate package and binaries are not provided anymore in mindi (Bruno Cornec)
 .0.9 (2006-08-05)

-              r137
+              r839
 Mindi uses the busybox (http://busybox.net) project to create the boot environement used during restore.
+If you want to modify the busybox support, you have to:
+/ Get busybox sources and extract them
+/ Copy as a base the .config file from the mindi directory under the name .config in this source directory.
+files are proposed:
+   .config-busybox-i386.net : Configure busybox for Network support (NFS, PXE)
+   .config-busybox-i386     : Configure busybox for Normal support (CDs, DVD, Tapes)
+   .config-busybox-ia64     : Configure busybox for Normal and Network support on ia64/Itanium
+/ Reconfigure busybox (make menuconfig)
+/ Rebuild the new busybox (make busybox)
+/ copy the new busybox binary from that directory to rootfs/bin under the mindi source tree
+files are proposed:
+   busybox-i386.net : busybox with Network support (NFS, PXE)
+   busybox-i386     : busybox with Normal support (CDs, DVD, Tapes)
+   busybox-ia64     : busybox with Normal and Network support on ia64/Itanium
+/ Relaunch mindi or mondoarchive if you use it.
+The best manner to use it is to also install our mindi-busybox package/tar file with your mindi installation.
+If you rather want to install your distribution busybox, you'll have to check it supports all the required function our is providing, that it's place under /usr/lib/mindi/rootfs/bin/busybox and that ll required links are created.

-              r729
+              r839
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
+Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools DDD
+ExcludeArch: ppc
+Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, busybox DDD
 OBS
 # Not on all systems

-              r649
+              r839
 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
+echo $ARCH | grep -x "x86_64" &> /dev/null && locallib=$local/lib64
 echo $ARCH | grep -x "ia64" &> /dev/null && locallib=$local/lib
 export ARCH
 …
 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
+# Managing busybox
+if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH ]; then
+        echo "Installing busybox ..."
+        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH $locallib/mindi/rootfs/bin/busybox
+else
+if [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
         echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
 fi
-if [ "$ARCH" = "i386" ] ; then
-    if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
-        echo "Installing 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"
-    fi
-fi
-# Remove left busybox
-rm -f $locallib/mindi/rootfs/bin/busybox-*
 # Managing parted2fdisk

-              r808
+              r839
         # For PXE boot
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
-        # Here we need the net busybox
-        mv $mountpoint/bin/busybox.net $mountpoint/bin/busybox
-    else
-        rm -f $mountpoint/bin/busybox.net
     fi
     [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"

Note: See TracChangeset for help on using the changeset viewer.