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 | |
parent | ae6fc9ee39e5ae57a5e52b9634d43d8911b10f8a (diff) | |
download | meta-openembedded-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')
-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 efaf4f2a1..82108842f 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 | |||
39 | 39 | ||
40 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz" | 40 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz" |
41 | 41 | ||
42 | inherit systemd waf-samba cpan-base perlnative update-rc.d | 42 | inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version |
43 | 43 | ||
44 | # CVE-2011-2411 is valnerble only on HP NonStop Servers. | 44 | # CVE-2011-2411 is valnerble only on HP NonStop Servers. |
45 | CVE_CHECK_WHITELIST += "CVE-2011-2411" | 45 | CVE_CHECK_WHITELIST += "CVE-2011-2411" |
@@ -130,6 +130,18 @@ EXTRA_OECONF += "--enable-fhs \ | |||
130 | 130 | ||
131 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 131 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
132 | 132 | ||
133 | do_configure_append () { | ||
134 | cd ${S}/pidl/ | ||
135 | perl Makefile.PL PREFIX=${prefix} | ||
136 | sed -e 's,VENDORPREFIX)/lib/perl,VENDORPREFIX)/${baselib}/perl,g' \ | ||
137 | -e 's,PERLPREFIX)/lib/perl,PERLPREFIX)/${baselib}/perl,g' -i Makefile | ||
138 | |||
139 | } | ||
140 | |||
141 | do_compile_append () { | ||
142 | oe_runmake -C ${S}/pidl | ||
143 | } | ||
144 | |||
133 | do_install_append() { | 145 | do_install_append() { |
134 | for section in 1 5 7; do | 146 | for section in 1 5 7; do |
135 | install -d ${D}${mandir}/man$section | 147 | install -d ${D}${mandir}/man$section |
@@ -195,6 +207,10 @@ do_install_append() { | |||
195 | if [ -f "${D}${bindir}/samba-tool" ]; then | 207 | if [ -f "${D}${bindir}/samba-tool" ]; then |
196 | sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool | 208 | sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool |
197 | fi | 209 | fi |
210 | |||
211 | oe_runmake -C ${S}/pidl DESTDIR=${D} install_vendor | ||
212 | rm -rf ${D}${libdir}/perl5/${PERLVERSION}/${BUILD_SYS}/perllocal.pod | ||
213 | rm -rf ${D}${libdir}/perl5/vendor_perl/${PERLVERSION}/${BUILD_SYS}/auto/Parse/Pidl/.packlist | ||
198 | 214 | ||
199 | } | 215 | } |
200 | 216 | ||
@@ -301,7 +317,9 @@ FILES_smbclient = "${bindir}/cifsdd \ | |||
301 | ${libdir}/samba/smbspool_krb5_wrapper" | 317 | ${libdir}/samba/smbspool_krb5_wrapper" |
302 | 318 | ||
303 | RDEPENDS_${PN}-pidl_append = " perl" | 319 | RDEPENDS_${PN}-pidl_append = " perl" |
304 | FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" | 320 | FILES_${PN}-pidl = "${bindir}/pidl \ |
321 | ${libdir}/perl5 \ | ||
322 | " | ||
305 | 323 | ||
306 | RDEPENDS_${PN}-client = "\ | 324 | RDEPENDS_${PN}-client = "\ |
307 | smbclient \ | 325 | smbclient \ |