mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
vsftpd: Fix multilib install conflicts
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>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user