drop (broken) support for Alpha, IA64 & PPC, Sparc

7 files changed, 5 insertions, 41 deletions

diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index f5a402fb1..6c85a1f4d 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -295,7 +295,6 @@ our %l = (
       qw(mousedev usbhid usbmouse synaptics_usb),
     ],
     char => [
-      if_(arch() =~ /ia64/, qw(efivars)),
       qw(applicom n_r3964 nvram pc110pad ppdev),
       qw(wdt_pci i810-tco sx), #- what are these???
     ],
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index 388069d84..3d8d6a2f9 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -52,10 +52,6 @@ static inline long reboot(unsigned int command)
 #include "config-stage1.h"
 #include <linux/cdrom.h>
 
-#if defined(__powerpc__)
-#define TIOCSCTTY     0x540E
-#endif
-
 
 #define BINARY_STAGE2 "/usr/bin/runinstall2"
 
diff --git a/perl-install/fs/get.pm b/perl-install/fs/get.pm
index cbdf093dd..a46a30b09 100644
--- a/perl-install/fs/get.pm
+++ b/perl-install/fs/get.pm
@@ -51,7 +51,7 @@ sub hds {
     (@{$all_hds->{hds}}, @{$all_hds->{lvms}});
 }
 
-#- get all normal partition including special ones as found on sparc.
+#- get all normal partition.
 sub hds_fstab {
     map { partition_table::get_normal_parts($_) } @_;
 }
diff --git a/rescue/NEWS b/rescue/NEWS
index 99beaff86..6b499377a 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,4 +1,5 @@
 - do not run shells uselessly
+- drop (broken) support for Alpha, IA64 & PPC, Sparc
 
 Version 1.53 - 28 September 2015 by Thierry Vignaud
 
diff --git a/rescue/list.xml b/rescue/list.xml
index 1e026812a..2ebbcb70a 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -78,22 +78,11 @@
   quotacheck
   cryptsetup dmsetup
 
-  <if ARCH="ppc">
-    hformat
-  </if>
-
-  <if-not ARCH="ppc">
     fdisk gpart
     testdisk photorec
-  </if-not>
 
-  <if-not ARCH="ppc|sparc">
     sfdisk
-  </if-not>
  
-  <if ARCH="ppc">
-    pdisk 
-  </if>
   dump dump.ext2 restore restore.ext2 dump.ext3 restore.ext3 dump.xfs restore.xfs
   parted partimage partprobe
 
@@ -103,7 +92,7 @@
   mdmon kpartx
   dmevent_tool
   dmeventd
-  <if ARCH="i.86|x86_64|ia64">
+  <if ARCH="i.86|x86_64">
     dmraid
   </if>
 
@@ -130,7 +119,7 @@
   awk clear dialog wc
   setterm
 
-  <if ARCH="i.86|x86_64|ia64">
+  <if ARCH="i.86|x86_64">
     dmidecode 
   </if>
 
@@ -140,14 +129,6 @@
   <if ARCH="x86_64">
     efibootmgr 
   </if>
-  <if ARCH="ppc">
-    ybin
-    mkofboot ofpath
-    nvsetenv
-  </if>
-  <if ARCH="sparc">
-    silo
-  </if>
 </from>
 
 <from>
@@ -170,11 +151,6 @@
     /usr/lib/extipl/aldebaran.bin
   </if>
 
-  <if ARCH="ppc">
-    /usr/lib/yaboot/ofboot
-    /usr/lib/yaboot/yaboot
-  </if>
-
   <from expand="command">
     perl -Mkeyboard -I/usr/lib/libDrakX -le 'print foreach keyboard::loadkeys_files()'
   </from>
diff --git a/tools/Makefile b/tools/Makefile
index 1d9d5d736..c563a03f7 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,7 +1,7 @@
 DIRS	    = serial_probe
 CFLAGS      = -Wall
 
-ARCH := $(shell arch | egrep "(x86_64|sparc64|s390x)")
+ARCH := $(shell arch | egrep "x86_64")
 ifneq ("x$(ARCH)", "x")
 LIB_NAME = lib64
 else
diff --git a/tools/serial_probe/serial.c b/tools/serial_probe/serial.c
index c84cbcff5..eb9d1f1cf 100644
--- a/tools/serial_probe/serial.c
+++ b/tools/serial_probe/serial.c
@@ -918,19 +918,11 @@ struct device *serialProbe(enum deviceClass probeClass, int probeFlags,
 	maj = major(sb.st_rdev);
 	if (maj != 4 && (maj < 136 || maj > 143)) {
 	    if (ioctl (fd, TIOCLINUX, &twelve) < 0) {
-			#ifdef __powerpc__
-			// we could have gotten an error for another reason - like EINVAL
-			// skipping ttyS0 on PPC - which is where most modems reside
-			if (errno == ENOTTY) {
-			#endif
 		if (ioctl (fd, TIOCGSERIAL, &si) >= 0) {
 		    if (si.line > 0) {
 			console = 1 << si.line;
 		    } else {
 			console = 0;
-			#ifdef __powerpc__
-			}
-			#endif 
 		    }
 		} else console = 0;
 	    }