wok-next rev 19629
kbd: return kbd-vlock, pam is updated now.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Thu Feb 09 00:42:35 2017 +0200 (2017-02-09) |
parents | 0b2945245647 |
children | c1675701c99f |
files | kbd-busybox/receipt kbd-vlock/receipt kbd/receipt |
line diff
1.1 --- a/kbd-busybox/receipt Wed Feb 08 19:00:41 2017 +0100 1.2 +++ b/kbd-busybox/receipt Thu Feb 09 00:42:35 2017 +0200 1.3 @@ -17,6 +17,7 @@ 1.4 mkdir -p $fs/usr/share/kmap 1.5 1.6 for i in $(find /usr/share/kbd/keymaps/i386 -name '*.map.gz' | grep -v 'include'); do 1.7 + echo $i 1.8 loadkeys -ub $i > $fs/usr/share/kmap/$(basename $i .map.gz).kmap 1.9 done 1.10 }
2.1 --- a/kbd-vlock/receipt Wed Feb 08 19:00:41 2017 +0100 2.2 +++ b/kbd-vlock/receipt Thu Feb 09 00:42:35 2017 +0200 2.3 @@ -15,6 +15,5 @@ 2.4 # Rules to gen a SliTaz package suitable for Tazpkg. 2.5 genpkg_rules() 2.6 { 2.7 - mkdir -p $fs/usr/bin 2.8 - cp -a $install/usr/bin/vlock $fs/usr/bin 2.9 + cook_copy_files vlock 2.10 }
3.1 --- a/kbd/receipt Wed Feb 08 19:00:41 2017 +0100 3.2 +++ b/kbd/receipt Thu Feb 09 00:42:35 2017 +0200 3.3 @@ -14,8 +14,8 @@ 3.4 WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL" 3.5 3.6 DEPENDS="kbd-base" 3.7 -BUILD_DEPENDS="check-dev bison flex gettext advancecomp" 3.8 -SPLIT="kbd-base kbd-busybox" 3.9 +BUILD_DEPENDS="check-dev bison flex gettext patch pam-dev" 3.10 +SPLIT="kbd-base kbd-busybox kbd-vlock" 3.11 3.12 # Handle cross compilation. 3.13 case "$ARCH" in 3.14 @@ -37,7 +37,6 @@ 3.15 3.16 ./configure \ 3.17 --datadir=/usr/share/kbd \ 3.18 - --disable-vlock \ 3.19 $CONFIGURE_ARGS && 3.20 make && make install 3.21 3.22 @@ -46,24 +45,14 @@ 3.23 mkdir -p $install/usr/share/doc/kbd-$VERSION 3.24 cp -R docs/doc/* $install/usr/share/doc/kbd-$VERSION 3.25 3.26 - if [ -n "$(which advdef)" ]; then 3.27 - action 'Recompressing GZ files...' 3.28 - local size0=$(find $install/usr/share/kbd -name '*.gz' -exec ls -l \{\} \; | awk '{s+=$5}END{print s}') 3.29 - local time0=$(date +%s) 3.30 - find $install/usr/share/kbd -name '*.gz' -exec advdef -z4q \{\} \; 3.31 - local size1=$(find $install/usr/share/kbd -name '*.gz' -exec ls -l \{\} \; | awk '{s+=$5}END{print s}') 3.32 - local time1=$(date +%s) 3.33 - status 3.34 - comp_summary "$time0" "$time1" "$size0" "$size1" 3.35 - fi 3.36 - 3.37 - # Cook "kbd-base" before "kbd" packaging to properly work cook_split_rm() 3.38 - cook kbd-base >/dev/null 2>&1 3.39 + # Cook packages before "kbd" packaging to properly work cook_split_rm() 3.40 + cook kbd-base >/dev/null 2>&1 3.41 + cook kbd-vlock >/dev/null 2>&1 3.42 } 3.43 3.44 # Rules to gen a SliTaz package suitable for Tazpkg. 3.45 genpkg_rules() 3.46 { 3.47 cook_copy_folders bin kbd 3.48 - cook_split_rm kbd-base 3.49 + cook_split_rm kbd-base kbd-vlock 3.50 }