From: Mingli Yu <mingli...@windriver.com> 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 Signed-off-by: Mingli Yu <mingli...@windriver.com> --- meta/recipes-core/kbd/kbd_2.4.0.bb | 7 +++++++ 1 file changed, 7 insertions(+) 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" FILES_${PN}-keymaps = "${datadir}/keymaps" FILES_${PN}-unimaps = "${datadir}/unimaps" +do_install_append () { + if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ + && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then + mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd + fi +} + inherit update-alternatives ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#146453): https://lists.openembedded.org/g/openembedded-core/message/146453 Mute This Topic: https://lists.openembedded.org/mt/79489448/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
