patch for arm keymaps
Acorn machines need a different keymap. Could somebody please check this into
CVS?
Thanks
p.
Index: utilities/dbootstrap/kbdconfig.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/kbdconfig.c,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 kbdconfig.c
--- utilities/dbootstrap/kbdconfig.c 2000/11/19 17:40:38 1.47
+++ utilities/dbootstrap/kbdconfig.c 2001/02/10 19:04:00
@@ -113,6 +113,42 @@ int configure_keyboard (char *kbd)
{ "sun/sunt5-cz-us", "Czech (Type 5)" , KBD_cs_CZ},
{ "sun/sunt5-uk", "United Kingdom" , KBD_en_UK}
};
+#elif #cpu (arm)
+ struct d_choices keymaps[]={
+ { "qwerty/us", "U.S. English (QWERTY)" , KBD_C },
+ { "azerty/be-latin1", "Belgium" , KBD_fr_BE },
+ { "qwerty/br-abnt2", "Brazilian (ABNT2 layout)", KBD_pt_BR2 },
+ { "qwerty/br-latin1", "Brazilian (EUA layout)", KBD_pt_BR },
+ { "qwerty/bg", "Bulgarian Cyrillic" , 0 },
+ { "qwertz/croat", "Croatian" , 0 },
+ { "qwerty/cz-lat2", "Czech" , KBD_cs_CZ },
+ { "qwerty/dk-latin1", "Danish" , KBD_da_DK },
+ { "dvorak/dvorak", "Dvorak" , KBD_dvorak },
+ { "qwerty/fi-latin1", "Finland" , KBD_fi_FI },
+ { "azerty/fr-latin0", "France (with Euro)" , KBD_fr_FR0 },
+ { "azerty/fr-latin1", "France" , KBD_fr_FR },
+ { "qwerty/cf", "French Canadian" , KBD_fr_CA },
+ { "qwertz/de-latin1-nodeadkeys", "Germany" , KBD_de_DE },
+ { "qwerty/gr", "Greek" , KBD_el_GR },
+ { "qwerty/hebrew", "Hebrew" , 0 },
+ { "qwertz/hu", "Hungary" , KBD_hu_HU },
+ { "qwerty/is-latin1", "Iceland" , KBD_is_IS },
+ { "qwerty/it", "Italy" , KBD_it_IT },
+ { "qwerty/jp106", "Japan" , KBD_ja_JP },
+ { "qwerty/no-latin1", "Norway" , KBD_no_NO },
+ { "qwerty/pl", "Poland" , KBD_pl_PL },
+ { "qwerty/pt-latin1", "Portuguese" , KBD_pt_PT },
+ { "qwerty/ru", "Russia" , KBD_ru_RU },
+ { "qwerty/se-latin1", "Sweden" , KBD_sv_SE },
+ { "qwertz/slovene", "Slovene" , 0 },
+ { "qwerty/sk-qwerty", "Slovak" , 0 },
+ { "qwerty/es", "Spain" , KBD_es_ES },
+ { "qwerty/trq", "Turkish Q" , KBD_tr_TR },
+ { "qwerty/uk", "United Kingdom" , KBD_en_UK }
+ };
+ struct d_choices keymaps_acorn[] = {
+ { "ps2.uk", "United Kingdom" , 0 }
+ };
#else
struct d_choices keymaps[]={
{ "qwerty/us", "U.S. English (QWERTY)" , KBD_C },
@@ -190,6 +226,16 @@ int configure_keyboard (char *kbd)
choices= keymaps;
nchoices=sizeof(keymaps)/sizeof(struct d_choices);
prefix="i386/";
+ }
+#elif #cpu (arm)
+ if (strcmp(Arch2, "acorn") == 0) {
+ choices = keymaps_acorn;
+ nchoices = sizeof(keymaps_acorn)/sizeof(struct d_choices);
+ prefix = "acorn/";
+ } else {
+ choices = keymaps;
+ nchoices = sizeof(keymaps)/sizeof(struct d_choices);
+ prefix = "i386/";
}
#else
prefix = "i386/";
Index: keymaps.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/keymaps.sh,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 keymaps.sh
--- keymaps.sh 2000/05/16 13:09:01 1.53
+++ keymaps.sh 2001/02/10 19:03:52
@@ -128,6 +128,36 @@ sparc)
i386/qwerty/us.kmap.gz
i386/qwerty/us-latin1.kmap.gz"
;;
+arm)
+ export keymaps="acorn/ps2.uk.kmap.gz
+ i386/azerty/be-latin1.kmap.gz
+ i386/qwerty/br-abnt2.kmap.gz
+ i386/qwerty/bg.kmap.gz
+ i386/qwerty/cf.kmap.gz
+ i386/qwertz/croat.kmap.gz
+ i386/qwerty/cz-lat2.kmap.gz
+ i386/qwertz/de-latin1-nodeadkeys.kmap.gz
+ i386/qwerty/dk-latin1.kmap.gz
+ i386/dvorak/dvorak.kmap.gz
+ i386/qwerty/es.kmap.gz
+ i386/qwerty/fi-latin1.kmap.gz
+ i386/azerty/fr-latin1.kmap.gz
+ i386/qwerty/hebrew.kmap.gz
+ i386/qwertz/hu.kmap.gz
+ i386/qwerty/is-latin1.kmap.gz
+ i386/qwerty/it.kmap.gz
+ i386/qwerty/jp106.kmap.gz
+ i386/qwerty/no-latin1.kmap.gz
+ i386/qwerty/pl.kmap.gz
+ i386/qwerty/ru.kmap.gz
+ i386/qwerty/se-latin1.kmap.gz
+ i386/qwertz/slovene.kmap.gz
+ i386/qwerty/sk-qwerty.kmap.gz
+ i386/qwerty/trq.kmap.gz
+ i386/qwerty/uk.kmap.gz
+ i386/qwerty/us.kmap.gz
+ i386/qwerty/us-latin1.kmap.gz"
+ ;;
*)
export keymaps="i386/azerty/be-latin1.kmap.gz
i386/qwerty/br-abnt2.kmap.gz
Reply to: