From 48621dc693b5f63419e042ab5dd21ea12ce05f67 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 7 Oct 2013 11:14:30 -0700 Subject: kbd: Update to 2.0.0 Removed patch that is now included upstream, add DEPENDS on check since it is now used to create. Additional added PACKAGECONFIG for PAM and --disbale-vlock License checksum updated to reflect additional Copyright owners names. Signed-off-by: Saul Wold --- .../kbd-1.15.2/Allow-resizecons-on-x86_64.patch | 28 ------------------ meta/recipes-core/kbd/kbd_1.15.2.bb | 32 --------------------- meta/recipes-core/kbd/kbd_2.0.0.bb | 33 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch delete mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb create mode 100644 meta/recipes-core/kbd/kbd_2.0.0.bb diff --git a/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch b/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch deleted file mode 100644 index 1a49846972..0000000000 --- a/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-status: Accepted -This patch had accepted at kdb-1.5.4 - -From e069cfa96b41a6714118e15496cdd6b83fc16ad2 Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov -Date: Mon, 27 Feb 2012 14:30:50 +0400 -Subject: [PATCH] Allow resizecons on x86_64 - -Signed-off-by: Alexey Gladkov ---- - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a8115ed..b58f3bd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,6 +62,7 @@ AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes") - - case $host_cpu in - i?86*) RESIZECONS_PROGS=yes ;; -+ x86_64*) RESIZECONS_PROGS=yes ;; - *) RESIZECONS_PROGS=no ;; - esac - AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes") --- -1.7.1 - diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb deleted file mode 100644 index a150ff1b54..0000000000 --- a/meta/recipes-core/kbd/kbd_1.15.2.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "This package contains keytable files and keyboard utilities" -# everything minus console-fonts is GPLv2+ -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb" - -inherit autotools gettext - -BBCLASSEXTEND = "native" -RREPLACES_${PN} = "console-tools" -RPROVIDES_${PN} = "console-tools" -RCONFLICTS_${PN} = "console-tools" - -PR = "r4" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2 \ - file://Allow-resizecons-on-x86_64.patch" - -SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5" -SRC_URI[sha256sum] = "b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6" - -PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" - -FILES_${PN}-consolefonts = "${datadir}/consolefonts" -FILES_${PN}-consoletrans = "${datadir}/consoletrans" -FILES_${PN}-keymaps = "${datadir}/keymaps" -FILES_${PN}-unimaps = "${datadir}/unimaps" - -inherit update-alternatives - - -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt" -ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-core/kbd/kbd_2.0.0.bb b/meta/recipes-core/kbd/kbd_2.0.0.bb new file mode 100644 index 0000000000..eafa0b0d03 --- /dev/null +++ b/meta/recipes-core/kbd/kbd_2.0.0.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "This package contains keytable files and keyboard utilities" +# everything minus console-fonts is GPLv2+ +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5" +DEPENDS = "check" + +inherit autotools gettext ptest + +RREPLACES_${PN} = "console-tools" +RPROVIDES_${PN} = "console-tools" +RCONFLICTS_${PN} = "console-tools" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2" + +SRC_URI[md5sum] = "1d9bbc36506b8c25740d028b0f6d2839" +SRC_URI[sha256sum] = "f5eb125d5154bc0fe6f38175de9fcd394879485dadbba75c350d4ab050684a42" + +PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," + +PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" + +FILES_${PN}-consolefonts = "${datadir}/consolefonts" +FILES_${PN}-consoletrans = "${datadir}/consoletrans" +FILES_${PN}-keymaps = "${datadir}/keymaps" +FILES_${PN}-unimaps = "${datadir}/unimaps" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt" +ALTERNATIVE_PRIORITY = "100" + +BBCLASSEXTEND = "native" -- cgit v1.2.3