diff options
| author | Zheng Ruoqin <zhengrq.fnst@fujitsu.com> | 2026-04-02 10:23:09 +0800 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-01 19:29:12 -0700 |
| commit | dadc302a67c7a762b5d6428f23bc052f408a3a84 (patch) | |
| tree | 37b180d582566ef771688b06a959e714db3156cf | |
| parent | 22ebe68668df4284ec4a74bf55fbb488e73b6815 (diff) | |
| download | meta-openembedded-dadc302a67c7a762b5d6428f23bc052f408a3a84.tar.gz | |
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>
| -rw-r--r-- | meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 35 | PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" | 35 | PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" |
| 36 | NOPAM_SRC = "file://nopam.patch" | 36 | NOPAM_SRC = "file://nopam.patch" |
| 37 | 37 | ||
| 38 | inherit update-rc.d useradd systemd | 38 | inherit update-rc.d useradd systemd multilib_script |
| 39 | 39 | ||
| 40 | MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/pam.d/vsftpd" | ||
| 40 | CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" | 41 | CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" |
| 41 | LDFLAGS:append = " -lcrypt -lcap" | 42 | LDFLAGS:append = " -lcrypt -lcap" |
| 42 | CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h" | 43 | CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h" |