kbd: fix transaction conflict
PATCH 1/1 kbd: fix transaction conflict
From: Mingli Yu <[email protected]>
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.
Signed-off-by Mingli Yu <[email protected]>
--- meta/recipes-core/kbd/kbd_2.4.0.bb | 7 +++++++ 1 file changed, 7 insertions(+)
meta/recipes-core/kbd/kbd_2.4.0.bb +7 -0
@@ -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 \
Signature · 1 line
2.17.1