wok-6.x rev 18471

syslinux: receipt formatting (Pascal already removed lines, so it is :)
help.en: 4000 -> 5000 packages
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Oct 03 16:36:26 2015 +0300 (2015-10-03)
parents 78c5e0c52eb6
children b62f93de1a4e
files syslinux/receipt syslinux/stuff/help.en
line diff
     1.1 --- a/syslinux/receipt	Sat Oct 03 15:13:46 2015 +0200
     1.2 +++ b/syslinux/receipt	Sat Oct 03 16:36:26 2015 +0300
     1.3 @@ -10,6 +10,7 @@
     1.4  WEB_SITE="http://syslinux.zytor.com/"
     1.5  WGET_URL="https://www.kernel.org/pub/linux/utils/boot/syslinux/$TARBALL"
     1.6  CONFIG_FILES="/boot/isolinux"
     1.7 +TAGS="boot"
     1.8  
     1.9  DEPENDS="ipxe memtest"
    1.10  BUILD_DEPENDS="wget kbd-base perl nasm dev86 lzma mingw32-gcc upx posixovl \
    1.11 @@ -18,49 +19,49 @@
    1.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.13  compile_rules()
    1.14  {
    1.15 -    rm -f $src/core/isolinux.bin
    1.16 -    patch -p 0 < $stuff/extra/iso9660.u
    1.17 -    patch -p 0 < $stuff/extra/readconfig.u
    1.18 -    #patch -p 0 < $stuff/extra/fs.u
    1.19 -    cp $stuff/tools/isohybrid.sh .
    1.20 -    cp $stuff/extra/md5sum.c com32/modules
    1.21 -    grep -q md5sum.c32 com32/modules/Makefile ||
    1.22 -	sed -i 's/ifcpu64.c32/ifcpu64.c32 md5sum.c32/' com32/modules/Makefile
    1.23 -    export LDFLAGS=""
    1.24 -    make clean
    1.25 -    echo "make all: LDFLAGS=$LDFLAGS"
    1.26 -    make all 2>&1 | sed 's/NO_WERROR=1/NO_Werror=1/;/syslinux64.exe/d'
    1.27 -    echo "make core: LDFLAGS=$LDFLAGS"
    1.28 -    make -C core
    1.29 -    make -C com32
    1.30 -    ./isohybrid.sh --build
    1.31 -    sed -i 's/loadkeys -m/loadkeys -u -m/' utils/keytab-lilo	# for ru.kbd
    1.32 -    for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do
    1.33 -        [ "$(basename $(dirname $i))" = "include" ] && continue
    1.34 -        j=$(basename $i)
    1.35 -        j=${j%.map.gz}.kbd
    1.36 -        utils/keytab-lilo /usr/share/kbd/keymaps/i386/qwerty/us.map.gz $i > $j
    1.37 -    done
    1.38 -    cp -a $stuff/iso2exe .
    1.39 -    make -C iso2exe
    1.40 +	rm -f $src/core/isolinux.bin
    1.41 +	patch -p 0 < $stuff/extra/iso9660.u
    1.42 +	patch -p 0 < $stuff/extra/readconfig.u
    1.43 +	#patch -p 0 < $stuff/extra/fs.u
    1.44 +	cp $stuff/tools/isohybrid.sh .
    1.45 +	cp $stuff/extra/md5sum.c com32/modules
    1.46 +	grep -q md5sum.c32 com32/modules/Makefile ||
    1.47 +		sed -i 's/ifcpu64.c32/ifcpu64.c32 md5sum.c32/' com32/modules/Makefile
    1.48 +	export LDFLAGS=''
    1.49 +	make clean
    1.50 +	echo "make all: LDFLAGS=$LDFLAGS"
    1.51 +	make all 2>&1 | sed 's/NO_WERROR=1/NO_Werror=1/;/syslinux64.exe/d'
    1.52 +	echo "make core: LDFLAGS=$LDFLAGS"
    1.53 +	make -C core
    1.54 +	make -C com32
    1.55 +	./isohybrid.sh --build
    1.56 +	sed -i 's/loadkeys -m/loadkeys -u -m/' utils/keytab-lilo	# for ru.kbd
    1.57 +	for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do
    1.58 +		[ "$(basename $(dirname $i))" == 'include' ] && continue
    1.59 +		j=$(basename $i)
    1.60 +		j=${j%.map.gz}.kbd
    1.61 +		utils/keytab-lilo /usr/share/kbd/keymaps/i386/qwerty/us.map.gz $i > $j
    1.62 +	done
    1.63 +	cp -a $stuff/iso2exe .
    1.64 +	make -C iso2exe
    1.65  }
    1.66  
    1.67  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.68  genpkg_rules()
    1.69  {
    1.70 -    mkdir -p $fs/boot/isolinux
    1.71 -    cp -a $src/core/isolinux.bin $fs/boot/isolinux
    1.72 -    cp -a $src/com32/modules/md5sum.c32 $fs/boot/isolinux/c32box.c32
    1.73 -    cp -a $src/com32/menu/vesamenu.c32 $fs/boot/isolinux
    1.74 -    # $stuff/isolinux.msg is the old way the have a splash image.
    1.75 -    cp $stuff/*.cfg $stuff/*.txt $stuff/help.* $stuff/opts.* $fs/boot/isolinux
    1.76 -    rm -f $fs/boot/isolinux/common.cfg $fs/boot/isolinux/default.cfg
    1.77 -    rm -f $fs/boot/isolinux/display.txt
    1.78 -    ( cd $src ; ls *.kbd | cpio -o -H newc ) > $fs/boot/isolinux/cpio.kbd
    1.79 -    while read label kbd loc menu; do
    1.80 -        for i in ${kbd/,/ }; do
    1.81 -	        [ -e $src/$i.kbd ] || continue
    1.82 -		cat >> $fs/boot/isolinux/i18n.cfg <<EOT
    1.83 +	mkdir -p $fs/boot/isolinux
    1.84 +	cp -a $src/core/isolinux.bin $fs/boot/isolinux
    1.85 +	cp -a $src/com32/modules/md5sum.c32 $fs/boot/isolinux/c32box.c32
    1.86 +	cp -a $src/com32/menu/vesamenu.c32 $fs/boot/isolinux
    1.87 +	# $stuff/isolinux.msg is the old way the have a splash image.
    1.88 +	cp $stuff/*.cfg $stuff/*.txt $stuff/help.* $stuff/opts.* $fs/boot/isolinux
    1.89 +	rm -f $fs/boot/isolinux/common.cfg $fs/boot/isolinux/default.cfg
    1.90 +	rm -f $fs/boot/isolinux/display.txt
    1.91 +	( cd $src ; ls *.kbd | cpio -o -H newc ) > $fs/boot/isolinux/cpio.kbd
    1.92 +	while read label kbd loc menu; do
    1.93 +		for i in ${kbd/,/ }; do
    1.94 +			[ -e $src/$i.kbd ] || continue
    1.95 +			cat >> $fs/boot/isolinux/i18n.cfg <<EOT
    1.96  
    1.97  # ${kbd/,/.kbd or }.kbd keyboard
    1.98  LABEL $label
    1.99 @@ -68,9 +69,9 @@
   1.100  	com32 c32box.c32
   1.101  	append kbdmap cpio.kbd $i.kbd lang=$loc kmap=${kbd#*,}
   1.102  EOT
   1.103 -		break
   1.104 -	done
   1.105 -    done <<EOT
   1.106 +			break
   1.107 +		done
   1.108 +	done <<EOT
   1.109  br		br-abnt2	pt_BR	Brasil (abnt2)
   1.110  br_ac\ brac	us-acentos	pt_BR	Brasil (us-acentos)
   1.111  cz		cz-lat2		cs_CZ	Cesky
   1.112 @@ -104,24 +105,25 @@
   1.113  se		se-lat6		sv_SE	Svenska
   1.114  tr		trq		tr_TR	Turkce
   1.115  EOT
   1.116 -    cat >> $fs/boot/isolinux/i18n.cfg <<EOT
   1.117 +
   1.118 +	cat >> $fs/boot/isolinux/i18n.cfg <<EOT
   1.119  
   1.120  LABEL exit
   1.121  	MENU LABEL Back to main menu
   1.122  MENU EXIT
   1.123  MENU END
   1.124  EOT
   1.125 -    sed -i 's/^LABEL us$/&\n	MENU DEFAULT/' $fs/boot/isolinux/i18n.cfg
   1.126 -    for kbd in $(cd $src ; ls *.kbd); do
   1.127 -    	[ -s $src/$kbd ] || echo "Invalid file $kbd"
   1.128 -    	grep -q " $kbd " $fs/boot/isolinux/i18n.cfg && continue
   1.129 -    	echo "Missing: file $kbd"
   1.130 -    done
   1.131 -    chown root.root $fs/boot/isolinux/*
   1.132 +	sed -i 's/^LABEL us$/&\n	MENU DEFAULT/' $fs/boot/isolinux/i18n.cfg
   1.133 +	for kbd in $(cd $src ; ls *.kbd); do
   1.134 +		[ -s $src/$kbd ] || echo "Invalid file $kbd"
   1.135 +		grep -q " $kbd " $fs/boot/isolinux/i18n.cfg && continue
   1.136 +		echo "Missing: file $kbd"
   1.137 +	done
   1.138 +	chown root.root $fs/boot/isolinux/*
   1.139  }
   1.140  
   1.141  # Pre and post install commands for Tazpkg.
   1.142  post_install()
   1.143  {
   1.144 -    sed -i "s/XXXXXXXX/$(date +%Y%m%d)/" $1/boot/isolinux/isolinux.cfg
   1.145 +	sed -i "s/XXXXXXXX/$(date +%Y%m%d)/" $1/boot/isolinux/isolinux.cfg
   1.146  }
     2.1 --- a/syslinux/stuff/help.en	Sat Oct 03 15:13:46 2015 +0200
     2.2 +++ b/syslinux/stuff/help.en	Sat Oct 03 16:36:26 2015 +0300
     2.3 @@ -5,7 +5,7 @@
     2.4   SliTaz operates in RAM, it does not alter your current distribution.
     2.5   SliTaz runs a Linux kernel and free software from the GNU project.
     2.6   When launched, SliTaz gives you many useful commands, file handling,
     2.7 - the internet and more than 4000 installable packages from our repository.
     2.8 + the internet and more than 5000 installable packages from our repository.
     2.9  
    2.10   <F1>        Display this help file
    2.11   <F2>        Display SliTaz boot options