[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

2.2.4 boot-floppies and powerpc/apus subarch.



Hello, ...

I am working on boot floppies for the apus powerpc subarch, and here is some
questions/experience i had with 2.2.4 so far (2.2.4 is a big improvement from
2.2.1, which i tried lastly, and didn't work for me). I managed to advance in
the boot-floppies building process somewhat, but was halted for lack of a
correct kernel. I will be building an adequate kernel this evening, at least i
hope so, and try it again. In the meanttime, it would be nice to incorporate
this patches into the next version of boot-floppies, but still disabling the
apus boot-floppies until i tested it more toroughly, by not applying chunk 4
of the Makefile diff. So anyway, here are my remarqs :

 * in utilities/libfdisk/fdisk.c,1030 : MAX_DISKNAME_LEN is not defined,
   anyone knows what is wrong here ? I defined it to 11 to test the rest of
   the bootfloppies.

 * is it possible to add amiga-fdisk to powerpc root disks ?
   This is confusing, since there is one root disk per subarch, should there
   not be a mechanism to put mac-fdisk into the pmac rootdisk, amiga-fdisk into
   the apus rootdisk, and so on. But then maybe i misunderstood something.

 * I added some amiga keymaps (all the ones from console-data). Is this ok, or
   will it bloat the boot floppies ? Same problem as above applies here.

 * It seemed to work fine, but my kernel, being uncompressed, naturally didn't
   fit in the rescue disk. This is not a big issue, since anyway, apus users
   will never boot from this kernel, so i will just make a compressed
   kernel-image.

 * powerpc use kernel version 2.2.12 (for now), but apus only 2.2.10. All
   utilities stuff is compiled with KVER=2.2.12, will this cause problems ?

 * The kenrel-image i use is not yet in the archive, due to bad hand building
   of debian package back in december. It is now freeze time. Is it still
   possible to add a kenrel-image-2.2.10-apus to potato, despite of freeze
   time ? It should be build from kernel-source-2.2.10 and
   kernel-patch-2.2.10-powerpc-apus which are already in the archive, or from
   a kernel-image source package i will try to do nextly.

 * for the rescue disks, i copied the "formatting and conditioning" stuff from
   m68k/amiga to powerpc/apus, since both are amiga computers, just with
   different cpus. i hope this is ok (m68k/amiga uses mkdosfs, while most
   powerpc subarchs uses an mke2fs. Hope this is ok.

Ok and now, here is the patch.

--- Makefile.orig	Mon Dec 27 21:01:42 1999
+++ Makefile	Thu Jan  6 09:13:30 2000
@@ -60,6 +60,7 @@
 # altkver   = alternate kernel for more bootdisks (could be empty)
 ifeq ($(architecture), powerpc)
     kver	:= 2.2.12
+    apuskver	:= 2.2.10
 else
 ifeq ($(architecture), i386)
     kver	:= 2.2.13
@@ -118,7 +119,7 @@
 tftplilo	:= $(shell $(pathcmd:P=m68k-vme-tftplilo_*.deb))
 
 #### powerpc part
-kernelapus	:= $(shell $(pathcmd:P=kernel-image-$(kver)-apus*.deb))
+kernelapus	:= $(shell $(pathcmd:P=kernel-image-$(apuskver)-apus*.deb))
 kernelchrp	:= $(shell $(pathcmd:P=kernel-image-$(kver)-chrp*.deb))
 kernelmbx	:= $(shell $(pathcmd:P=kernel-image-$(kver)-mbx*.deb))
 kernelpmac	:= $(shell $(pathcmd:P=kernel-image-$(kver)-pmac*.deb))
@@ -210,6 +211,8 @@
 		( echo mvme16x kernel is not available ; exit 1 )
 else
 ifeq ($(architecture), powerpc)
+	[ -f "$(kernelapus)" ] || \
+		( echo apus kernel is not available ; exit 1 )
 	[ -f "$(kernelchrp)" ] || \
 		( echo chrp kernel is not available ; exit 1 )
 	[ -f "$(kernelpmac)" ] || \
@@ -287,11 +290,11 @@
 	$(MAKE) resc1440mvme16x.bin drv1440mvme16x.bin
 else 
 ifeq ($(architecture), powerpc)
-#	$(MAKE) resc1440apus.bin driversapus.tgz
-	$(MAKE) resc1440chrp.bin driverschrp.tgz
	$(MAKE) resc1440apus.bin driversapus.tgz
 #	$(MAKE) resc1440mbx.bin driversmbx.tgz
	$(MAKE) resc1440pmac.bin driverspmac.tgz
	$(MAKE) resc1440prep.bin driversprep.tgz bootprep.bin
 #-----------------------------------------------------
 #	$(MAKE) resc1440apus-fb.bin
 #	$(MAKE) resc1440chrp-fb.bin
--- kernel.sh.orig	Thu Jan  6 09:49:19 2000
+++ kernel.sh	Thu Jan  6 09:49:47 2000
@@ -93,6 +93,8 @@
 	# vmlinux.coff-<version> is the kernel for OF booting
 	cp $extractdir/boot/vmlinux-* linux$revext
 	cp $extractdir/boot/vmlinux.coff-* linux$revext.coff
+elif [ "$revext" = apus ]; then
+	cp $extractdir/boot/vmlinux-2.2.10 linux$revext
 else
 	cp $extractdir/boot/vmlinuz* linux$revext
 fi
--- keymaps.sh.orig	Thu Jan  6 09:43:35 2000
+++ keymaps.sh	Thu Jan  6 09:45:48 2000
@@ -76,7 +76,14 @@
 	i386/qwertz/croat.kmap.gz
 	i386/qwertz/de-latin1-nodeadkeys.kmap.gz
 	i386/qwertz/hu.kmap.gz
-	i386/qwertz/slovene.kmap.gz"
+	i386/qwertz/slovene.kmap.gz
+	amiga/amiga-de.kmap.gz
+	amiga/amiga-es.kmap.gz
+	amiga/amiga-it.kmap.gz
+	amiga/amiga-se.kmap.gz
+	amiga/amiga-sg.kmap.gz
+	amiga/amiga-fr.kmap.gz
+	amiga/amiga-us.kmap.gz"
 	;;
 sparc)
 	export keymaps="sun/sunkeymap.kmap.gz
--- rescue.sh.orig	Thu Jan  6 09:56:10 2000
+++ rescue.sh	Thu Jan  6 10:04:51 2000
@@ -333,8 +333,10 @@
     powerpc)
             case "$system" in
               apus)
-                  warning "don't know what to do for APUS"
-                  error "for the moment, use the m68k-amiga boot-floppies"
+                  mkdosfs -r 112 -F 12 $floppy $blocks
+                  fstype=msdos
+                  fsopts="-o fat=12"
+                  nlfmt="recode $charset..ibmpc"       # MSDOS newline convention
               ;;
               chrp)
                   mke2fs $loopdevice $blocks
--- rootdisk.sh.orig	Thu Jan  6 09:55:16 2000
+++ rootdisk.sh	Thu Jan  6 09:56:00 2000
@@ -557,8 +557,7 @@
     powerpc)
             case "$system" in
               apus)
-                  warn "Don't know what to do for APUS"
-                  error "for the moment, use the m68k-amiga boot-floppies"
+                  nlfmt="recode $charset..ibmpc"       # MSDOS newline convention
               ;;
               bbox)
                   error "no support for BeBox"


Reply to: