diff options
| -rw-r--r-- | perl-install/Makefile | 4 | ||||
| -rw-r--r-- | perl-install/Makefile.config | 7 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 1 | ||||
| -rwxr-xr-x | tools/alpha/e2fsck.shared | bin | 0 -> 111080 bytes | |||
| -rwxr-xr-x | tools/i386/e2fsck.shared | bin | 0 -> 80308 bytes |
6 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 9911740d5..729c1d385 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -131,7 +131,9 @@ endif # echo -e '#!/bin/sh\n\nexec "/usr/bin/sh"' > $(DEST)/usr/bin/runinstall2 # chmod a+x $(DEST)/usr/bin/runinstall2 - tar xyC $(DEST) -f ../install/install1_pcmcia.tar.bz2 ./etc/pcmcia + tar xyC $(DEST) -f ../install/install1_pcmcia.$(ARCH).tar.bz2 ./etc/pcmcia + + find $(DEST) -name CVS | xargs rm -rf full_stage2: if [ `id -u` = 0 ]; then rm -rf $(DEST); else $(SUDO) rm -rf $(DEST); fi diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index de17135c8..d32328662 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,3 +1,6 @@ +ARCH := $(patsubst i%86,i386,$(shell uname -m)) +ARCH := $(patsubst sparc%,sparc,$(ARCH)) + VERSION = 2.2.10-BOOT SUDO = sudo SO_FILES = c/blib/arch/auto/c/c.so @@ -11,10 +14,8 @@ STAGE2 = $(ROOTDEST)/Mandrake/base/mdkinst_stage2 BASE = $(ROOTDEST)/Mandrake/base DESTREP4PMS = $(DEST)$(REP4PMS) PERL = perl -LOCALFILES = $(patsubst %, ../tools/%,e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+ extract_archive) +LOCALFILES = $(patsubst %, ../tools/%,$(ARCH)/e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+ extract_archive) DIRS = c Newt pci_probing resize_fat #po CFLAGS = -Wall override CFLAGS += -pipe -ARCH := $(patsubst i%86,i386,$(shell uname -m)) -ARCH := $(patsubst sparc%,sparc,$(ARCH)) diff --git a/perl-install/install2.pm b/perl-install/install2.pm index aa6266bff..5d3a0945d 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -58,7 +58,7 @@ my (%installSteps, @orderedInstallSteps); configurePrinter => [ __("Configure printer"), 1, 0, '', "doInstallStep" ], setRootPassword => [ __("Set root password"), 1, 1, '', "formatPartitions" ], addUser => [ __("Add a user"), 1, 1, '', "doInstallStep" ], -arch() =~ /alpha/ ? : ( +arch() =~ /alpha/ ? ( createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "doInstallStep" ], ) : (), setupBootloader => [ __("Install bootloader"), 1, 1, '', "doInstallStep" ], diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 612129988..0509028cf 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -932,6 +932,7 @@ sub setupBootloaderBefore { #------------------------------------------------------------------------------ sub setupBootloader { + my ($o) = @_; if (arch() =~ /^i386/) { $o->ask_yesorno('', _("Do you want to use aboot?"), 1) or return; $o->SUPER::setupBootloader; diff --git a/tools/alpha/e2fsck.shared b/tools/alpha/e2fsck.shared Binary files differnew file mode 100755 index 000000000..765e664a1 --- /dev/null +++ b/tools/alpha/e2fsck.shared diff --git a/tools/i386/e2fsck.shared b/tools/i386/e2fsck.shared Binary files differnew file mode 100755 index 000000000..ad4d660a0 --- /dev/null +++ b/tools/i386/e2fsck.shared |