* [oe] [meta-oe] [PATCH] samba: Solve the dependency problem when installing Samba
@ 2021-06-22 2:33 wangmy
2021-06-22 3:05 ` Khem Raj
0 siblings, 1 reply; 2+ messages in thread
From: wangmy @ 2021-06-22 2:33 UTC (permalink / raw)
To: openembedded-devel; +Cc: Wang Mingyu
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>
---
.../samba/samba_4.14.5.bb | 24 +++++++++++++++++--
1 file changed, 22 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..e0a4f0a8c7 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,19 @@ 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 () {
+ cd ${S}/pidl/
+ make
+}
+
do_install_append() {
for section in 1 5 7; do
install -d ${D}${mandir}/man$section
@@ -195,6 +208,11 @@ 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
+
+ cd ${S}/pidl/
+ make 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 +319,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 \
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [oe] [meta-oe] [PATCH] samba: Solve the dependency problem when installing Samba
2021-06-22 2:33 [oe] [meta-oe] [PATCH] samba: Solve the dependency problem when installing Samba wangmy
@ 2021-06-22 3:05 ` Khem Raj
0 siblings, 0 replies; 2+ messages in thread
From: Khem Raj @ 2021-06-22 3:05 UTC (permalink / raw)
To: wangmy, openembedded-devel
On 6/21/21 7:33 PM, wangmy wrote:
> 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>
> ---
> .../samba/samba_4.14.5.bb | 24 +++++++++++++++++--
> 1 file changed, 22 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..e0a4f0a8c7 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,19 @@ 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 () {
> + cd ${S}/pidl/
> + make
can we call oe_runame -C ${S}/pidl perhaps not build it in source tree.
> +}
> +
> do_install_append() {
> for section in 1 5 7; do
> install -d ${D}${mandir}/man$section
> @@ -195,6 +208,11 @@ 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
> +
> + cd ${S}/pidl/
> + make DESTDIR=${D} install_vendor
same here call oe_runmake and perhaps no need to cd if above step works.
> + 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 +319,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 \
>
>
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-22 3:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-22 2:33 [oe] [meta-oe] [PATCH] samba: Solve the dependency problem when installing Samba wangmy
2021-06-22 3:05 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.