wok-stable diff syslinux/receipt @ rev 829

syslinux: fix keyboard, tip in splash screen
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat May 17 21:03:22 2008 +0000 (2008-05-17)
parents d6b2fcbc77d6
children 38e7dabd3c3e
line diff
     1.1 --- a/syslinux/receipt	Tue May 13 14:34:20 2008 +0000
     1.2 +++ b/syslinux/receipt	Sat May 17 21:03:22 2008 +0000
     1.3 @@ -13,20 +13,13 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  compile_rules()
     1.6  {
     1.7 -	cd $src
     1.8 -	sed "s|\\\$DEFAULT_PATH = .*|\$DEFAULT_PATH = \"$PWD\";|" \
     1.9 -		> mkkbd < keytab-lilo.pl
    1.10 -	chmod +x mkkbd
    1.11 -	for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz); do
    1.12 -		[ "$(dirname $i)" = "include" ] && continue
    1.13 -		j=$(basename $i)
    1.14 -		zcat /usr/share/kbd/keymaps/i386/$i > ${j%.gz}
    1.15 -	done
    1.16 -	for i in $(ls *.map); do
    1.17 -		i=$(basename $i)
    1.18 -		i=${i%.map}
    1.19 -		./mkkbd $i > $i.kbd
    1.20 -	done
    1.21 +    cd $src
    1.22 +    for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do
    1.23 +        [ "$(basename $(dirname $i))" = "include" ] && continue
    1.24 +        j=$(basename $i)
    1.25 +        j=${j%.map.gz}.kbd
    1.26 +        ./keytab-lilo.pl /usr/share/kbd/keymaps/i386/qwerty/us.map.gz $i > $j
    1.27 +    done
    1.28  }
    1.29  
    1.30  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.31 @@ -37,8 +30,10 @@
    1.32      cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux
    1.33      cp stuff/* $fs/boot/isolinux
    1.34      rm -r $fs/boot/isolinux/slitaz.* $fs/boot/isolinux/*.kbd 2> /dev/null
    1.35 -    for i in $(grep kbd$ $fs/boot/isolinux/*.cfg | cut -d' ' -f2); do
    1.36 -        cp $src/$i $fs/boot/isolinux
    1.37 +    grep kbd$ $fs/boot/isolinux/*.cfg | while read cfg kbd; do
    1.38 +        cfg=$(basename ${cfg%.cfg:*})
    1.39 +	sed -i "s/$kbd/$cfg.kbd/" $fs/boot/isolinux/$cfg.cfg
    1.40 +        cp $src/$kbd $fs/boot/isolinux/$cfg.kbd
    1.41      done
    1.42      chown root.root $fs/boot/isolinux/*
    1.43  }