diff options
author | Peter Marko <peter.marko@siemens.com> | 2024-04-12 18:57:12 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-14 06:28:02 +0100 |
commit | c31b13d122c52263d242cf92112aea94955d176f (patch) | |
tree | 32cdfcce3d51b7d8cac77529009fbc86df67df1e /meta/recipes-core | |
parent | 0900258689537add2dfaf1d01b71e49939020234 (diff) | |
download | poky-c31b13d122c52263d242cf92112aea94955d176f.tar.gz |
kbd: split gpl-3 keymap to separate package
Pine keymap was added with GPL-3 license.
https://github.com/legionus/kbd/commit/1589e9e1019756b5287b41dddcd7285271c5990e
Split this GPL-3 keymap and install it via recommendation
so it is easy to remove it by excluding recommendations.
(From OE-Core rev: b81145b61cfc21940fe7204fcaf8b5e84a5a938a)
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.6.4.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.6.4.bb index 790055aa96..1a7b6b552b 100644 --- a/meta/recipes-core/kbd/kbd_2.6.4.bb +++ b/meta/recipes-core/kbd/kbd_2.6.4.bb | |||
@@ -24,13 +24,16 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ | |||
24 | 24 | ||
25 | PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," | 25 | PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," |
26 | 26 | ||
27 | PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" | 27 | PACKAGES += "${PN}-consolefonts ${PN}-keymaps-pine ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" |
28 | 28 | ||
29 | FILES:${PN}-consolefonts = "${datadir}/consolefonts" | 29 | FILES:${PN}-consolefonts = "${datadir}/consolefonts" |
30 | FILES:${PN}-consoletrans = "${datadir}/consoletrans" | 30 | FILES:${PN}-consoletrans = "${datadir}/consoletrans" |
31 | FILES:${PN}-keymaps-pine = "${datadir}/keymaps/pine" | ||
31 | FILES:${PN}-keymaps = "${datadir}/keymaps" | 32 | FILES:${PN}-keymaps = "${datadir}/keymaps" |
32 | FILES:${PN}-unimaps = "${datadir}/unimaps" | 33 | FILES:${PN}-unimaps = "${datadir}/unimaps" |
33 | 34 | ||
35 | RRECOMMENDS:${PN}-keymaps = "${PN}-keymaps-pine" | ||
36 | |||
34 | do_install:append () { | 37 | do_install:append () { |
35 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ | 38 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ |
36 | && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then | 39 | && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then |