Bug#107278: kernel-package should not run lilo on PowerPC subarches Amiga, PReP, and MBX
Package: kernel-package
Tags: patch
Michel Dänzer <daenzer@iogram.ch> writes:
> Yes. Not a big deal on APUS though as we don't have a real
> bootloader, we just say no to all LILO questions.
Ick. I can't believe you didn't report this as a bug! :)
Does this patch look ok to everyone?
cd /usr/src/kernel-package/kernel-package-7.55/kernel/
diff -u /usr/src/kernel-package/kernel-package-7.55/kernel/rules\~ /usr/src/kernel-package/kernel-package-7.55/kernel/rules
--- /usr/src/kernel-package/kernel-package-7.55/kernel/rules~ Tue Jul 24 22:01:58 2001
+++ /usr/src/kernel-package/kernel-package-7.55/kernel/rules Tue Jul 31 13:13:30 2001
@@ -193,6 +193,7 @@
ifneq (,$(findstring $(SUBARCH),APUs apus Amiga))
SUBARCH:=apus
+loader := NoLoader
kimage := vmapus.gz
target = zImage
kimagesrc = $(shell if [ -d arch/$(KERNEL_ARCH)/boot/images ]; then \
@@ -218,6 +219,7 @@
ifneq (,$(findstring $(SUBARCH),MBX mbx))
SUBARCH:=mbx
+loader := NoLoader
kimage := zImage
target = $(kimage)
kimagesrc = $(shell if [ -d arch/$(KERNEL_ARCH)/mbxboot ]; then \
@@ -252,6 +254,7 @@
ifneq (,$(findstring $(SUBARCH),PReP prep))
SUBARCH:=prep
+loader := NoLoader
kimage := zImage
target = $(kimage)
kimagesrc = $(shell if [ -d arch/$(KERNEL_ARCH)/boot/images ]; then \
Diff finished at Tue Jul 31 13:21:45
cd /usr/src/kernel-package/kernel-package-7.55/kernel/
diff -u /usr/src/kernel-package/kernel-package-7.55/kernel/image.postinst\~ /usr/src/kernel-package/kernel-package-7.55/kernel/image.postinst
--- /usr/src/kernel-package/kernel-package-7.55/kernel/image.postinst~ Fri Jul 27 04:11:41 2001
+++ /usr/src/kernel-package/kernel-package-7.55/kernel/image.postinst Tue Jul 31 13:21:16 2001
@@ -43,7 +43,8 @@
my $package_name = "kernel-image-$version";
-my $Loader = "LILO";
+my $Loader = "NOLOADER";
+$Loader = "LILO" if $loader =~ /lilo/io;
$Loader = "SILO" if $loader =~ /silo/io;
$Loader = "QUIK" if $loader =~ /quik/io;
$Loader = "yaboot" if $loader =~ /yaboot/io;
@@ -129,6 +130,7 @@
}
}
+$do_bootfloppy = "" if $loader =~ /noloader/io;
# no floppy disk support available for m68k VME
$do_bootfloppy = "" if $loader =~ /vmelilo/io;
$do_bootfloppy = "" if $loader =~ /quik/io;
@@ -713,6 +715,20 @@
}
exit (0) unless $do_boot_enable; # Exit if explicitly asked to
+
+
+if ($loader =~ /noloader/io) {
+ print STDERR << "MSGEND";
+I have determined no bootloader is required for your architecure. If
+this is an not correct, please report a bug against the kernel-package
+package.
+
+Done.
+MSGEND
+;
+ exit (0);
+}
+
exit (0) if $loader =~ /silo/i; # SILO does not have to be executed.
exit (0) if $loader =~ /yaboot/i; # yaboot does not have to be executed.
Diff finished at Tue Jul 31 13:25:04
Reply to: