summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-04-16 12:17:28 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-24 15:51:33 +0100
commit728569a3db005a935e6b08d6aac3e23e88d486df (patch)
tree9f15ab927173c5729f086943b33579c777073621 /meta
parente0626a0270fb0f4ff128e761c13d44162723434c (diff)
downloadopenembedded-core-728569a3db005a935e6b08d6aac3e23e88d486df.tar.gz
openembedded-core-728569a3db005a935e6b08d6aac3e23e88d486df.tar.bz2
openembedded-core-728569a3db005a935e6b08d6aac3e23e88d486df.tar.xz
openembedded-core-728569a3db005a935e6b08d6aac3e23e88d486df.zip
kbd: Use update-alternatives
Change to use ALTERNATIVE_LINKS from update-alternatives. This ensures the links are created consistently and the package provides are correct. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/kbd/kbd_1.15.2.bb34
1 files changed, 7 insertions, 27 deletions
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
index eea04a075..99a6a5098 100644
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -10,7 +10,7 @@ RREPLACES_${PN} = "console-tools"
RPROVIDES_${PN} = "console-tools"
RCONFLICTS_${PN} = "console-tools"
-PR = "r2"
+PR = "r3"
SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
@@ -23,29 +23,9 @@ FILES_${PN}-consoletrans = "${datadir}/consoletrans"
FILES_${PN}-keymaps = "${datadir}/keymaps"
FILES_${PN}-unimaps = "${datadir}/unimaps"
-ALTERNATIVE_NAMES_USRBIN = "chvt deallocvt fgconsole openvt"
-
-do_install_append() {
- usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
- for p in $usrbinprogs_a; do
- if [ -f "${D}${bindir}/$p" ]; then
- mv "${D}${bindir}/$p" "${D}${bindir}/$p.${PN}"
- fi
- done
-}
-
-pkg_postinst_${PN} () {
- usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
- for p in $usrbinprogs_a; do
- if [ -f "$D${bindir}/$p" ]; then
- update-alternatives --install ${bindir}/$p $p $p.${PN} 100
- fi
- done
-}
-
-pkg_postrm_${PN} () {
- usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
- for p in $usrbinprogs_a; do
- update-alternatives --remove $p $p.${PN}
- done
-}
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+
+bindir_progs = "chvt deallocvt fgconsole openvt"
+ALTERNATIVE_LINKS = "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"