Ia64 adaptation

8 files changed, 92 insertions, 5 deletions

diff --git a/perl-install/common.pm b/perl-install/common.pm
index 9ed9012ff..6c5cddd85 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -671,7 +671,7 @@ sub df {
     my ($blocksize, $size, $free);
     my $buf = ' ' x 20000;
     syscall_('statfs', $mntpoint, $buf) or return;
-    (undef, $blocksize, $size, $free, undef, undef) = unpack "L6", $buf;
+    (undef, $blocksize, $size, $free, undef, undef) = unpack "L!6", $buf;
     map { $_ * ($blocksize / 1024) } $size, $free;
 }
 
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 378e66b6b..4b247a81b 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -217,6 +217,83 @@ sub createXconf {
     symlink("/tmp/stage2/etc/imrc", "/etc/imrc");
     symlink("/tmp/stage2/etc/im_palette.pal", "etc/im_palette.pal");
 
+if (arch() =~ /^ia64/) {
+     require Xconfigurator;
+     my ($card) = Xconfigurator::cardConfigurationAuto();
+     Xconfigurator::updateCardAccordingName($card, $card->{type}) if $card && $card->{type};
+    local *F;
+    open F, ">$file" or die "can't create X configuration file $file";
+    print F <<END;
+
+Section "Files"
+   FontPath   "/usr/X11R6/lib/X11/fonts:unscaled"
+EndSection
+
+Section "InputDevice"
+    Identifier "Keyboard1"
+    Driver      "Keyboard"
+    Option "AutoRepeat"  "250 30"
+    Option "XkbDisable"
+
+    Option "XkbRules" "xfree86"
+    Option "XkbModel" "pc105"
+    Option "XkbLayout" ""
+EndSection
+
+Section "InputDevice"
+    Identifier  "Mouse1"
+    Driver      "mouse"
+    Option "Protocol"    "$mouse_type"
+    Option "Device"      "/dev/mouse"
+EndSection
+
+Section "Monitor"
+    Identifier "Generic|High Frequency SVGA, 1024x768 at 70 Hz"
+    VendorName "Unknown"
+    ModelName  "Unknown"
+    HorizSync  31.5-35.5
+    VertRefresh 50-70
+EndSection
+
+Section "Device"
+    Identifier "Generic VGA"
+    Driver     "vga"
+EndSection
+
+Section "Device"
+    Identifier  "device1"
+    VendorName  "Unknown"
+    BoardName   "Unknown"
+    Driver      "$card->{driver}"
+EndSection
+
+Section "Screen"
+    Identifier "screen1"
+    Device      "device1"
+    Monitor     "Generic|High Frequency SVGA, 1024x768 at 70 Hz"
+    DefaultColorDepth 16
+    Subsection "Display"
+        Depth       16
+        Modes       "800x600" "640x480"
+        ViewPort    0 0
+    EndSubsection
+EndSection
+
+Section "ServerLayout"
+    Identifier "layout1"
+    Screen     "screen1"
+    InputDevice "Mouse1" "CorePointer"
+    InputDevice "Keyboard1" "CoreKeyboard"
+EndSection
+
+END
+
+
+}
+else
+  {
+
+
     my $wacom;
     if ($wacom_dev) {
 	$wacom_dev = devices::make($wacom_dev);
@@ -354,6 +431,7 @@ Section "Screen"
 EndSection
 END
 }
+}
 #-   ModeLine "640x480"     28     640  672  768  800   480  490  492  525
 
 
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 24c53f906..6ba50d875 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -74,6 +74,8 @@ sub new($$) {
 		if (/Mach64/) { @servers = qw(Mach64) }
 		elsif (/Permedia2/) { @servers = qw(3DLabs) }
 		else { @servers = qw(Xsun24) }
+	    } elsif (arch() =~ /ia64/) {
+		@servers= 'XFree86';
 	    } elsif (arch() eq "ppc") {
 	    	@servers = qw(Xpmac);
             }
@@ -81,7 +83,7 @@ sub new($$) {
 	    foreach (@servers) {
 		log::l("Trying with server $_");
 		my $dir = "/usr/X11R6/bin";
-		my $prog = /Xsun|Xpmac/ ? $_ : "XF86_$_";
+		my $prog = /Xsun|Xpmac|XFree86/ ? $_ : "XF86_$_";
 		unless (-x "$dir/$prog") {
 		    unlink $_ foreach glob_("$dir/X*");
 		    install_any::getAndSaveFile("Mandrake/mdkinst$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!";
diff --git a/perl-install/share/list b/perl-install/share/list
index f9973306c..5e55ba71d 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -12,10 +12,7 @@
 /sbin/badblocks
 /sbin/fdisk
 /sbin/insmod
-/sbin/mkraid
-/sbin/mkreiserfs
 /sbin/mke2fs
-/sbin/raidstart
 /sbin/resize2fs
 /sbin/dumpe2fs
 /sbin/modinfo
diff --git a/perl-install/share/list.alpha b/perl-install/share/list.alpha
index 860cd1e27..7ce1a1fee 100644
--- a/perl-install/share/list.alpha
+++ b/perl-install/share/list.alpha
@@ -1,3 +1,6 @@
+/sbin/mkraid
+/sbin/mkreiserfs
+/sbin/raidstart
 /sbin/ifport
 /sbin/mkdosfs
 /usr/X11R6/bin/XF86_FBDev
diff --git a/perl-install/share/list.i386 b/perl-install/share/list.i386
index 9575f3896..9c36d79a0 100644
--- a/perl-install/share/list.i386
+++ b/perl-install/share/list.i386
@@ -1,3 +1,6 @@
+/sbin/mkraid
+/sbin/mkreiserfs
+/sbin/raidstart
 /sbin/ifport
 /sbin/mkdosfs
 /sbin/resize_reiserfs
diff --git a/perl-install/share/list.ppc b/perl-install/share/list.ppc
index fd74a05f6..86441c399 100644
--- a/perl-install/share/list.ppc
+++ b/perl-install/share/list.ppc
@@ -1,3 +1,6 @@
+/sbin/mkraid
+/sbin/mkreiserfs
+/sbin/raidstart
 /usr/bin/hformat
 /usr/bin/hmount
 /usr/bin/humount
diff --git a/perl-install/share/list.sparc b/perl-install/share/list.sparc
index da9f7ba52..b597a10ce 100644
--- a/perl-install/share/list.sparc
+++ b/perl-install/share/list.sparc
@@ -4,6 +4,7 @@
 /lib/libnss_dns.so.2
 /lib/libresolv.so.2
 /etc/protocols
+/sbin/mkreiserfs
 /sbin/fdisk
 /sbin/ifport
 /sbin/insmod