# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1227024849 0
# Node ID 7bb391a2d0a1576095f2bfafd343eeccac4727b8
# Parent  6c45f6a1ee9037c7c2fa5b5231683dafe1131c65
syslinux: generate locale configuration

diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/receipt
--- a/syslinux/receipt	Tue Nov 18 12:40:05 2008 +0000
+++ b/syslinux/receipt	Tue Nov 18 16:14:09 2008 +0000
@@ -32,12 +32,34 @@
     cp -a $src/core/isolinux.bin $fs/boot/isolinux
     cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux
     cp stuff/*.* $fs/boot/isolinux
-    rm -rf $fs/boot/isolinux/tools $fs/boot/isolinux/*.kbd 2> /dev/null
-    grep kbd$ $fs/boot/isolinux/*.cfg | while read cfg kbd; do
-        cfg=$(basename ${cfg%.cfg:*})
-	sed -i "s/$kbd/$cfg.kbd/" $fs/boot/isolinux/$cfg.cfg
-        cp $src/$kbd $fs/boot/isolinux/$cfg.kbd
-    done
+    while read cfg kbd loc ; do
+        sed -e "s/^display/kbdmap $cfg.kbd\ndisplay/" \
+            -e "s/^label/say Now using $kbd keyboard and $loc locale.\nlabel/" \
+            -e "s/rootfs.gz/rootfs.gz lang=$loc kmap=$kbd/" \
+	        < $fs/boot/isolinux/isolinux.cfg > $fs/boot/isolinux/$cfg.cfg
+        cp $src/$kbd.kbd $fs/boot/isolinux/$cfg.kbd
+	cat >> $fs/boot/isolinux/common.inc <<EOT
+label $cfg
+	config $cfg.cfg
+EOT
+    done <<EOT
+be    be-latin1    fr_FR
+br    br-abnt2     pt_PT
+ca    cf           fr_FR
+de    de-latin1    de_DE
+de_CH de_CH-latin1 de_DE
+en    uk           C
+es    es           es_ES
+fi    fi-latin1    fi
+fr    fr-latin1    fr_FR
+fr_CH fr_CH-latin1 fr_FR
+hu    hu           hu
+it    it           it_IT
+jp    jp106        jp_JP
+pt    pt-latin1    pt_PT
+ru    ru           ru_RU
+us    us           C
+EOT
     chown root.root $fs/boot/isolinux/*
     # Package all syslinux pkgs
     for i in $(cd $WOK; ls -d syslinux-*)
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/be.cfg
--- a/syslinux/stuff/be.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP be-latin1.kbd
-display isolinux.msg
-SAY Now using be-latin1 keyboard and fr_FR locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=fr_FR kmap=be-latin1
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/br.cfg
--- a/syslinux/stuff/br.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP br-abnt2.kbd
-display isolinux.msg
-SAY Now using br-abnt2 keyboard and pt_PT locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=pt_PT kmap=br-abnt2
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/ca.cfg
--- a/syslinux/stuff/ca.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP cf.kbd
-display isolinux.msg
-SAY Now using cf keyboard and fr_FR locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=fr_FR kmap=cf
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/common.inc
--- a/syslinux/stuff/common.inc	Tue Nov 18 12:40:05 2008 +0000
+++ b/syslinux/stuff/common.inc	Tue Nov 18 16:14:09 2008 +0000
@@ -3,48 +3,12 @@
 	kernel /boot/gpxe
 label zeb
 	kernel /boot/gpxe
-label be
-	config be.cfg
-label br
-	config br.cfg
-label ca
-	config ca.cfg
-label ch
-	config fr_CH.cfg
-label de
-	config de.cfg
-label de_CH
-	config de_CH.cfg
 label deCH
 	config de_CH.cfg
-label en
-	config en.cfg
-label es
-	config es.cfg
-label fi
-	config fi.cfg
-label fr
-	config fr.cfg
-label fr_CH
-	config fr_CH.cfg
 label frCH
 	config fr_CH.cfg
-label hu
-	config hu.cfg
-label it
-	config it.cfg
-label jp
-	config jp.cfg
-label pt
-	config pt.cfg
 label reboot
 	com32 reboot.c32
-label ru
-	config ru.cfg
-label uk
-	config en.cfg
-label us
-	config us.cfg
 
 implicit 0	
 prompt 1	
@@ -55,3 +19,4 @@
 F4 display.txt
 F5 enhelp.txt
 F6 enopts.txt
+
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/de.cfg
--- a/syslinux/stuff/de.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP de-latin1.kbd
-display isolinux.msg
-SAY Now using de-latin1 keyboard and de_DE locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=de_DE kmap=de-latin1
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/de_CH.cfg
--- a/syslinux/stuff/de_CH.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP de_CH-latin1.kbd
-display isolinux.msg
-SAY Now using de_CH-latin1 keyboard and de_DE locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=de_DE kmap=de_CH-latin1
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/en.cfg
--- a/syslinux/stuff/en.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP uk.kbd
-display isolinux.msg
-SAY Now using uk keyboard and C locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=C kmap=uk
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/es.cfg
--- a/syslinux/stuff/es.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP es.kbd
-display isolinux.msg
-SAY Now using es keyboard and es_ES locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=es_ES kmap=es
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/fi.cfg
--- a/syslinux/stuff/fi.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP fi-latin1.kbd
-display isolinux.msg
-SAY Now using fi-latin1 keyboard and fi locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=fi kmap=fi-latin1
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/fr.cfg
--- a/syslinux/stuff/fr.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP fr-latin1.kbd
-display isolinux.msg
-SAY Now using fr-latin1 keyboard and fr_FR locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=fr_FR kmap=fr-latin1
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/fr_CH.cfg
--- a/syslinux/stuff/fr_CH.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP fr_CH-latin1.kbd
-display isolinux.msg
-SAY Now using fr_CH-latin1 keyboard and fr_FR locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=fr_FR kmap=fr_CH-latin1
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/hu.cfg
--- a/syslinux/stuff/hu.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP hu.kbd
-display isolinux.msg
-SAY Now using hu keyboard and hu locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=hu kmap=hu
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/it.cfg
--- a/syslinux/stuff/it.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP it.kbd
-display isolinux.msg
-SAY Now using it keyboard and it_IT locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=it_IT kmap=it
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/jp.cfg
--- a/syslinux/stuff/jp.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP jp106.kbd
-display isolinux.msg
-SAY Now using jp106 keyboard and jp_JP locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=jp_JP kmap=jp106
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/pt.cfg
--- a/syslinux/stuff/pt.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP pt-latin1.kbd
-display isolinux.msg
-SAY Now using pt-latin1 keyboard and pt_PT locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=pt_PT kmap=pt-latin1
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/ru.cfg
--- a/syslinux/stuff/ru.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP ru.kbd
-display isolinux.msg
-SAY Now using ru keyboard and ru_RU locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=ru_RU kmap=ru
-
-include common.inc
diff -r 6c45f6a1ee90 -r 7bb391a2d0a1 syslinux/stuff/us.cfg
--- a/syslinux/stuff/us.cfg	Tue Nov 18 12:40:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-KBDMAP us.kbd
-display isolinux.msg
-SAY Now using us keyboard and C locale.
-label slitaz
-	kernel /boot/bzImage
-	append initrd=/boot/rootfs.gz rw root=/dev/null vga=normal autologin lang=C kmap=us
-
-include common.inc