wok-6.x diff syslinux/receipt @ rev 12287

syslinux: merge md5sum, kbdmap and linux. kbdmap will append the kernel cmdline
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Apr 15 17:51:38 2012 +0200 (2012-04-15)
parents af17de69f535
children 04df72fcbe66
line diff
     1.1 --- a/syslinux/receipt	Sat Apr 14 11:50:03 2012 +0200
     1.2 +++ b/syslinux/receipt	Sun Apr 15 17:51:38 2012 +0200
     1.3 @@ -36,37 +36,58 @@
     1.4  {
     1.5      mkdir -p $fs/boot/isolinux
     1.6      cp -a $src/core/isolinux.bin $fs/boot/isolinux
     1.7 -    cp -a $src/com32/modules/md5sum.c32 $fs/boot/isolinux
     1.8 +    cp -a $src/com32/modules/md5sum.c32 $fs/boot/isolinux/c32box.c32
     1.9      cp -a $src/com32/menu/vesamenu.c32 $fs/boot/isolinux
    1.10      # $stuff/isolinux.msg is the old way the have a splash image.
    1.11      cp $stuff/*.cfg $stuff/*.txt $stuff/help.* $stuff/opts.* $fs/boot/isolinux
    1.12 -    while read cfg kbd loc ; do
    1.13 -        sed -e "s/^display/kbdmap $cfg.kbd\ndisplay/" \
    1.14 -            -e "s/^label/say Now using $kbd keyboard and $loc locale.\nlabel/" \
    1.15 -            -e "s/rootfs.gz/rootfs.gz lang=$loc kmap=$kbd/" \
    1.16 -	        < $fs/boot/isolinux/default.cfg > $fs/boot/isolinux/$cfg.cfg
    1.17 -        cp $src/$kbd.kbd $fs/boot/isolinux/$cfg.kbd
    1.18 -	cat >> $fs/boot/isolinux/common.cfg <<EOT
    1.19 -label $cfg
    1.20 -	config $cfg.cfg
    1.21 +    ( cd $src ; ls *.kbd | cpio -o -H newc ) > $fs/boot/isolinux/cpio.kbd
    1.22 +    while read label kbd loc menu; do
    1.23 +        [ -s $src/$kbd.kbd ] || continue
    1.24 +	cat >> $fs/boot/isolinux/i18n.cfg <<EOT
    1.25 +
    1.26 +LABEL $label
    1.27 +	MENU LABEL $menu
    1.28 +	com32 c32box.c32
    1.29 +	append kbdmap cpio.kbd $kbd.kbd lang=$loc kmap=$kbd
    1.30  EOT
    1.31      done <<EOT
    1.32 -be    be-latin1    fr_FR
    1.33 -br    br-abnt2     pt_PT
    1.34 -ca    cf           fr_FR
    1.35 -de    de-latin1    de_DE
    1.36 -de_CH de_CH-latin1 de_DE
    1.37 -en    uk           C
    1.38 -es    es           es_ES
    1.39 -fi    fi-latin1    fi
    1.40 -fr    fr-latin1    fr_FR
    1.41 -fr_CH fr_CH-latin1 fr_FR
    1.42 -hu    hu           hu
    1.43 -it    it           it_IT
    1.44 -jp    jp106        jp_JP
    1.45 -pt    pt-latin1    pt_PT
    1.46 -ru    ru           ru_RU
    1.47 -us    us           C
    1.48 +cr		croat		hr_HR	Hvratski
    1.49 +cz		cz-lat2		cs_CZ	Cesky
    1.50 +de		de-latin1	de_DE	Deutsch
    1.51 +de_CH\ deCH	de_CH-latin1	de_DE	Deutsch Schweitz
    1.52 +dk		dk-latin1	da_DK	Dansk
    1.53 +en		uk		C	English UK
    1.54 +us		us		C	English US
    1.55 +us_ac\ usac	us-acentos	C	English US (acentos)
    1.56 +us_dv\ usdv	dvorak		C	English US (dvorak)
    1.57 +us_dl\ usdl	dvorak-l	C	English US (dvorak-l)
    1.58 +us_dr\ usdr	dvorak-r	C	English US (dvorak-r)
    1.59 +es		es		es_ES	Espanol
    1.60 +fr		fr-latin1	fr_FR	Francais
    1.61 +be		be-latin1	fr_FR	Francais Belgique
    1.62 +ca		cf		fr_FR	Francais Canada
    1.63 +fr_CH\ frCH	fr_CH-latin1	fr_FR	Francais Suisse
    1.64 +fi		fi-latin1	fi	Suomi
    1.65 +is		is-latin1	is_IS	Islenska
    1.66 +it		it		it_IT	Italiano
    1.67 +no		no-latin1	nb_NO	Norske
    1.68 +jp		jp106		jp_JP	Japanese
    1.69 +hu		hu		hu	Magyar
    1.70 +po		pl2		pl_PL	Polski
    1.71 +br		br-abnt2	pt_PT	Brazil
    1.72 +pt		pt-latin1	pt_PT	Portugues
    1.73 +ru		ru		ru_RU	Russian
    1.74 +se		se-lat6		sv_SE	Svenskt
    1.75 +sl		slovene		sl_SI	Slovenski
    1.76 +tr		tr_q-latin5	tr_TR	Turk
    1.77 +EOT
    1.78 +# Missing: nl2 ru sg-latin1 trq
    1.79 +    cat >> $fs/boot/isolinux/i18n.cfg <<EOT
    1.80 +
    1.81 +LABEL exit
    1.82 +	MENU LABEL Back to main menu
    1.83 +MENU EXIT
    1.84 +MENU END
    1.85  EOT
    1.86      chown root.root $fs/boot/isolinux/*
    1.87  }
    1.88 @@ -75,7 +96,4 @@
    1.89  post_install()
    1.90  {
    1.91      sed -i "s/XXXXXXXX/$(date +%Y%m%d)/" $1/boot/isolinux/isolinux.cfg
    1.92 -    for i in ifmem reboot poweroff; do
    1.93 -    	ln $fs/boot/isolinux/md5sum.c32 $fs/boot/isolinux/$i.c32
    1.94 -    done
    1.95  }