From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by mail.openembedded.org (Postfix) with ESMTP id 7056777225 for ; Thu, 12 Nov 2015 16:17:28 +0000 (UTC) Received: by wmww144 with SMTP id w144so207414247wmw.1 for ; Thu, 12 Nov 2015 08:17:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-type:content-transfer-encoding:subject:message-id:date :to:mime-version; bh=9Baw5HiLRAwkLq7GGeMdwp5PRpSq9dpF0pz+Txe9xQc=; b=0umJ67pijQKKPKn+wuCl6To1ZpZU9hc+PO1udfFLxVQSVkVDH0gelRBXx6kTdCmDtF wyrHK+BQQX71hAmR4i3HctMZ2IYv5TCPnpt/sEKTrFNYf4rSYQ9MYchmHVE3OJiJbck9 ZV+DgmYnXsEFmUHitSfMKl4eMmeCGZ+ZpoMfKGoVRuhBnj2tYc6gny7lYfWHfU1Pq1ok C41WAhLQwYIQnvwk/FtSpVyaBMBL6vCf0g0TN9LCkjPXhkKTboXds299WYIIQolxNRK3 dlqtc8UGTRZW6zI+BfjGyDhC5vOGdqGW3BxAQpB/XgCi1iIiUrvarQeZpAhF02AECkqZ XCmw== X-Received: by 10.28.47.212 with SMTP id v203mr2743435wmv.37.1447345048067; Thu, 12 Nov 2015 08:17:28 -0800 (PST) Received: from walter.muppets.liwing.de (p578b540c.dip0.t-ipconnect.de. [87.139.84.12]) by smtp.gmail.com with ESMTPSA id ej10sm14322868wjd.32.2015.11.12.08.17.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Nov 2015 08:17:27 -0800 (PST) From: Jens Rehsack Message-Id: <3A08034A-59A7-41B3-9B13-06CB92592BED@gmail.com> Date: Thu, 12 Nov 2015 17:17:25 +0100 To: openembedded-devel Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) X-Mailer: Apple Mail (2.2104) Subject: [meta-oe][PATCH v2 1/3] samba: fix dependencies and QA issues X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2015 16:17:29 -0000 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Fix remaining QA issues (dependency-wise) like WARNING: QA Issue: samba rdepends on libacl, but it isn't a build = dependency? [build-deps] WARNING: QA Issue: samba rdepends on libavahi-client, but it isn't a = build dependency? [build-deps] broken perl library path, having a default PACKAGECONFIG, but allow user-defined one and rely on PACKAGECONFIG instead of DISTRO_FEATURES. Signed-off-by: Jens Rehsack --- meta-oe/recipes-connectivity/samba/samba_4.1.12.bb | 41 = ++++++++++++++++------ 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb = b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb index af2cc1f..04df8a3 100644 --- a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb +++ b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb @@ -38,26 +38,40 @@ SRC_URI =3D = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ SRC_URI[md5sum] =3D "232016d7581a1ba11e991ec2674553c4" SRC_URI[sha256sum] =3D = "033604674936bf5c77d7df299b0626052b84a41505a6a6afe902f6274fc29898" =20 -inherit systemd waf-samba +inherit systemd waf-samba cpan-base perlnative =20 -DEPENDS +=3D "readline virtual/libiconv zlib popt talloc libtdb = libtevent libldb krb5 ctdb cups" -RDEPENDS_${PN} +=3D "openldap" +DEPENDS +=3D "readline virtual/libiconv zlib popt talloc libtdb = libtevent libldb krb5 ctdb" =20 -PACKAGECONFIG =3D "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', = '', d)}" -PACKAGECONFIG +=3D "${@base_contains('DISTRO_FEATURES', 'systemd', = 'systemd', '', d)}" +SYSVINITTYPE_linuxstdbase =3D "lsb" +SYSVINITTYPE =3D "sysv" =20 -PACKAGECONFIG[pam] =3D "--with-pam,--without-pam,libpam" +PACKAGECONFIG ??=3D "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', = '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', = '${SYSVINITTYPE}', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'systemd', = 'systemd', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'zeroconf', = 'zeroconf', '', d)} \ + acl aio cups ldap \ +" + +RDEPENDS_${PN} +=3D "${@bb.utils.contains('PACKAGECONFIG', 'lsb', = 'lsb', '', d)}" + +PACKAGECONFIG[acl] =3D "--with-acl-support,---without-acl-support,acl" +PACKAGECONFIG[aio] =3D = "--with-aio-support,---without-aio-support,libaio" PACKAGECONFIG[fam] =3D "--with-fam,--without-fam,gamin" +PACKAGECONFIG[pam] =3D "--with-pam,--without-pam,libpam" +PACKAGECONFIG[lsb] =3D ",,lsb" +PACKAGECONFIG[cups] =3D "--enable-cups,--disable-cups,cups" +PACKAGECONFIG[ldap] =3D "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[systemd] =3D "--with-systemd,--without-systemd,systemd" +PACKAGECONFIG[zeroconf] =3D "--enable-avahi,--disable-avahi,avahi" =20 = SAMBA4_IDMAP_MODULES=3D"idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb= 2" = -SAMBA4_PDB_MODULES=3D"pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_s= am,pdb_samba4" +SAMBA4_PDB_MODULES=3D"pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', = 'ldap', 'pdb_ldap,', '', = d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" = SAMBA4_AUTH_MODULES=3D"auth_unix,auth_wbc,auth_server,auth_netlogond,auth_= script,auth_samba4" = SAMBA4_MODULES=3D"${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_A= UTH_MODULES}" =20 = SAMBA4_LIBS=3D"heimdal,!zlib,!popt,!talloc,!pytalloc,!pytalloc-util,!teven= t,!pytevent,!tdb,!pytdb,!ldb,!pyldb" =20 -PERL_VERNDORLIB=3D"${datadir}/perl5/vendor_perl/" +PERL_VERNDORLIB=3D"${libdir}/perl5/vendor_perl/${PERLVERSION}" =20 EXTRA_OECONF +=3D "--enable-fhs \ --with-piddir=3D${localstatedir}/run \ @@ -85,7 +99,7 @@ LDFLAGS +=3D "-Wl,-z,relro,-z,now" do_install_append() { rmdir --ignore-fail-on-non-empty "${D}/${localstatedir}/run" =20 - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', = 'false', d)}; then + if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', = 'false', d)}; then install -d ${D}${systemd_unitdir}/system for i in nmb smb winbind; do install -m 0644 packaging/systemd/$i.service = ${D}${systemd_unitdir}/system @@ -97,11 +111,16 @@ do_install_append() { install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/samba 0755 root root -" \ > ${D}${sysconfdir}/tmpfiles.d/99-${BPN}.conf - elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', = 'false', d)}; then + elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', = d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d update-rc.d -r ${D} samba.sh start 20 3 5 . update-rc.d -r ${D} samba.sh start 20 0 1 6 . + elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', = d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 packaging/sysv/samba.init = ${D}${sysconfdir}/init.d/samba.sh + update-rc.d -r ${D} samba.sh start 20 3 5 . + update-rc.d -r ${D} samba.sh start 20 0 1 6 . fi =20 install -d ${D}${sysconfdir}/samba @@ -160,4 +179,4 @@ FILES_${PN}-python-dbg =3D = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.d = ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/.debug/* = \ " =20 -FILES_${PN}-pidl =3D "${datadir}/perl5/vendor_perl/*" +FILES_${PN}-pidl =3D "${bindir}/pidl ${PERL_VERNDORLIB}/*" --=20 2.4.9 (Apple Git-60) --=20 Jens Rehsack - rehsack@gmail.com