Changeset 1474 in MondoRescue

Timestamp:

May 31, 2007, 10:10:22 AM (18 years ago)

Author:

Bruno Cornec

Message:

Ubuntu support added for build process

Location:

branches/stable/tools

Files:

• DISTROS (modified) (1 diff)
• distro-env (modified) (2 diffs)
• mkqemu (modified) (1 diff)
• qemu-vm.txt (modified) (1 diff)
• svn2build (modified) (1 diff)

branches/stable/tools/DISTROS

@@ -19 +19 @@
 debian_3.1
 debian_4.0
+ubuntu_7.04
 gentoo_1.6
 slackware_10.2

branches/stable/tools/distro-env

@@ -64 +64 @@
             export dver = "sid"
         fi
+        if [ -e /etc/lsb-release ]; then
+            grep -qi ubuntu /etc/lsb-release
+            if  [ $? -eq 0 ]; then
+                export ddir="ubuntu"
+                export dver=`cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2`
+            fi
+        fi
     elif [ -e /etc/motd ]; then
         head -1 /etc/motd | grep -q FreeBSD
@@ -82 +89 @@
 # Generate all other parameters
 #
-if [ $ddir = "debian" ]; then
+if [ $ddir = "debian" -o $ddir = "ubuntu" ]; then
     dfam="debian"
     dtype="deb"
-    suf=".${dfam}${dver}"
+    suf=".${ddir}${dver}"
 elif [ $ddir = "gentoo" ]; then
     dfam="gentoo"

branches/stable/tools/mkqemu

@@ -27 +27 @@
 if [ _"$QEMUAPP" != _"" ]; then
     $qemucmd -m 256 $QEMUOPT -append "$QEMUAPP" -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu
+    exit 0
+fi
+
+echo $m | grep -q '_64$'
+if [ $? -ne 0 ]; then
+     qemucmd=$qemucmd32
 else
-    $qemucmd -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu
+     qemucmd="$qemucmd64 -no-kqemu"
 fi
+$qemucmd -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu
 ) 2>&1 | tee /tmp/mkqemu.log

branches/stable/tools/qemu-vm.txt

@@ -19 +19 @@
 # Slackware
 # Cf: http://www.linuxpackages.net/howto.php?page=package&title=Package+Howto
+#
+# Ubuntu
+apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev
 
 #Changing CD during install:

branches/stable/tools/svn2build

@@ -104 +104 @@
             m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/Makefile > $dest/distributions/${ddir}-$dver/Makefile
         elif [ "$dtype" = "deb" ]; then
-            cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
-            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
+            if [ -f $dest/distributions/$ddir/rules ]; then
+                cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
+                inc=$dest/distributions/$ddir/rules
+            elif [ -f $dest/distributions/$dfam/rules ]; then
+                cp -a $dest/distributions/$dfam/* $dest/distributions/${ddir}-$dver
+                inc=$dest/distributions/$dfam/rules
+            else
+                echo "Unable to build the .deb build files for this distro. Please report to authors"
+                exit -1
+            fi
+            m4 $MONDOTMP/mondorescue.mc $inc > $dest/distributions/${ddir}-$dver/rules
             $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
             if [ $? -ne 0 ]; then