summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/ppc/mkINSTALLCD18
-rwxr-xr-xtools/ppc/mkhybrid-1.12b5.4-x86bin0 -> 194471 bytes
2 files changed, 17 insertions, 1 deletions
diff --git a/tools/ppc/mkINSTALLCD b/tools/ppc/mkINSTALLCD
index e7e2d9052..e05ec8b54 100755
--- a/tools/ppc/mkINSTALLCD
+++ b/tools/ppc/mkINSTALLCD
@@ -24,6 +24,22 @@ if [ ! -d $1 ] ; then
exit 1
fi
+# select the appropriate mkhybrid binary depending on if
+# we are on x86 or ppc
+
+ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'`
+
+if [ "$ARCH" == "ppc" ]; then
+ MKHYBRID=mkhybrid-1.12b5.4
+else
+ if [ "$ARCH" == "i386" ]; then
+ MKHYBRID=mkhybrid-1.12b5.4-x86
+ else
+ echo "Sorry, no mkhybrid binary for $ARCH..."
+ exit
+ fi
+fi
+
#Change these when you build the CD..
ApplicationID="Linux-Mandrake"
PublisherID="MandrakeSoft"
@@ -33,7 +49,7 @@ volid=ppc
hfsVolid=Linux-Mandrake
curPwd=`pwd`
-$curPwd/mkhybrid-1.12b5.4 -part -hfs -r -l -J \
+$curPwd/$MKHYBRID -part -hfs -r -l -J \
-A $ApplicationID \
-P $PublisherID \
-p $PreparerID \
diff --git a/tools/ppc/mkhybrid-1.12b5.4-x86 b/tools/ppc/mkhybrid-1.12b5.4-x86
new file mode 100755
index 000000000..fd5b21709
--- /dev/null
+++ b/tools/ppc/mkhybrid-1.12b5.4-x86
Binary files differ