diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 5 | ||||
| -rwxr-xr-x | update_kernel | 6 |
4 files changed, 18 insertions, 4 deletions
@@ -9,10 +9,17 @@ ifeq (sparc,$(ARCH)) BOOT_IMG = live.img tftp.img tftprd.img live64.img tftp64.img tftprd64.img RELEASE_BOOT_IMG += hd64.img cdrom64.img network64.img endif +ifeq (ppc,$(ARCH)) +BOOT_IMG = +RELEASE_BOOT_IMG = all.img +endif BOOT_IMG += $(RELEASE_BOOT_IMG) BOOT_RDZ = $(BOOT_IMG:%.img=%.rdz) BINS = mdk-stage1/init mdk-stage1/stage1-full mdk-stage1/stage1-cdrom mdk-stage1/stage1-network +ifeq (ppc,$(ARCH)) +BINS = mdk-stage1/init mdk-stage1/stage1-full +endif DIRS = tools mdk-stage1 perl-install ROOTDEST = /export @@ -25,7 +32,9 @@ UPLOAD_SPARC_DEST = /mnt/BIG/distrib/sparc install: build autoboot rescue for i in images misc Mandrake Mandrake/base; do install -d $(ROOTDEST)/$$i ; done +ifneq (ppc,$(ARCH)) cp -f $(RELEASE_BOOT_IMG) $(ROOTDEST)/images +endif ifeq (alpha,$(ARCH)) cp -f $(BOOT_RDZ) $(ROOTDEST)/boot cp -f vmlinux.gz $(ROOTDEST)/boot/instboot.gz diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index eb0165df9..b2b91278e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -491,7 +491,7 @@ sub install_yaboot($$$) { print F "$_->{type}=$of_dev,$_->{kernel_or_dev}"; print F "\tlabel=", substr($_->{label}, 0, 15); #- lilo doesn't handle more than 15 char long labels print F "\troot=$_->{root}"; - print F "\tinitrd=$_->{initrd}" if $_->{initrd}; + print F "\tinitrd=$of_dev,$_->{initrd}" if $_->{initrd}; print F "\tappend=\"$_->{append}\"" if $_->{append}; print F "\tread-write" if $_->{'read-write'}; print F "\tread-only" if !$_->{'read-write'}; diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 815d64f7c..ec8571f39 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -63,7 +63,8 @@ my %mice = __("busmouse") => [ [ arch() eq 'ppc' ? 'adbmouse' : ('atibm', 'inportbm', 'logibm') ], - [ [ 2, 'Busmouse', 'BusMouse', __("2 buttons") ], + [ if_(arch() eq 'ppc', [ 1, 'Busmouse', 'BusMouse', __("1 button") ]), + [ 2, 'Busmouse', 'BusMouse', __("2 buttons") ], [ 3, 'Busmouse', 'BusMouse', __("3 buttons") ], ]], @@ -199,7 +200,7 @@ sub detect() { "USB|Generic" : # No need to search for an ADB mouse. If I did, the PPC kernel would # find one whether or not I had one installed! So.. default to it. - "busmouse|2 buttons"); + "busmouse|1 button"); } if ($::isStandalone) { diff --git a/update_kernel b/update_kernel index 636efcabd..09d4cacc9 100755 --- a/update_kernel +++ b/update_kernel @@ -60,7 +60,11 @@ if [ "$ARCH" == "i386" ]; then rm -rf install_pcmcia_modules ; install -d install_pcmcia_modules else - cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux.gz . + if [ "$ARCH" == "ppc" ]; then + cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux . + else + cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux.gz . + fi fi cp -f $KERNEL_BOOT_PATH/boot/System.map* System.map |