summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm6
-rw-r--r--perl-install/install/share/list.xml19
-rw-r--r--perl-install/install/steps.pm4
-rw-r--r--perl-install/install/steps_gtk.pm7
-rw-r--r--perl-install/install/steps_interactive.pm36
6 files changed, 8 insertions, 65 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 60ee77fe9..f4e72aaae 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- add some POD documentation
- do not unavailable kernel-xbox
+- drop (broken) support for Alpha, PPC, Sparc & IA64
Version 16.29 - 3 May 2014
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index c0dcb86af..09f55f200 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -859,9 +859,6 @@ sub getAndSaveAutoInstallFloppies {
eval { modules::load('loop') };
- if (arch() =~ /ia64/) {
- #- nothing yet
- } else {
my $mountdir = "$::prefix/root/aif-mount"; -d $mountdir or mkdir $mountdir, 0755;
my $param = 'kickstart=floppy ' . generate_automatic_stage1_params($o);
@@ -904,7 +901,6 @@ sub getAndSaveAutoInstallFloppies {
}
rmdir $mountdir;
$img;
- }
}
@@ -934,7 +930,7 @@ sub loadO {
my $o;
foreach (removable_media__early_in_install()) {
my $dev = devices::make($_->{device});
- foreach my $fs (arch() =~ /sparc/ ? 'romfs' : ('ext2', 'vfat')) {
+ foreach my $fs (qw(ext2 vfat)) {
eval { fs::mount::mount($dev, '/mnt', $fs, 'readonly'); 1 } or next;
if (my $abs_f = find { -e $_ } "/mnt/$f", "/mnt/$f.pl") {
$o = loadO_($O, $abs_f);
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 359078df1..4bd9a92be 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -4,12 +4,7 @@
ash dash.static echo
aria2c cp curl md5sum <!-- needed by urpmi -->
cpio gzip bzip2
- <if-not ARCH="ppc">
fdisk
- </if-not>
- <if ARCH="ppc">
- pdisk
- </if>
insmod modinfo rmmod modprobe lsmod
losetup
lvm2 mdadm mdmon
@@ -31,7 +26,7 @@
tty stty <!-- needed for text mode installer (through unicode_start) -->
- <if ARCH="i.86|x86_64|ia64">
+ <if ARCH="i.86|x86_64">
mkdosfs
dosfslabel
mlabel
@@ -61,18 +56,13 @@
unicode_start
</filter>
- <if ARCH="i.86|x86_64|ia64">
+ <if ARCH="i.86|x86_64">
dmidecode
</if>
<if ARCH="ia64">
efibootmgr
</if>
- <if ARCH="ppc">
- hattrib hcopy hcd
- hformat hmount humount
- </if>
-
<if set="DEBUG_INSTALL">
strace bash less ps top gdb busybox
</if>
@@ -463,11 +453,6 @@
ARCH-linux-thread-multi/Scalar/Util.pm
ARCH-linux-thread-multi/Socket.pm
ARCH-linux-thread-multi/Time/HiRes.pm
- <if ARCH="ia64">
- ARCH-linux-thread-multi/asm-i386/unistd.ph
- ARCH-linux-thread-multi/asm-x86_64/unistd.ph
- ARCH-linux-thread-multi/asm/break.ph
- </if>
<if ARCH="i.86|x86_64">
ARCH-linux-thread-multi/asm/unistd_32.ph
ARCH-linux-thread-multi/asm/unistd_64.ph
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index f51d50729..7a75fb530 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -460,7 +460,7 @@ Either your cdrom drive or your cdrom is defective.
Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"
") if any { m|read failed: Input/output error| } cat_("$::prefix/root/drakx/install.log");
- if (arch() !~ /^sparc/ && !$o->{justdb}) { #- TODO restore it as may be needed for sparc
+ if (!$o->{justdb}) {
-x "$::prefix/usr/bin/dumpkeys" or $::testing or die
"Some important packages did not get installed properly.
@@ -847,7 +847,7 @@ sub exitInstall {
};
output("$::prefix/root/drakx/package_list.pl", install::any::selected_leaves_pl($o));
- eval { install::any::getAndSaveAutoInstallFloppies($o, 1) } if arch() !~ /^ppc/;
+ eval { install::any::getAndSaveAutoInstallFloppies($o, 1) };
eval { output "$::prefix/root/drakx/README", sprintf("This directory contains several installation-related files,
mostly log files (very useful if you ever report a bug!).
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 21f071adb..b354feadf 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -88,7 +88,7 @@ sub _setup_and_start_X {
foreach (@servers) {
log::l("Trying with server $_");
- my ($prog, $Driver) = /Driver:(.*)/ ? ('Xorg', $1) : /Xsun|Xnest|^X_move$/ ? $_ : "XF86_$_";
+ my ($prog, $Driver) = /Driver:(.*)/ ? ('Xorg', $1) : /Xnest|^X_move$/ ? $_ : "XF86_$_";
if (/FB/i) {
!$o->{vga16} && $o->{allowFB} or next;
@@ -113,12 +113,9 @@ sub _launchX {
} else {
install::gtk::createXconf($f, @{$o->{mouse}}{'Protocol', 'device'}, $o->{mouse}{wacom}[0], $Driver);
- push @options, '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/;
+ push @options, '-allowMouseOpenFail', '-xf86config', $f;
push @options, 'vt7', '-dpi', '75';
push @options, '-nolisten', 'tcp';
-
- #- old weird servers: Xsun
- push @options, '-fp', '/usr/share/fonts:unscaled' if $server =~ /Xsun/;
}
if (!fork()) {
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index be3d6c64c..198d44c9d 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -279,34 +279,6 @@ sub setupSCSI {
sub doPartitionDisks {
my ($o) = @_;
- if (arch() =~ /ppc/) {
- my $generation = detect_devices::get_mac_generation();
- if ($generation =~ /NewWorld/) {
- #- mac partition table
- if (defined $partition_table::mac::bootstrap_part) {
- #- do not do anything if we've got the bootstrap setup
- #- otherwise, go ahead and create one somewhere in the drive free space
- } else {
- my $freepart = $partition_table::mac::freepart;
- if ($freepart && $freepart->{size} >= 1) {
- log::l("creating bootstrap partition on drive /dev/$freepart->{hd}{device}, block $freepart->{start}");
- $partition_table::mac::bootstrap_part = $freepart->{part};
- log::l("bootstrap now at $partition_table::mac::bootstrap_part");
- my $p = { start => $freepart->{start}, size => MB(1), mntpoint => '' };
- fs::type::set_pt_type($p, 0x401);
- fsedit::add($freepart->{hd}, $p, $o->{all_hds}, { force => 1, primaryOrExtended => 'Primary' });
- $partition_table::mac::new_bootstrap = 1;
-
- } else {
- $o->ask_warn('', N("No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"));
- }
- }
- } elsif ($generation =~ /IBM/) {
- #- dos partition table
- $o->ask_warn('', N("You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"));
- }
- }
-
if (!$o->{isUpgrade}) {
fs::partitioning_wizard::main($o, $o->{all_hds}, $o->{fstab}, $o->{manualFstab}, $o->{partitions}, $o->{partitioning}, $::local_install);
}
@@ -1076,14 +1048,6 @@ sub setupBootloaderBefore {
#------------------------------------------------------------------------------
sub setupBootloader {
my ($o) = @_;
- if (arch() =~ /ppc/) {
- if (detect_devices::get_mac_generation() !~ /NewWorld/ &&
- detect_devices::get_mac_model() !~ /IBM/) {
- $o->ask_warn('', N("You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s", '/dev/' . fs::get::root_($o->{fstab})->{device}));
- log::l("OldWorld or Unknown Machine - no yaboot setup");
- return;
- }
- }
{
any::setupBootloader_simple($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return;
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-07-05 19:47:41 +0000