[arch-commits] CVS update of core/base/klibc-kbd (PKGBUILD keymap_hook keymap_install)
Roman Kyrylych
roman at archlinux.org
Sun Mar 16 19:12:07 UTC 2008
Date: Sunday, March 16, 2008 @ 15:12:07
Author: roman
Path: /home/cvs-core/core/base/klibc-kbd
Modified: PKGBUILD (1.1 -> 1.2) keymap_hook (1.1 -> 1.2)
keymap_install (1.1 -> 1.2)
upgpkg: klibc-kbd 1.15.20080312-2
----------------+
PKGBUILD | 14 ++++++------
keymap_hook | 16 +++++++-------
keymap_install | 62 +++++++++++++++++++++++++++----------------------------
3 files changed, 46 insertions(+), 46 deletions(-)
Index: core/base/klibc-kbd/PKGBUILD
diff -u core/base/klibc-kbd/PKGBUILD:1.1 core/base/klibc-kbd/PKGBUILD:1.2
--- core/base/klibc-kbd/PKGBUILD:1.1 Sat Mar 15 16:33:02 2008
+++ core/base/klibc-kbd/PKGBUILD Sun Mar 16 15:12:06 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.1 2008/03/15 20:33:02 roman Exp $
+# $Id: PKGBUILD,v 1.2 2008/03/16 19:12:06 roman Exp $
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=klibc-kbd
pkgver=1.15.20080312
-pkgrel=1
+pkgrel=2
pkgdesc="Keytable files and keyboard utilities"
arch=('i686' 'x86_64')
url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
@@ -19,8 +19,8 @@
md5sums=('709b087bb9d6c073bade70eda2da7770'
'53e9612ac5fc1b23601f793410742ed3'
'8c1bec330e8c98355502ac861561667d'
- 'f72db8d5ea8d4c1868c7d1da4b8b1c7b'
- '737f2e59052946283a9e7cdc0f1e2257')
+ '43e239fdb252bdcca84471a2e10f1f11'
+ '85457e44dfd7046224e87f0add8da4b2')
build() {
cd ${startdir}/src
@@ -36,9 +36,9 @@
cd src/
make kbd_mode loadkeys setfont || return 1
- install -D loadkeys ${startdir}/pkg/usr/lib/klibc/bin/loadkeys
- install -D kbd_mode ${startdir}/pkg/usr/lib/klibc/bin/kbd_mode
- install -D setfont ${startdir}/pkg/usr/lib/klibc/bin/setfont
+ install -D loadkeys ${startdir}/pkg/lib/initcpio/kbd/loadkeys
+ install -D kbd_mode ${startdir}/pkg/lib/initcpio/kbd/kbd_mode
+ install -D setfont ${startdir}/pkg/lib/initcpio/kbd/setfont
# install hook
install -Dm644 ${startdir}/src/keymap_hook ${startdir}/pkg/lib/initcpio/hooks/keymap
install -Dm644 ${startdir}/src/keymap_install ${startdir}/pkg/lib/initcpio/install/keymap
Index: core/base/klibc-kbd/keymap_hook
diff -u core/base/klibc-kbd/keymap_hook:1.1 core/base/klibc-kbd/keymap_hook:1.2
--- core/base/klibc-kbd/keymap_hook:1.1 Sat Mar 15 16:33:02 2008
+++ core/base/klibc-kbd/keymap_hook Sun Mar 16 15:12:06 2008
@@ -3,23 +3,23 @@
{
msg -n ":: Loading keymap..."
. /keymap
- if [ "$UTF8" = "yes" ]; then
+ if [ "${UTF8}" = "yes" ]; then
/bin/kbd_mode -u
printf "\033%%G" >> /dev/console
- [ -n "$KEYMAP" ] && /bin/loadkeys -q -u $KEYMAP
+ [ -n "${KEYMAP}" ] && /bin/loadkeys -q -u ${KEYMAP}
else
/bin/kbd_mode -a
printf "\033%%@" >> /dev/console
- [ -n "$KEYMAP" ] && /bin/loadkeys -q $KEYMAP
+ [ -n "${KEYMAP}" ] && /bin/loadkeys -q ${KEYMAP}
fi
- if [ -n "$CONSOLEFONT" ]; then
- if [ "$UTF8" = "yes" ]; then
+ if [ -n "${CONSOLEFONT}" ]; then
+ if [ "${UTF8}" = "yes" ]; then
CONSOLEMAP=""
fi
- if [ -n "$CONSOLEMAP" ]; then
- /bin/setfont -m $CONSOLEMAP $CONSOLEFONT -C /dev/console
+ if [ -n "${CONSOLEMAP}" ]; then
+ /bin/setfont -m ${CONSOLEMAP} ${CONSOLEFONT} -C /dev/console
else
- /bin/setfont $CONSOLEFONT -C /dev/console
+ /bin/setfont ${CONSOLEFONT} -C /dev/console
fi
printf "\033(K" >> /dev/console
fi
Index: core/base/klibc-kbd/keymap_install
diff -u core/base/klibc-kbd/keymap_install:1.1 core/base/klibc-kbd/keymap_install:1.2
--- core/base/klibc-kbd/keymap_install:1.1 Sat Mar 15 16:33:02 2008
+++ core/base/klibc-kbd/keymap_install Sun Mar 16 15:12:06 2008
@@ -3,15 +3,15 @@
# this is needed because kbd utilities compiled with klibc cannot use gunzip
add_ucfile ()
{
- temp=$(mktemp)
- dest=$(echo "$1" | sed 's|/usr||' | sed 's|.gz||')
- name=$(echo "$1" | sed 's|.*/||')
+ temp=$(mktemp ${TMPDIR}/kbd.XXXX)
+ dest=$(echo "${1}" | sed 's|/usr||' | sed 's|.gz||')
+ name=$(echo "${1}" | sed 's|.*/||')
- if [ $(echo "$1" | grep '.gz$') ]; then
- gunzip -c $1 > $temp
- add_file $temp $dest
+ if [ $(echo "${1}" | grep '.gz$') ]; then
+ gunzip -c ${1} > ${temp}
+ add_file ${temp} ${dest}
else
- add_file $1 $dest
+ add_file ${1} ${dest}
fi
}
@@ -21,43 +21,43 @@
BINARIES=""
FILES=""
SCRIPT="keymap"
- KEYMAP_FILE="$(mktemp /tmp/keymap.XXXXXX)"
- add_file /usr/lib/klibc/bin/loadkeys /bin/loadkeys
- add_file /usr/lib/klibc/bin/kbd_mode /bin/kbd_mode
- add_file /usr/lib/klibc/bin/setfont /bin/setfont
- . /etc/rc.conf
- echo "KEYMAP='$KEYMAP'" >> ${KEYMAP_FILE}
- echo "CONSOLEFONT='$CONSOLEFONT'" >> ${KEYMAP_FILE}
- echo "CONSOLEMAP='$CONSOLEMAP'" >> ${KEYMAP_FILE}
- if [ -n "$(echo $LOCALE | grep -i utf)" ]; then
+ KEYMAP_FILE="$(mktemp ${TMPDIR}/keymap.XXXXXX)"
+ add_file /lib/initcpio/kbd/loadkeys /bin/loadkeys
+ add_file /lib/initcpio/kbd/kbd_mode /bin/kbd_mode
+ add_file /lib/initcpio/kbd/setfont /bin/setfont
+ eval "$(grep -e "^LOCALE=" -e "^KEYMAP=" -e "^CONSOLEFONT=" -e "^CONSOLEMAP=" /etc/rc.conf)"
+ echo "KEYMAP='${KEYMAP}'" >> ${KEYMAP_FILE}
+ echo "CONSOLEFONT='${CONSOLEFONT}'" >> ${KEYMAP_FILE}
+ echo "CONSOLEMAP='${CONSOLEMAP}'" >> ${KEYMAP_FILE}
+ if [ -n "$(echo ${LOCALE} | grep -i utf)" ]; then
echo "UTF8='yes'" >> ${KEYMAP_FILE}
fi
. ${KEYMAP_FILE}
add_file ${KEYMAP_FILE} /keymap
- if [ -n "$KEYMAP" ]; then
- for i in $(echo $KEYMAP); do
- for j in $(find /usr/share/kbd/keymaps -name "$i.map.gz"); do
- add_ucfile $j
+ if [ -n "${KEYMAP}" ]; then
+ for i in $(echo ${KEYMAP}); do
+ for j in $(find /usr/share/kbd/keymaps -name "${i}.map.gz"); do
+ add_ucfile ${j}
done
done
for i in $(echo /usr/share/kbd/keymaps/include/*); do
- add_ucfile $i
+ add_ucfile ${i}
done
for i in $(echo /usr/share/kbd/keymaps/*/include/*); do
- add_ucfile $i
+ add_ucfile ${i}
done
fi
- if [ -n "$CONSOLEFONT" ]; then
- for i in $(find /usr/share/kbd/consolefonts -name "$CONSOLEFONT.*gz"); do
- add_ucfile $i
+ if [ -n "${CONSOLEFONT}" ]; then
+ for i in $(find /usr/share/kbd/consolefonts -name "${CONSOLEFONT}.*gz"); do
+ add_ucfile ${i}
done
fi
- if [ -n "$CONSOLEMAP" ]; then
- for i in $(find /usr/share/kbd/unimaps -name "$CONSOLEMAP.uni"); do
- add_ucfile $i
+ if [ -n "${CONSOLEMAP}" ]; then
+ for i in $(find /usr/share/kbd/unimaps -name "${CONSOLEMAP}.uni"); do
+ add_ucfile ${i}
done
- for i in $(find /usr/share/kbd/consoletrans -name "$CONSOLEMAP.trans" -o -name "$CONSOLEMAP"); do
- add_ucfile $i
+ for i in $(find /usr/share/kbd/consoletrans -name "${CONSOLEMAP}.trans" -o -name "${CONSOLEMAP}"); do
+ add_ucfile ${i}
done
fi
}
@@ -65,7 +65,7 @@
help ()
{
cat<<HELPEOF
- This hook loads the specified keymap and consolefont from rc.conf,
+ This hook loads keymap(s) and consolefont specified in rc.conf
during early userspace.
HELPEOF
}
More information about the arch-commits
mailing list