diff options
author | wangmy <wangmy@fujitsu.com> | 2021-06-24 09:19:35 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-06-23 23:20:36 -0700 |
commit | 31fb4226607abddac944091ff007f104d42aecb9 (patch) | |
tree | cad05757f67ffa96a23c21a30d05f2dd16e09754 /meta-networking/recipes-connectivity | |
parent | ae6fc9ee39e5ae57a5e52b9634d43d8911b10f8a (diff) | |
download | meta-openembedded-contrib-31fb4226607abddac944091ff007f104d42aecb9.tar.gz |
samba: Solve the dependency problem when installing Samba
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>
Diffstat (limited to 'meta-networking/recipes-connectivity')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.14.5.bb | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb index efaf4f2a15..82108842f6 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb @@ -39,7 +39,7 @@ SRC_URI[sha256sum] = "bb6ef5d2f16b85288d823578abc453d9a80514c42e5a2ea2c4e3c60dc4 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_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)}" +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() { for section in 1 5 7; do install -d ${D}${mandir}/man$section @@ -195,6 +207,10 @@ do_install_append() { if [ -f "${D}${bindir}/samba-tool" ]; then sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool 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" RDEPENDS_${PN}-pidl_append = " perl" -FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" +FILES_${PN}-pidl = "${bindir}/pidl \ + ${libdir}/perl5 \ + " RDEPENDS_${PN}-client = "\ smbclient \ |