diff mbox series

[meta-networking] vsftpd: Fix multilib install conflicts

Message ID 20260402022309.14472-1-zhengrq.fnst@fujitsu.com
State Under Review
Headers show
Series [meta-networking] vsftpd: Fix multilib install conflicts | expand

Commit Message

Zheng Ruoqin April 2, 2026, 2:23 a.m. UTC 
Fix following error when multilib is used:
  Running transaction test
  Error: Transaction test error:
    file /etc/pam.d/vsftpd conflicts between attempted installs of vsftpd-3.0.5-r0.x86_64_v3 and lib32-vsftpd-3.0.5-r0.core2_32

Signed-off-by:  Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
---
 meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb
index f2c27606e1..69d97d326d 100644
--- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb
+++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb
@@ -35,8 +35,9 @@  RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-li
 PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}"
 NOPAM_SRC = "file://nopam.patch"
 
-inherit update-rc.d useradd systemd
+inherit update-rc.d useradd systemd multilib_script
 
+MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/pam.d/vsftpd"
 CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf"
 LDFLAGS:append = " -lcrypt -lcap"
 CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h"