summaryrefslogtreecommitdiffstats
path: root/docs/SHORTCUTS
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-12-04 13:14:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-12-04 13:14:10 +0000
commit9538943bc4bc4f12c1514861d496251e73536e6b (patch)
tree71c4658e68fdf18e90d025c75798b5f0e2daf572 /docs/SHORTCUTS
parent4c837c40349610414a1d46bd8442eb8f441c8c10 (diff)
downloaddrakx-backup-do-not-use-9538943bc4bc4f12c1514861d496251e73536e6b.tar
drakx-backup-do-not-use-9538943bc4bc4f12c1514861d496251e73536e6b.tar.gz
drakx-backup-do-not-use-9538943bc4bc4f12c1514861d496251e73536e6b.tar.bz2
drakx-backup-do-not-use-9538943bc4bc4f12c1514861d496251e73536e6b.tar.xz
drakx-backup-do-not-use-9538943bc4bc4f12c1514861d496251e73536e6b.zip
use Options "IgnoreEDID" when using the proprietary X driver "nvidia"
Diffstat (limited to 'docs/SHORTCUTS')
0 files changed, 0 insertions, 0 deletions
k&id=c1e639b4475547214b506a76bd1aa101ec88aff5'>tools/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