# HG changeset patch # User Aleksej Bobylev # Date 1486593755 -7200 # Node ID 67cf55bc903bdedb35793e9b7ea448e79fbc8fe8 # Parent 0b2945245647831797ddb3d11ffb0d4ac256e81a kbd: return kbd-vlock, pam is updated now. diff -r 0b2945245647 -r 67cf55bc903b kbd-busybox/receipt --- a/kbd-busybox/receipt Wed Feb 08 19:00:41 2017 +0100 +++ b/kbd-busybox/receipt Thu Feb 09 00:42:35 2017 +0200 @@ -17,6 +17,7 @@ mkdir -p $fs/usr/share/kmap for i in $(find /usr/share/kbd/keymaps/i386 -name '*.map.gz' | grep -v 'include'); do + echo $i loadkeys -ub $i > $fs/usr/share/kmap/$(basename $i .map.gz).kmap done } diff -r 0b2945245647 -r 67cf55bc903b kbd-vlock/receipt --- a/kbd-vlock/receipt Wed Feb 08 19:00:41 2017 +0100 +++ b/kbd-vlock/receipt Thu Feb 09 00:42:35 2017 +0200 @@ -15,6 +15,5 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin - cp -a $install/usr/bin/vlock $fs/usr/bin + cook_copy_files vlock } diff -r 0b2945245647 -r 67cf55bc903b kbd/receipt --- a/kbd/receipt Wed Feb 08 19:00:41 2017 +0100 +++ b/kbd/receipt Thu Feb 09 00:42:35 2017 +0200 @@ -14,8 +14,8 @@ WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL" DEPENDS="kbd-base" -BUILD_DEPENDS="check-dev bison flex gettext advancecomp" -SPLIT="kbd-base kbd-busybox" +BUILD_DEPENDS="check-dev bison flex gettext patch pam-dev" +SPLIT="kbd-base kbd-busybox kbd-vlock" # Handle cross compilation. case "$ARCH" in @@ -37,7 +37,6 @@ ./configure \ --datadir=/usr/share/kbd \ - --disable-vlock \ $CONFIGURE_ARGS && make && make install @@ -46,24 +45,14 @@ mkdir -p $install/usr/share/doc/kbd-$VERSION cp -R docs/doc/* $install/usr/share/doc/kbd-$VERSION - if [ -n "$(which advdef)" ]; then - action 'Recompressing GZ files...' - local size0=$(find $install/usr/share/kbd -name '*.gz' -exec ls -l \{\} \; | awk '{s+=$5}END{print s}') - local time0=$(date +%s) - find $install/usr/share/kbd -name '*.gz' -exec advdef -z4q \{\} \; - local size1=$(find $install/usr/share/kbd -name '*.gz' -exec ls -l \{\} \; | awk '{s+=$5}END{print s}') - local time1=$(date +%s) - status - comp_summary "$time0" "$time1" "$size0" "$size1" - fi - - # Cook "kbd-base" before "kbd" packaging to properly work cook_split_rm() - cook kbd-base >/dev/null 2>&1 + # Cook packages before "kbd" packaging to properly work cook_split_rm() + cook kbd-base >/dev/null 2>&1 + cook kbd-vlock >/dev/null 2>&1 } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { cook_copy_folders bin kbd - cook_split_rm kbd-base + cook_split_rm kbd-base kbd-vlock }