]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
kbd: split gpl-3 keymap to separate package
authorPeter Marko <peter.marko@siemens.com>
Fri, 12 Apr 2024 16:57:12 +0000 (18:57 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 14 Apr 2024 05:25:47 +0000 (06:25 +0100)
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.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/kbd/kbd_2.6.4.bb

index 790055aa96f44c2fba6591b95fcf31acb891141c..1a7b6b552baf6e81ea056873e834b1e5298ccf00 100644 (file)
@@ -24,13 +24,16 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
 
 PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
 
-PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
+PACKAGES += "${PN}-consolefonts ${PN}-keymaps-pine ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
 
 FILES:${PN}-consolefonts = "${datadir}/consolefonts"
 FILES:${PN}-consoletrans = "${datadir}/consoletrans"
+FILES:${PN}-keymaps-pine = "${datadir}/keymaps/pine"
 FILES:${PN}-keymaps = "${datadir}/keymaps"
 FILES:${PN}-unimaps = "${datadir}/unimaps"
 
+RRECOMMENDS:${PN}-keymaps = "${PN}-keymaps-pine"
+
 do_install:append () {
     if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \
     && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then