From patchwork Mon Nov 14 04:28:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 15/21] kbd: use u-a for chvt, deallocvt, fgconssole, openvt, conflicts with busybox Date: Mon, 14 Nov 2011 04:28:05 -0000 From: Saul Wold X-Patchwork-Id: 14929 Message-Id: <230fcb126bc77e69e5f1ec1515a0c2a981b6c542.1321244755.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Martin Jansa Signed-off-by: Martin Jansa --- meta/recipes-core/kbd/kbd_1.15.2.bb | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb index 2e0406b..eea04a0 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 = "r1" +PR = "r2" SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2" SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5" @@ -22,3 +22,30 @@ FILES_${PN}-consolefonts = "${datadir}/consolefonts" 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 +}