debian/ppc/apus boot floppies report.
Hello,
I worked some again on the boot floppies for ppc/apus this weekend.
i did manage to build the boot floppies. I built a special apus version of the
ppc boot floppies containing only the amiga-fdisk program, and not
cfdisk,ddisk nor mac-fdisk. To do that, i modified the rootdisk.sh script so
that if a
scripts/rootdisk/[EXTRAC_LIST,SMALL_BASE_LIST,SMALL_REMOVE_LIST]_arch_subarch
file exists, it will be read instead of the
scripts/rootdisk/[EXTRAC_LIST,SMALL_BASE_LIST,SMALL_REMOVE_LIST]_arch
file.
Hope this is ok.
Ideally, the script should look first for a _all file, then for a _arch_all
file, and finally for a _arch_subarch file if it exists.
Ok, anyway, i am ready for checking in the changes contained in the attached
csf diff file. SO if nobody objects, i will check it in before leaving here
today.
Once this change added, i built boot floppies with working fdisk for
ppc/apus. I added also m68k-mice devices so the /dev/amigamouse get created.
The next problem i encoutered was that when trying to configure the keyboard,
dbootstrap told me it didn't find amiga/amiga/amiga-fr.bmp.
This is normal, since the keymaps in /etc/keymaps.tgz is amiga/amiga-fr.bmap.
So there are two problems. there is on amiga directory too much in the path,
and the extension is .bmp instead of .bmap. The second problem is not a
problem since it is only an error in the error message, since it is the .bmap
file that is searched. i could not correct this because then the localisation
stuff complained when building.
I asked already here about the leading amiga dir, and was told to put the
prefix variable to "" in utilities/dbootstrap/kbdconfig.c. So i did that
rebuilt everything, rebooted and tried it out. To my surprise this didn't
solve the problem. Does anyone have an idea of what i did wrong ?
Notice that kbdconfig_test segfaults, ...
Another few msicellanous questions :
* What are the root{subarch}-fb.bin for ? are they not the same as the
standard root.bin ones on ppc ?
* what for and when s the powerpc-specials/bootargs file used ? What should
i put in the bootargs-apus file ?
I still didn't manage to build a multi binaries amiga-fdisk package, so i did
split the package in two, and will upload the amiga-fdisk-bf package today,
which is needed to build the boot floppies.
Friendly,
Sven LUTHER
Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/Makefile,v
retrieving revision 1.241
diff -u -r1.241 Makefile
--- Makefile 2000/02/28 06:05:41 1.241
+++ Makefile 2000/02/28 10:12:55
@@ -321,7 +321,7 @@
$(MAKE) resc1440mvme16x.bin drv1440mvme16x.bin
else
ifeq ($(architecture), powerpc)
-# $(MAKE) resc1440apus.bin driversapus.tgz
+ $(MAKE) resc1440apus.bin driversapus.tgz
$(MAKE) resc1440chrp.bin driverschrp.tgz
# $(MAKE) resc1440mbx.bin driversmbx.tgz
$(MAKE) resc1440pmac.bin driverspmac.tgz
@@ -873,6 +873,23 @@
#--------------------------------------------------------
$(MAKE) -C powerpc-specials clean
$(MAKE) -C powerpc-specials
+ #--------------------------------------------------------
+ # APUS install kit
+ #--------------------------------------------------------
+ mkdir -p release/apus/disks-1.44
+ [ ! -f linuxapus ] || cp linuxapus release/apus/linux
+ [ ! -f sys_mapapus.gz ] || cp sys_mapapus.gz release/apus/sysmap.gz
+ mv release/disks-1.44/rescueapus.bin release/apus/disks-1.44/rescue.bin
+ mv release/root1440apus.bin release/apus/disks-1.44/root.bin
+ mv release/driversapus.tgz release/apus/drivers.tgz
+ for dfile in release/disks-1.44/driverapus-?.bin; \
+ do \
+ bdfile=`basename $$dfile`; \
+ dnum=`echo $$bdfile | cut -d - -f 2 | cut -c 1`; \
+ mv release/disks-1.44/$$bdfile release/apus/disks-1.44/driver-$$dnum.bin; \
+ done
+ cp powerpc-specials/bootargs-apus release/apus/bootargs
+ cp powerpc-specials/install-apus.en.txt release/apus/install.txt
#--------------------------------------------------------
# CHRP install kit
#--------------------------------------------------------
Index: README
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/README,v
retrieving revision 1.15
diff -u -r1.15 README
--- README 1999/12/20 03:15:14 1.15
+++ README 2000/02/28 10:12:55
@@ -20,7 +20,8 @@
this package. If you don't already have a local mirror or NFS
access to one, a good first step is to mirror the base directory of
the Debian archive. From there, look through
- scripts/rootdisk/EXTRACT_LIST_{all,<my-architecture>}
+ scripts/rootdisk/EXTRACT_LIST_{all,<my-architecture>,
+ <my-architecture>_<my-subarchitecture>}
and scripts/basedisk/PACKAGES_{all,<my-architecture>} for other
packages you will need.
Index: basedisks.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/basedisks.sh,v
retrieving revision 1.67
diff -u -r1.67 basedisks.sh
--- basedisks.sh 2000/02/22 05:19:19 1.67
+++ basedisks.sh 2000/02/28 10:12:55
@@ -139,7 +139,7 @@
testexit
;;
powerpc)
- (cd $B/dev && /sbin/MAKEDEV fd0 fd1 isdn-io )
+ (cd $B/dev && /sbin/MAKEDEV fd0 fd1 isdn-io m68k-mice )
testexit
;;
sparc)
Index: check_mirror.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/check_mirror.sh,v
retrieving revision 1.7
diff -u -r1.7 check_mirror.sh
--- check_mirror.sh 1999/11/17 16:53:11 1.7
+++ check_mirror.sh 2000/02/28 10:12:55
@@ -22,9 +22,10 @@
rootscripts=`pwd`/scripts/rootdisk
basescripts=`pwd`/scripts/basedisks
-
+extract_subarch_list=`ls $rootscripts/EXTRACT_LIST_${arch}_*`
rootfiles="$rootscripts/EXTRACT_LIST_all \
- $rootscripts/EXTRACT_LIST_${arch}"
+ $rootscripts/EXTRACT_LIST_${arch} \
+ $extract_subarch_list" \
basefiles="$basescripts/PACKAGES_all \
$basescripts/PACKAGES_${arch} \
$basescripts/PARTIAL_PACKAGES_all \
Index: mirror_base.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/mirror_base.sh,v
retrieving revision 1.15
diff -u -r1.15 mirror_base.sh
--- mirror_base.sh 2000/02/28 04:27:26 1.15
+++ mirror_base.sh 2000/02/28 10:12:55
@@ -25,11 +25,13 @@
kver=$4
basearea="$5/scripts/basedisks"
rootarea="$5/scripts/rootdisk"
+extract_subarch_list=`ls $rootarea/EXTRACT_LIST_${arch}_*`
rsync="rsync" # set to "rsync -n" to test
files="$basearea/PACKAGES_all $basearea/PACKAGES_$arch \
- $rootarea/EXTRACT_LIST_all $rootarea/EXTRACT_LIST_$arch"
+ $rootarea/EXTRACT_LIST_all $rootarea/EXTRACT_LIST_$arch \
+ $extract_subarch_list"
for file in $files; do
if [ ! -f $file ]; then
Index: rootdisk.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/rootdisk.sh,v
retrieving revision 1.136
diff -u -r1.136 rootdisk.sh
--- rootdisk.sh 2000/02/26 09:13:54 1.136
+++ rootdisk.sh 2000/02/28 10:12:56
@@ -185,7 +185,11 @@
fi
# expand the package names into full pathnames
-extract_list="$scripts/EXTRACT_LIST_all $scripts/EXTRACT_LIST_${arch}"
+if [ -f $scripts/EXTRACT_LIST_${arch}_${system} ]; then
+ extract_list="$scripts/EXTRACT_LIST_all $scripts/EXTRACT_LIST_${arch}_${system}"
+else
+ extract_list="$scripts/EXTRACT_LIST_all $scripts/EXTRACT_LIST_${arch}"
+fi
if [ "$LINGUA" != C -a -e $scripts/EXTRACT_LIST_${LINGUA} ]; then
extract_list="$extract_list $scripts/EXTRACT_LIST_${LINGUA}"
fi
@@ -307,8 +311,13 @@
( cd $E && tar cf - --files-from=$scripts/SMALL_BASE_LIST_all ) | \
tar xlpf - -C $R $vflag
testexit
-( cd $E && tar cf - --files-from=$scripts/SMALL_BASE_LIST_$arch ) | \
- tar xlpf - -C $R $vflag
+if [ -f $scripts/SMALL_BASE_LIST_${arch}_${system} ]; then
+ ( cd $E && tar cf - --files-from=$scripts/SMALL_BASE_LIST_${arch}_${system} ) | \
+ tar xlpf - -C $R $vflag
+else
+ ( cd $E && tar cf - --files-from=$scripts/SMALL_BASE_LIST_$arch ) | \
+ tar xlpf - -C $R $vflag
+fi
testexit
if [ "$LINGUA" != C -a -e $scripts/SMALL_BASE_LIST_${LINGUA} ]; then
( cd $E && tar cf - --files-from=$scripts/SMALL_BASE_LIST_${LINGUA} ) | \
@@ -544,7 +553,11 @@
# building the stripped libraries. So, let's include them in the
# rootdisk, generate the libraries, and then remove them before building
# the disk image.
-files_to_remove=`cat $scripts/SMALL_REMOVE_LIST_all $scripts/SMALL_REMOVE_LIST_$arch`
+if [ -f $scripts/SMALL_REMOVE_LIST_${arch}_${system} ]; then
+ files_to_remove=`cat $scripts/SMALL_REMOVE_LIST_all $scripts/SMALL_REMOVE_LIST_${arch}_${system}`
+else
+ files_to_remove=`cat $scripts/SMALL_REMOVE_LIST_all $scripts/SMALL_REMOVE_LIST_$arch`
+fi
if [ ! -z "$files_to_remove" ]; then
(cd $R && rm -f $files_to_remove)
testexit
Index: powerpc-specials/bootargs-apus
===================================================================
RCS file: bootargs-apus
diff -N bootargs-apus
--- /dev/null Tue May 27 17:49:58 1997
+++ bootargs-apus Mon Feb 28 02:12:56 2000
@@ -0,0 +1,5 @@
+-s -k linux -r root.bin load_ramdisk=1 root=/dev/ram video=keep ramdisk_size=8192
+
+setenv boot-device scsi-int/sd@0:0
+setenv boot-file /linux load_ramdisk=1 root=/dev/ram video=keep
+boot
Index: powerpc-specials/install-apus.en.sgml
===================================================================
RCS file: install-apus.en.sgml
diff -N install-apus.en.sgml
--- /dev/null Tue May 27 17:49:58 1997
+++ install-apus.en.sgml Mon Feb 28 02:12:56 2000
@@ -0,0 +1,35 @@
+<!-- powerpc-install.sgml
+ Copyright (c) 1999, Sven LUTHER <luther@debian.org>
+-->
+
+<!doctype linuxdoc system>
+
+<article>
+
+<!-- Title information -->
+
+<title>PowerPC Installation-Document -- APUS (Amiga PowerUp System)
+<author>Sven LUTHER, luther@debian.org
+<date>v1.0, 24 february 2000
+<abstract>
+This document describes the installation of Debian GNU/Linux on PowerPC Systems
+</abstract>
+
+<!-- Table of contents -->
+<toc>
+
+<!-- Begin the document -->
+
+<sect id="instprep">Installing Debian GNU/Linux on a PowerPC APUS machine
+<p>
+
+ Not ready yet!!! Please add documentation.
+
+
+</article>
+
+<!--
+Local variables:
+mode: iso-accents
+End:
+-->
Index: scripts/rootdisk/EXTRACT_LIST_powerpc_apus
===================================================================
RCS file: EXTRACT_LIST_powerpc_apus
diff -N EXTRACT_LIST_powerpc_apus
--- /dev/null Tue May 27 17:49:58 1997
+++ EXTRACT_LIST_powerpc_apus Mon Feb 28 02:12:57 2000
@@ -0,0 +1,5 @@
+libc6
+amiga-fdisk-bf
+util-linux
+powerpc-utils
+eject
Index: scripts/rootdisk/SMALL_BASE_LIST_powerpc_apus
===================================================================
RCS file: SMALL_BASE_LIST_powerpc_apus
diff -N SMALL_BASE_LIST_powerpc_apus
--- /dev/null Tue May 27 17:49:58 1997
+++ SMALL_BASE_LIST_powerpc_apus Mon Feb 28 02:12:57 2000
@@ -0,0 +1,2 @@
+sbin/amiga-fdisk
+usr/bin/eject
Index: scripts/rootdisk/SMALL_REMOVE_LIST_powerpc_apus
===================================================================
RCS file: SMALL_REMOVE_LIST_powerpc_apus
diff -N SMALL_REMOVE_LIST_powerpc_apus
Reply to: