]> code.ossystems Code Review - openembedded-core.git/commit
kbd: fix transaction conflict
authorMingli Yu <mingli.yu@windriver.com>
Thu, 7 Jan 2021 01:03:51 +0000 (09:03 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 8 Jan 2021 10:06:30 +0000 (10:06 +0000)
commit315f2453515a4cd0f1cc2d1bdddeb0c385aee2d4
tree2c866b2fbadd2cddee306f2af3cb3d8234a4671e
parent67aa7069dbe8f5f5f186eb67708ece5c4bd42976
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

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/kbd/kbd_2.4.0.bb