mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

samba: Solve the dependency problem when installing Samba

Browse Source 
Error Message:
 Problem: conflicting requests
  - nothing provides samba-pidl needed by samba-client-4.14.5-r0.aarch64

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
wangmy
2021-06-24 09:19:35 +08:00
committed by Khem Raj
parent ae6fc9ee39
commit 31fb422660
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/samba/samba_4.14.5.bb
+20 -2
View File
@@ -39,7 +39,7 @@ SRC_URI[sha256sum] = "bb6ef5d2f16b85288d823578abc453d9a80514c42e5a2ea2c4e3c60dc4
UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz"
inherit systemd waf-samba cpan-base perlnative update-rc.d inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version
# CVE-2011-2411 is valnerble only on HP NonStop Servers. # CVE-2011-2411 is valnerble only on HP NonStop Servers.
CVE_CHECK_WHITELIST += "CVE-2011-2411" CVE_CHECK_WHITELIST += "CVE-2011-2411"
@@ -130,6 +130,18 @@ EXTRA_OECONF += "--enable-fhs \
LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
do_configure_append () {
cd ${S}/pidl/
perl Makefile.PL PREFIX=${prefix}
sed -e 's,VENDORPREFIX)/lib/perl,VENDORPREFIX)/${baselib}/perl,g' \
-e 's,PERLPREFIX)/lib/perl,PERLPREFIX)/${baselib}/perl,g' -i Makefile
}
do_compile_append () {
oe_runmake -C ${S}/pidl
}
do_install_append() { do_install_append() {
for section in 1 5 7; do for section in 1 5 7; do
install -d ${D}${mandir}/man$section install -d ${D}${mandir}/man$section
@@ -195,6 +207,10 @@ do_install_append() {
if [ -f "${D}${bindir}/samba-tool" ]; then if [ -f "${D}${bindir}/samba-tool" ]; then
sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool
fi fi
oe_runmake -C ${S}/pidl DESTDIR=${D} install_vendor
rm -rf ${D}${libdir}/perl5/${PERLVERSION}/${BUILD_SYS}/perllocal.pod
rm -rf ${D}${libdir}/perl5/vendor_perl/${PERLVERSION}/${BUILD_SYS}/auto/Parse/Pidl/.packlist
} }
@@ -301,7 +317,9 @@ FILES_smbclient = "${bindir}/cifsdd \
${libdir}/samba/smbspool_krb5_wrapper" ${libdir}/samba/smbspool_krb5_wrapper"
RDEPENDS_${PN}-pidl_append = " perl" RDEPENDS_${PN}-pidl_append = " perl"
FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" FILES_${PN}-pidl = "${bindir}/pidl \
${libdir}/perl5 \
"
RDEPENDS_${PN}-client = "\ RDEPENDS_${PN}-client = "\
smbclient \ smbclient \