Re: progress report on debian/powerpc/apus boot-floppies.
On Wed, Jan 26, 2000 at 03:09:26PM -0500, Adam Di Carlo wrote:
> Sven LUTHER <luther@dpt-info.u-strasbg.fr> writes:
>
> > On Tue, Jan 25, 2000 at 08:45:10PM -0500, Adam Di Carlo wrote:
> > > Sven LUTHER <luther@dpt-info.u-strasbg.fr> writes:
> > >
> > > > pb3 : When i call partition the harddisk, cfdisk is called, and not
> > > > amiga-fdisk, like it should be. cfdisk don't know anything about
> > > > amiga partitioned harddisks.
> > >
> > > Have you fixed this in dbootstrap yet? It should be fairly trivial to
> > > fix. I don't wanna mess with ports I don't understand.
> >
> > Not yet. I am still trying to understand how all this works. There is a line
> > in dbootstrap, telling the menu system that if the arch is ppc, you have to
> > use cfdisk ? is that it ? will try to send you a fix then.
>
> Um, it looks to me that this is already done -- see baseconfig.c, line
> 83. However, if you look at partition_config.c line 128, you will see
> that it will call /sbin/cfdisk if NAME_ISEXE. And if I recall, on
> APU, cfdisk doesn't work (but on other powerpc arches, it does).
Huh, ...
i got the cvs version yesterday, and did a bit of hacking, but didn't try it
out, as my debian archive was not complete. (i am offline at home, and had to
interrupt the mirror in the middle, thus having an inconsistent Packages
file.)
Anyway, i noticed that baseconfig.c is bad, the Arch2 should read Amiga, not
APUS, that is way amiga-fdisk is not called. What is the meaning of the
NAME_ISEXE ? should it not be better to check if fdisk is working ok, before
trying to call cfdisk ? Or at least have some kind of variable telling that on
yhis arch/subarch you have to use fdisk ?
> Ok... so really the problem is that the root disk for apus (it doees
> have its own rootdisk, right) should *not* have /sbin/cfdisk. You'll
I think it would be nice if only one rootdisk is needed for both apus and
pmac, not sure if it is possible.
> have to hack roodisk.sh, say line 525, and if we're making an apus
> rootdisk, then remove $R/sbin/cfdisk.
Ok will look at it.
After potato is released, it would be nice to have a more central
configuration scheme, lets say a config directory, where you will be able to
provide a config file per arch/subarch, and not this hacking in thousands of
files. Maybe i will have a look at it after potato is released.
> Ok?
Ok, ...
appended is a patch against yesterdays CVS version, it fixes lots of small
problems in the current stuff. Will try to get a complete archive today and
try it out this evening.
BTW, is there a way of launching dbootstrap without having to reboot ? with
some kind of chrooted environment ? I have to wait for the machine to cool
between two reboots ... :(((. Guess it is bad cooling on the m68k processor,
but since it is used only for booting i don't touch it.
> > I was told that the amiga-partition support of libfdisk is read
> > only, is this really the case ?
>
> All of libfdisk is read-only.
Ok, understood this at least.
Friendly,
Sven LUTHER
diff -ur boot-floppies.orig/Makefile boot-floppies/Makefile
--- boot-floppies.orig/Makefile Wed Jan 26 00:59:21 2000
+++ boot-floppies/Makefile Wed Jan 26 18:22:37 2000
@@ -301,7 +301,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
Only in boot-floppies: boot-floppies.cvs.diff
diff -ur boot-floppies.orig/keymaps.sh boot-floppies/keymaps.sh
--- boot-floppies.orig/keymaps.sh Sun Jan 23 09:27:49 2000
+++ boot-floppies/keymaps.sh Wed Jan 26 18:23:25 2000
@@ -39,6 +39,11 @@
atari/atari-uk.kmap.gz
atari/atari-us.kmap.gz
amiga/amiga-de.kmap.gz
+ amiga/amiga-es.kmap.gz
+ amiga/amiga-fr.kmap.gz
+ amiga/amiga-it.kmap.gz
+ amiga/amiga-se.kmap.gz
+ amiga/amiga-sg.kmap.gz
amiga/amiga-us.kmap.gz
mac/mac-us-std.kmap.gz
mac/mac-us-ext.kmap.gz
@@ -48,7 +53,6 @@
# FIXME: Removed German Mac keymap due to loadkey failures
# export keymaps="mac/mac-de-latin1-nodeadkeys.kmap.gz
export keymaps="amiga/amiga-de.kmap.gz
- amiga/amiga-de.kmap.gz
amiga/amiga-es.kmap.gz
amiga/amiga-fr.kmap.gz
amiga/amiga-it.kmap.gz
diff -ur boot-floppies.orig/scripts/rootdisk/EXTRACT_LIST_powerpc boot-floppies/scripts/rootdisk/EXTRACT_LIST_powerpc
--- boot-floppies.orig/scripts/rootdisk/EXTRACT_LIST_powerpc Sat Nov 6 23:16:14 1999
+++ boot-floppies/scripts/rootdisk/EXTRACT_LIST_powerpc Wed Jan 26 18:27:41 2000
@@ -1,4 +1,5 @@
libc6
+amiga-fdisk
mac-fdisk
util-linux
powerpc-utils
diff -ur boot-floppies.orig/scripts/rootdisk/SMALL_BASE_LIST_powerpc boot-floppies/scripts/rootdisk/SMALL_BASE_LIST_powerpc
--- boot-floppies.orig/scripts/rootdisk/SMALL_BASE_LIST_powerpc Sat Nov 6 23:16:14 1999
+++ boot-floppies/scripts/rootdisk/SMALL_BASE_LIST_powerpc Wed Jan 26 18:27:53 2000
@@ -1,5 +1,6 @@
sbin/ddisk
sbin/cfdisk
+sbin/amiga-fdisk
sbin/mac-fdisk
sbin/ifport
sbin/cardmgr
diff -ur boot-floppies.orig/scripts/rootdisk/fdisk-powerpc boot-floppies/scripts/rootdisk/fdisk-powerpc
--- boot-floppies.orig/scripts/rootdisk/fdisk-powerpc Sat Dec 18 20:24:40 1999
+++ boot-floppies/scripts/rootdisk/fdisk-powerpc Wed Jan 26 18:27:30 2000
@@ -62,7 +62,7 @@
/sbin/ddisk $@
exit 0
;;
- amiga)
+ Amiga)
/sbin/amiga-fdisk $@
exit 0
;;
diff -ur boot-floppies.orig/utilities/dbootstrap/baseconfig.c boot-floppies/utilities/dbootstrap/baseconfig.c
--- boot-floppies.orig/utilities/dbootstrap/baseconfig.c Sun Jan 9 01:45:24 2000
+++ boot-floppies/utilities/dbootstrap/baseconfig.c Wed Jan 26 18:47:39 2000
@@ -80,7 +80,7 @@
char *target;
/* determine target of symlink */
- if (strcmp(Arch2, "APUS") == 0)
+ if (strcmp(Arch2, "Amiga") == 0)
target = "amiga-fdisk";
else if (strcmp(Arch2, "BeBox") == 0)
target = "ddisk";
diff -ur boot-floppies.orig/utilities/dbootstrap/kbdconfig.c boot-floppies/utilities/dbootstrap/kbdconfig.c
--- boot-floppies.orig/utilities/dbootstrap/kbdconfig.c Sun Jan 16 23:26:25 2000
+++ boot-floppies/utilities/dbootstrap/kbdconfig.c Wed Jan 26 19:02:04 2000
@@ -18,8 +18,13 @@
#if #cpu (m68k)
struct d_choices keymaps_ami[]={
+ { "amiga/amiga-de", "Germany (Amiga)" , KBD_de_DE},
+ { "amiga/amiga-es", "Spain (Amiga)" , KBD_es_ES},
+ { "amiga/amiga-fr", "France (Amiga)" , KBD_fr_FR},
+ { "amiga/amiga-it", "Italy (Amiga)" , KBD_it_IT},
{ "amiga/amiga-us", "U.S. English (Amiga)" , KBD_C},
- { "amiga/amiga-de", "Germany (Amiga)" , KBD_de_DE}
+ { "amiga/amiga-se", "Sweden (Amiga)" , KBD_sv_SE},
+ { "amiga/amiga-sg", "Swiss German (Amiga)" , KBD_sg_SG}
};
int nchoices_ami=sizeof(keymaps_ami)/sizeof(struct d_choices);
struct d_choices keymaps_ata[]={
@@ -72,9 +77,17 @@
{ "mac/mac-fr2-ext", "France (Mac, extended kbd)" , 0},
{ "mac/mac-us-ext", "U.S. English (Mac, extended kbd)", 0},
{ "mac/mac-us-std", "U.S. English (Mac, 82 keys)" , 1},
- { "amiga/amiga-us", "U.S. English (Amiga)" , KBD_C},
- { "amiga/amiga-de", "Germany (Amiga)" , KBD_de_DE}
};
+ struct d_choices keymaps_ami[]={
+ { "amiga/amiga-de", "Germany (Amiga)" , KBD_de_DE},
+ { "amiga/amiga-es", "Spain (Amiga)" , KBD_es_ES},
+ { "amiga/amiga-fr", "France (Amiga)" , KBD_fr_FR},
+ { "amiga/amiga-it", "Italy (Amiga)" , KBD_it_IT},
+ { "amiga/amiga-us", "U.S. English (Amiga)" , KBD_C},
+ { "amiga/amiga-se", "Sweden (Amiga)" , KBD_sv_SE},
+ { "amiga/amiga-sg", "Swiss German (Amiga)" , KBD_sg_SG}
+ };
+ int nchoices_ami=sizeof(keymaps_ami)/sizeof(struct d_choices);
#elif #cpu (sparc)
struct d_choices keymaps[]={
{ "sunkeymap", "U.S. English (QWERTY)" , KBD_C},
@@ -147,9 +160,16 @@
choices= keymaps;
nchoices=sizeof(keymaps)/sizeof(struct d_choices);
#elif #cpu (powerpc)
- prefix="";
- choices= keymaps;
- nchoices=sizeof(keymaps)/sizeof(struct d_choices);
+ if (strcmp(Arch2, "Amiga") == 0) {
+ prefix="amiga";
+ choices = keymaps_ami;
+ nchoices = nchoices_ami;
+ }
+ else {
+ prefix="";
+ choices= keymaps;
+ nchoices=sizeof(keymaps)/sizeof(struct d_choices);
+ }
#else
prefix="i386";
choices= keymaps;
diff -ur boot-floppies.orig/utilities/dbootstrap/main.c boot-floppies/utilities/dbootstrap/main.c
--- boot-floppies.orig/utilities/dbootstrap/main.c Sun Jan 23 18:28:20 2000
+++ boot-floppies/utilities/dbootstrap/main.c Wed Jan 26 18:30:54 2000
@@ -400,7 +400,7 @@
Arch2=get_powerpc_model();
if ( (strcmp(Arch2,"CHRP")) && (strcasecmp(Arch2,"Power")) &&
(strcasecmp(Arch2,"Powerbook")) && (strcasecmp(Arch2,"iMac")) &&
- (strcmp(Arch2,"PReP"))) {
+ (strcmp(Arch2,"PReP")) && (strcasecmp(Arch2,"Amiga"))) {
problemBox(_("Your PowerPC architecture is not supported yet."),_("Problem"));
reboot(RB_AUTOBOOT);
}
Reply to: