summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2021-01-07 09:03:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-08 10:10:15 +0000
commitc8910dd028eab6d3bda9d73ff8629eadd4ba34b4 (patch)
tree97c182fba9f3b23442e16a9dc3e7078aedaa87f2
parent9efd66ad10d1ca4ba941ee23b212ab7c5d42f42d (diff)
downloadpoky-c8910dd028eab6d3bda9d73ff8629eadd4ba34b4.tar.gz
kbd: fix transaction conflict
After kdb upgrades to 2.4.0, vlock.pamd will be copied to /etc/pam.d/vlock when install as [1]. And it will result in below Transaction error during do_rootfs when both vlock and kbd installed: | Transaction test error: file /etc/pam.d/vlock conflicts between attempted installs of vlock-2.2.3-r0.corei7_64 and kbd-2.4.0-r0.corei7_64 So rename vlock to vlock.kbd to fix the gap. [1] https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/commit/?id=b9cbb05038e01a7c4b3899589c591734e643a281 (From OE-Core rev: 315f2453515a4cd0f1cc2d1bdddeb0c385aee2d4) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/kbd/kbd_2.4.0.bb7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/recipes-core/kbd/kbd_2.4.0.bb b/meta/recipes-core/kbd/kbd_2.4.0.bb
index 4d32263e84..65ba70bf47 100644
--- a/meta/recipes-core/kbd/kbd_2.4.0.bb
+++ b/meta/recipes-core/kbd/kbd_2.4.0.bb
@@ -29,6 +29,13 @@ FILES_${PN}-consoletrans = "${datadir}/consoletrans"
29FILES_${PN}-keymaps = "${datadir}/keymaps" 29FILES_${PN}-keymaps = "${datadir}/keymaps"
30FILES_${PN}-unimaps = "${datadir}/unimaps" 30FILES_${PN}-unimaps = "${datadir}/unimaps"
31 31
32do_install_append () {
33 if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \
34 && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then
35 mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd
36 fi
37}
38
32inherit update-alternatives 39inherit update-alternatives
33 40
34ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ 41ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \