[oe-commits] Mark Hatle : kbd: Use update-alternatives
git at git.openembedded.org
git at git.openembedded.org
Tue Apr 24 10:47:31 UTC 2012
Module: openembedded-core.git
Branch: master-next
Commit: 5b4448b9b2ed3cc112a76b1223f603e6fac4368a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5b4448b9b2ed3cc112a76b1223f603e6fac4368a
Author: Mark Hatle <mark.hatle at windriver.com>
Date: Mon Apr 16 12:17:28 2012 -0500
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 at windriver.com>
---
meta/recipes-core/kbd/kbd_1.15.2.bb | 34 +++++++---------------------------
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 eea04a0..99a6a50 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())}"
More information about the Openembedded-commits
mailing list