samba: use default packaging rules for -dbg and -dev packages
PATCH 1/17 samba: use default packaging rules for -dbg and -dev packages
There's no need to create multiple packages.
--- .../recipes-connectivity/samba/samba_4.4.5.bb | 33 ++-------------------- 1 file changed, 3 insertions(+), 30 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +3 -30
@@ -125,9 +125,9 @@ do_install_append() { rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log } -PACKAGES =+ "${PN}-python ${PN}-python-dbg ${PN}-pidl libwinbind libwinbind-dbg libwinbind-krb5-locator" -PACKAGES =+ "libwbclient libnss-winbind winbind winbind-dbg libnetapi libsmbsharemodes \ - libsmbclient libsmbclient-dev lib${PN}-base ${PN}-base ${PN}-ctdb-tests" +PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator" +PACKAGES =+ "libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \ + libsmbclient lib${PN}-base ${PN}-base ${PN}-ctdb-tests" RDEPENDS_${PN} += "${PN}-base"
@@ -235,10 +235,6 @@ FILES_lib${PN}-base = "\ ${libdir}/samba/pdb/wbc_sam.so \ " -FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \ - ${libdir}/security/.debug/pam_winbind.so \ -" - FILES_${PN} += "${libdir}/vfs/*.so \ ${libdir}/charset/*.so \ ${libdir}/*.dat \
@@ -246,17 +242,10 @@ FILES_${PN} += "${libdir}/vfs/*.so \ ${libdir}/security/pam_smbpass.so \ " -FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so \ - ${libdir}/charset/.debug/*.so \ - ${libdir}/auth/.debug/*.so \ - ${libdir}/security/.debug/pam_smbpass.so \ -" - FILES_libwbclient = "${libdir}/libwbclient.so.* ${libdir}/samba/libwinbind-client.so" FILES_libnetapi = "${libdir}/libnetapi.so.*" FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*" FILES_libsmbclient = "${libdir}/libsmbclient.so.*" -FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}" FILES_winbind = "${sbindir}/winbindd \ ${bindir}/wbinfo \ ${bindir}/ntlm_auth \
@@ -276,18 +265,8 @@ SMB_SYSV="${sysconfdir}/init.d ${sysconfdir}/rc?.d" FILES_${PN}-base +="${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${SMB_SERVICE}', '', d)}" FILES_${PN}-base +="${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SMB_SYSV}', '', d)}" -FILES_${PN}-dbg += "${libdir}/samba/idmap/.debug/* \ - ${libdir}/samba/pdb/.debug/* \ - ${libdir}/samba/auth/.debug/* \ - ${libdir}/samba/nss_info/.debug/* \ - ${libdir}/samba/ldb/.debug/* \ - ${libdir}/samba/vfs/.debug/* \ - ${base_libdir}/security/.debug/pam_smbpass.so \ -" - FILES_libwinbind = "${base_libdir}/security/pam_winbind.so" FILES_libwinbind += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/winbind.service', '', d)}" -FILES_libwinbind-dbg = "${base_libdir}/security/.debug/pam_winbind.so" FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so" FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
@@ -308,11 +287,5 @@ FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \ " -FILES_${PN}-python-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/* \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/.debug/* \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/samba3/.debug/* \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/.debug/* \ -" - RDEPENDS_${PN}-pidl_append = " perl" FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"
Signature · 1 line
2.7.4
PATCH 2/17 samba: remove unneeded conditionals for sysvinit and systemd
systemd.bbclass takes care of deleting unused startup scripts.
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +4 -8
@@ -137,7 +137,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \ ${localstatedir}/lib/samba \ ${localstatedir}/nmbd \ ${localstatedir}/spool/samba \ -" + ${systemd_unitdir}/system/nmb.service \ + ${systemd_unitdir}/system/smb.service" FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ ${libdir}/ctdb-tests \
@@ -260,13 +261,8 @@ FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \ FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \ " -SMB_SERVICE="${systemd_unitdir}/system/nmb.service ${systemd_unitdir}/system/smb.service" -SMB_SYSV="${sysconfdir}/init.d ${sysconfdir}/rc?.d" -FILES_${PN}-base +="${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${SMB_SERVICE}', '', d)}" -FILES_${PN}-base +="${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SMB_SYSV}', '', d)}" - -FILES_libwinbind = "${base_libdir}/security/pam_winbind.so" -FILES_libwinbind += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/winbind.service', '', d)}" +FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \ + ${systemd_unitdir}/system/winbind.service" FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so" FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
Signature · 1 line
2.7.4
PATCH 3/17 samba: use systemd_system_unitdir variable
In reply to Andreas Oberritter--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +7 -8
@@ -91,11 +91,11 @@ LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-g do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system + install -d ${D}${systemd_system_unitdir} for i in nmb smb winbind; do - install -m 0644 packaging/systemd/$i.service ${D}${systemd_unitdir}/system + install -m 0644 packaging/systemd/$i.service ${D}${systemd_system_unitdir} done - sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_unitdir}/system/*.service + sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service install -d ${D}${sysconfdir}/tmpfiles.d install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf
@@ -137,8 +137,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \ ${localstatedir}/lib/samba \ ${localstatedir}/nmbd \ ${localstatedir}/spool/samba \ - ${systemd_unitdir}/system/nmb.service \ - ${systemd_unitdir}/system/smb.service" + ${systemd_system_unitdir}/nmb.service \ + ${systemd_system_unitdir}/smb.service" FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ ${libdir}/ctdb-tests \
@@ -251,8 +251,7 @@ FILES_winbind = "${sbindir}/winbindd \ ${bindir}/wbinfo \ ${bindir}/ntlm_auth \ ${sysconfdir}/init.d/winbind \ - ${systemd_unitdir}/system/winbind.service \ -" + ${systemd_system_unitdir}/winbind.service" FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \ ${libdir}/nss_info \
@@ -262,7 +261,7 @@ FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \ " FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \ - ${systemd_unitdir}/system/winbind.service" + ${systemd_system_unitdir}/winbind.service" FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so" FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
Signature · 1 line
2.7.4
PATCH 4/17 samba: remove superflous listing of pam_smbpass.so
In reply to Andreas OberritterEXTRA_OECONF includes --with-pammodulesdir=${base_libdir}/security when pam is enabled.
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +1 -4
@@ -240,7 +240,7 @@ FILES_${PN} += "${libdir}/vfs/*.so \ ${libdir}/charset/*.so \ ${libdir}/*.dat \ ${libdir}/auth/*.so \ - ${libdir}/security/pam_smbpass.so \ + ${base_libdir}/security/pam_smbpass.so \ " FILES_libwbclient = "${libdir}/libwbclient.so.* ${libdir}/samba/libwinbind-client.so"
@@ -257,9 +257,6 @@ FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \ ${libdir}/nss_info \ " -FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \ -" - FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \ ${systemd_system_unitdir}/winbind.service" FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so"
Signature · 1 line
2.7.4
PATCH 5/17 samba: install all systemd unit files
In reply to Andreas OberritterThis includes samba.service, which other major distributions install, too.
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +2 -3
@@ -92,9 +92,7 @@ LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-g do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} - for i in nmb smb winbind; do - install -m 0644 packaging/systemd/$i.service ${D}${systemd_system_unitdir} - done + install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service install -d ${D}${sysconfdir}/tmpfiles.d
@@ -138,6 +136,7 @@ FILES_${PN}-base = "${sbindir}/nmbd \ ${localstatedir}/nmbd \ ${localstatedir}/spool/samba \ ${systemd_system_unitdir}/nmb.service \ + ${systemd_system_unitdir}/samba.service \ ${systemd_system_unitdir}/smb.service" FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
Signature · 1 line
2.7.4
PATCH 6/17 samba: rename initscript from 'samba.sh' to more common 'samba'
In reply to Andreas OberritterThis gets masked automatically by samba.service if systemd is running.
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +5 -5
@@ -33,7 +33,7 @@ DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libld SYSVINITTYPE_linuxstdbase = "lsb" SYSVINITTYPE = "sysv" -INITSCRIPT_NAME = "samba.sh" +INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \
@@ -101,15 +101,15 @@ do_install_append() { >> ${D}${sysconfdir}/tmpfiles.d/samba.conf 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 + install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d - install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba.sh + install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba sed -e 's,/opt/samba/bin,${sbindir},g' \ -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ - -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \ - -i ${D}${sysconfdir}/init.d/samba.sh + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ + -i ${D}${sysconfdir}/init.d/samba fi install -d ${D}${sysconfdir}/samba
Signature · 1 line
2.7.4
PATCH 7/17 samba: install systemd units and initscripts unconditionally
In reply to Andreas OberritterFixes hybrid systemd/sysvinit setups.
--- .../recipes-connectivity/samba/samba_4.4.5.bb | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +10 -11
@@ -90,19 +90,18 @@ DISABLE_STATIC = "" LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} - sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf - echo "d ${localstatedir}/log/samba 0755 root root -" \ - >> ${D}${sysconfdir}/tmpfiles.d/samba.conf - elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} + sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf + echo "d ${localstatedir}/log/samba 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/samba.conf + if ${@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/samba - elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then + else install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba sed -e 's,/opt/samba/bin,${sbindir},g' \
Signature · 1 line
2.7.4
PATCH 8/17 samba: remove unused variable DISABLE_STATIC
In reply to Andreas Oberritter--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 - 1 file changed, 1 deletion(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +0 -1
@@ -85,7 +85,6 @@ EXTRA_OECONF += "--enable-fhs \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \ --with-pam --with-pammodulesdir=${base_libdir}/security \ " -DISABLE_STATIC = "" LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
Signature · 1 line
2.7.4
PATCH 9/17 samba: add smbclient package
In reply to Andreas Oberritter--- .../recipes-connectivity/samba/samba_4.4.5.bb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +15 -3
@@ -121,9 +121,10 @@ do_install_append() { rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log } -PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator" -PACKAGES =+ "libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \ - libsmbclient lib${PN}-base ${PN}-base ${PN}-ctdb-tests" +PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator \ + libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \ + libsmbclient lib${PN}-base ${PN}-base ${PN}-ctdb-tests \ + smbclient" RDEPENDS_${PN} += "${PN}-base"
@@ -276,5 +277,16 @@ FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \ " +FILES_smbclient = "${bindir}/cifsdd \ + ${bindir}/rpcclient \ + ${bindir}/smbcacls \ + ${bindir}/smbclient \ + ${bindir}/smbcquotas \ + ${bindir}/smbget \ + ${bindir}/smbspool \ + ${bindir}/smbtar \ + ${bindir}/smbtree \ + ${libdir}/samba/smbspool_krb5_wrapper" + RDEPENDS_${PN}-pidl_append = " perl" FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"
Signature · 1 line
2.7.4
PATCH 10/17 samba: install manpages
In reply to Andreas Oberritter--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 +++++++++ 1 file changed, 9 insertions(+)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +9 -0
@@ -89,6 +89,15 @@ EXTRA_OECONF += "--enable-fhs \ LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" do_install_append() { + for section in 1 5 7; do + install -d ${D}${mandir}/man$section + install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section + done + for section in 1 5 7 8; do + install -d ${D}${mandir}/man$section + install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section + done + install -d ${D}${systemd_system_unitdir} install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service
Signature · 1 line
2.7.4
PATCH 11/17 samba: simplify files list for samba-python
In reply to Andreas Oberritter--- .../recipes-connectivity/samba/samba_4.4.5.bb | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +1 -17
@@ -268,23 +268,7 @@ FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \ ${systemd_system_unitdir}/winbind.service" FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so" -FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/_ldb_text.py \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/*.py \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/*.so \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/*.so \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/*.py \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/external/* \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/kcc/* \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/netcmd/*.py \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/provision/*.py \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/samba3/*.py \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/samba3/*.so \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/subunit/* \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/tests/* \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/third_party/* \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \ -" +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" FILES_smbclient = "${bindir}/cifsdd \ ${bindir}/rpcclient \
Signature · 1 line
2.7.4
PATCH 12/17 samba: split libraries into their own packages
In reply to Andreas OberritterIt's quite hard to track library dependencies manually between releases. Splitting libraries into their own packages creates some overhead but effectively uses less storage in minimal installations.
--- .../recipes-connectivity/samba/samba_4.4.5.bb | 135 +++++---------------- 1 file changed, 30 insertions(+), 105 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +30 -105
@@ -130,11 +130,33 @@ do_install_append() { rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log } -PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator \ - libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \ - libsmbclient lib${PN}-base ${PN}-base ${PN}-ctdb-tests \ +PACKAGES =+ "${PN}-python ${PN}-pidl \ + winbind \ + ${PN}-common ${PN}-base ${PN}-ctdb-tests \ smbclient" +python samba_populate_packages() { + def module_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN', True) + d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) + + mlprefix = d.getVar('MLPREFIX', True) or '' + pam_libdir = d.expand('${base_libdir}/security') + pam_pkgname = mlprefix + 'pam-plugin%s' + do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) + + libdir = d.getVar('libdir', True) + do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) + pkglibdir = '%s/samba' % libdir + do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) + moduledir = '%s/samba/auth' % libdir + do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) + moduledir = '%s/samba/pdb' % libdir + do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) +} + +PACKAGESPLITFUNCS_prepend = "samba_populate_packages " + RDEPENDS_${PN} += "${PN}-base" FILES_${PN}-base = "${sbindir}/nmbd \
@@ -153,121 +175,24 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ /run/ctdb \ " -# figured out by -# FILES="tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/sbin/smbd tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/sbin/nmbd" -# -# while [ "${FILES}" != "${OLDFILES}" ] -# do -# OLDFILES="${FILES}" -# NEEDED=`tmp/sysroots/x86_64-linux/usr/libexec/arm-poky-linux-gnueabi.gcc-cross-initial-arm/gcc/arm-poky-linux-gnueabi/5.2.0/objdump -x ${FILES} | grep NEEDED | egrep -E 'so(.[0-9]|$)' | sort -u | perl -MData::Dumper -le 'while (<>) {chomp; push @lib, (split)[1]}; print "(", join("|", @lib), ")"'` -# NF=`find tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/lib -type f | egrep "${NEEDED}" | sort -u` -# -# FILES=`perl -le 'foreach (@ARGV) { $f{$_}++ }; print join(" ", sort keys %f)' ${FILES} ${NF}` -# done -# -# LIBS=`echo ${FILES} | sed -e 's,tmp/work/cortexa9hf-vfp-neon-poky-linux-gnueabi/samba/4.1.12-r0/image/usr/lib,${libdir},g' -e 's,.so.[0-9]+.*$,.so.*,g'` -# for l in ${LIBS} -# do -# echo $l -# done - -FILES_lib${PN}-base = "\ - ${sysconfdir}/default \ - ${sysconfdir}/samba \ - ${libdir}/libdcerpc-binding.so.* \ - ${libdir}/libgensec.so.* \ - ${libdir}/libndr-krb5pac.so.* \ - ${libdir}/libndr-nbt.so.* \ - ${libdir}/libndr-standard.so.* \ - ${libdir}/libndr.so.* \ - ${libdir}/libnetapi.so.* \ - ${libdir}/libpdb.so.* \ - ${libdir}/libsamba-credentials.so.* \ - ${libdir}/libsamba-hostconfig.so.* \ - ${libdir}/libsamba-util.so.* \ - ${libdir}/libsamdb.so.* \ - ${libdir}/libsmbconf.so.* \ - ${libdir}/libtevent-util.so.* \ - ${libdir}/samba/libCHARSET3.so \ - ${libdir}/samba/libaddns.so \ - ${libdir}/samba/libads.so \ - ${libdir}/samba/libasn1util.so \ - ${libdir}/samba/libauth.so \ - ${libdir}/samba/libauth_sam_reply.so \ - ${libdir}/samba/libauthkrb5.so \ - ${libdir}/samba/libccan.so \ - ${libdir}/samba/libcli-ldap-common.so \ - ${libdir}/samba/libcli-nbt.so \ - ${libdir}/samba/libcli_cldap.so \ - ${libdir}/samba/libcli_smb_common.so \ - ${libdir}/samba/libcli_spoolss.so \ - ${libdir}/samba/libcliauth.so \ - ${libdir}/samba/libdbwrap.so \ - ${libdir}/samba/libdcerpc-samba.so \ - ${libdir}/samba/liberrors.so \ - ${libdir}/samba/libflag_mapping.so \ - ${libdir}/samba/libgse.so \ - ${libdir}/samba/libinterfaces.so \ - ${libdir}/samba/libkrb5samba.so \ - ${libdir}/samba/libldbsamba.so \ - ${libdir}/samba/liblibcli_lsa3.so \ - ${libdir}/samba/liblibcli_netlogon3.so \ - ${libdir}/samba/liblibsmb.so \ - ${libdir}/samba/libmsrpc3.so \ - ${libdir}/samba/libndr-samba.so \ - ${libdir}/samba/libndr-samba4.so \ - ${libdir}/samba/libnpa_tstream.so \ - ${libdir}/samba/libntdb.so.* \ - ${libdir}/samba/libpopt_samba3.so \ - ${libdir}/samba/libprinting_migrate.so \ - ${libdir}/samba/libsamba-modules.so \ - ${libdir}/samba/libsamba-security.so \ - ${libdir}/samba/libsamba-sockets.so \ - ${libdir}/samba/libsamba3-util.so \ - ${libdir}/samba/libsamdb-common.so \ - ${libdir}/samba/libsecrets3.so \ - ${libdir}/samba/libserver-role.so \ - ${libdir}/samba/libsmb_transport.so \ - ${libdir}/samba/libsmbd_base.so \ - ${libdir}/samba/libsmbd_conn.so \ - ${libdir}/samba/libsmbd_shim.so \ - ${libdir}/samba/libsmbregistry.so \ - ${libdir}/samba/libtdb-wrap.so \ - ${libdir}/samba/libutil_cmdline.so \ - ${libdir}/samba/libutil_ntdb.so \ - ${libdir}/samba/libutil_reg.so \ - ${libdir}/samba/libutil_setid.so \ - ${libdir}/samba/libutil_tdb.so \ - ${libdir}/samba/pdb/smbpasswd.so \ - ${libdir}/samba/pdb/tdbsam.so \ - ${libdir}/samba/pdb/wbc_sam.so \ -" +FILES_${PN}-common = "${sysconfdir}/default \ + ${sysconfdir}/samba" FILES_${PN} += "${libdir}/vfs/*.so \ ${libdir}/charset/*.so \ ${libdir}/*.dat \ ${libdir}/auth/*.so \ - ${base_libdir}/security/pam_smbpass.so \ " -FILES_libwbclient = "${libdir}/libwbclient.so.* ${libdir}/samba/libwinbind-client.so" -FILES_libnetapi = "${libdir}/libnetapi.so.*" -FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*" -FILES_libsmbclient = "${libdir}/libsmbclient.so.*" FILES_winbind = "${sbindir}/winbindd \ ${bindir}/wbinfo \ ${bindir}/ntlm_auth \ + ${libdir}/samba/idmap \ + ${libdir}/samba/nss_info \ + ${libdir}/winbind_krb5_locator.so \ ${sysconfdir}/init.d/winbind \ ${systemd_system_unitdir}/winbind.service" -FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \ - ${libdir}/nss_info \ -" - -FILES_libwinbind = "${base_libdir}/security/pam_winbind.so \ - ${systemd_system_unitdir}/winbind.service" -FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so" - FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" FILES_smbclient = "${bindir}/cifsdd \
Signature · 1 line
2.7.4
PATCH 13/17 samba: add packages samba-dsdb-modules, samba-testsuite and registry-tools
In reply to Andreas OberritterInspired by Debian.
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +14 -0
@@ -131,6 +131,7 @@ do_install_append() { } PACKAGES =+ "${PN}-python ${PN}-pidl \ + ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ winbind \ ${PN}-common ${PN}-base ${PN}-ctdb-tests \ smbclient"
@@ -184,6 +185,19 @@ FILES_${PN} += "${libdir}/vfs/*.so \ ${libdir}/auth/*.so \ " +FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" + +FILES_${PN}-testsuite = "${bindir}/gentest \ + ${bindir}/locktest \ + ${bindir}/masktest \ + ${bindir}/ndrdump \ + ${bindir}/smbtorture" + +FILES_registry-tools = "${bindir}/regdiff \ + ${bindir}/regpatch \ + ${bindir}/regshell \ + ${bindir}/regtree" + FILES_winbind = "${sbindir}/winbindd \ ${bindir}/wbinfo \ ${bindir}/ntlm_auth \
Signature · 1 line
2.7.4
PATCH 14/17 samba: move /etc/sysconfig to more common /etc/default, package tmpfiles.d in samba-common
In reply to Andreas Oberritter--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +7 -4
@@ -100,7 +100,9 @@ do_install_append() { install -d ${D}${systemd_system_unitdir} install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} - sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service + sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ + -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ + -i ${D}${systemd_system_unitdir}/*.service install -d ${D}${sysconfdir}/tmpfiles.d install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf
@@ -124,8 +126,8 @@ do_install_append() { install -m644 packaging/LSB/smb.conf ${D}${sysconfdir}/samba/smb.conf install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba - install -d ${D}${sysconfdir}/sysconfig/ - install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/sysconfig/samba + install -d ${D}${sysconfdir}/default + install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log }
@@ -177,7 +179,8 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ " FILES_${PN}-common = "${sysconfdir}/default \ - ${sysconfdir}/samba" + ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d" FILES_${PN} += "${libdir}/vfs/*.so \ ${libdir}/charset/*.so \
Signature · 1 line
2.7.4
PATCH 15/17 samba: start on boot with systemd
In reply to Andreas Oberritter--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +4 -0
@@ -36,6 +36,10 @@ SYSVINITTYPE = "sysv" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." +SYSTEMD_PACKAGES = "${PN}-base winbind" +SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE_winbind = "winbind.service" + PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \
Signature · 1 line
2.7.4
Re: [meta-networking][PATCH 15/17] samba: start on boot with systemd
Op 30-11-16 om 13:04 schreef Andreas Oberritter:
Quoted 10 lines
Signed-off-by Andreas Oberritter <[email protected]>--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 4 ++++ 1 file changed, 4 insertions(+)meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +0
-0
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb SYSVINITTYPE = "sysv" · line 41
Quoted 6 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +3
-0@@ -36,6 +36,10 @@ SYSVINITTYPE = "sysv" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." +SYSTEMD_PACKAGES = "${PN}-base winbind" +SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE_winbind = "winbind.service"
Do these actually work nowadays? When I tried it recently I had to change the units into this to actually start:
# cat /lib/systemd/system/smb.service [Unit] Description=Samba SMB Daemon After=syslog.target network.target nmb.service winbind.service
[Service]
Type=simple
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/smbd $SMBDOPTIONS
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
And worse, samba fails to start if there's no network interface up, so I start smb.service using this timer to avoid races:
# cat /lib/systemd/system/smb.timer [Unit] Description=Samba timer
[Timer]
# Time to wait after booting before we run first time OnBootSec=2min
Unit=smb.service
[Install]
WantedBy=multi-user.target
regards,
Koen
Re: [meta-networking][PATCH 15/17] samba: start on boot with systemd
Quoted 14 lines · Koen Kooi
Op 30-11-16 om 13:04 schreef Andreas Oberritter:
Quoted 13 lines
Signed-off-by Andreas Oberritter <[email protected]>--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 4 ++++ 1 file changed, 4 insertions(+)meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +0
-0@@ -36,6 +36,10 @@ SYSVINITTYPE = "sysv" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
Quoted 6 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb SYSVINITTYPE = "sysv" · line 41
Quoted 3 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +3
-0+SYSTEMD_PACKAGES = "${PN}-base winbind" +SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE_winbind = "winbind.service"Do these actually work nowadays? When I tried it recently I had to change the units into this to actually start:
Yes, it works for me.
Quoted 22 lines
# cat /lib/systemd/system/smb.service [Unit] Description=Samba SMB Daemon After=syslog.target network.target nmb.service winbind.service[Service]
Type=simple
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/smbd $SMBDOPTIONS
ExecReload=/bin/kill -HUP $MAINPID[Install]
WantedBy=multi-user.targetAnd worse, samba fails to start if there's no network interface up, so I start smb.service using this timer to avoid races:
# cat /lib/systemd/system/smb.timer [Unit] Description=Samba timer
Quoted 7 lines
[Timer]
# Time to wait after booting before we run first time OnBootSec=2min
Unit=smb.service[Install]
WantedBy=multi-user.target
I can reproduce this. It would be easier to depend on network-online.target.
Regards,
Andreas
Re: [meta-networking][PATCH 15/17] samba: start on boot with systemd
Op 30-11-16 om 13:53 schreef Andreas Oberritter:
Quoted 15 lines · Koen Kooi
Quoted 14 lines
Op 30-11-16 om 13:04 schreef Andreas Oberritter:
Quoted 13 lines
Signed-off-by Andreas Oberritter <[email protected]>--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 4 ++++ 1 file changed, 4 insertions(+)meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +0
-0@@ -36,6 +36,10 @@ SYSVINITTYPE = "sysv" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
Quoted 8 lines
Quoted 6 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb SYSVINITTYPE = "sysv" · line 41
Quoted 3 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +3
-0+SYSTEMD_PACKAGES = "${PN}-base winbind" +SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE_winbind = "winbind.service"Do these actually work nowadays? When I tried it recently I had to change the units into this to actually start:
Yes, it works for me.
Great!
Quoted 28 lines
Quoted 28 lines
# cat /lib/systemd/system/smb.service [Unit] Description=Samba SMB Daemon After=syslog.target network.target nmb.service winbind.service[Service]
Type=simple
LimitNOFILE=16384
EnvironmentFile=-/etc/sysconfig/samba
ExecStart=/usr/sbin/smbd $SMBDOPTIONS
ExecReload=/bin/kill -HUP $MAINPID[Install]
WantedBy=multi-user.targetAnd worse, samba fails to start if there's no network interface up, so I start smb.service using this timer to avoid races:
# cat /lib/systemd/system/smb.timer [Unit] Description=Samba timer[Timer]
# Time to wait after booting before we run first time OnBootSec=2min
Unit=smb.service
Quoted 4 lines
Quoted 2 lines
[Install]
WantedBy=multi-user.targetI can reproduce this. It would be easier to depend on network-online.target.
That thought crossed me mind as well, but I haven't tried it yet.
regards,
Koen
PATCH 16/17 samba: simplify LSB handling
In reply to Andreas Oberritter--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +5 -8
@@ -30,8 +30,8 @@ RDEPENDS_${PN}_remove = "perl" DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb krb5 libbsd libaio libpam" -SYSVINITTYPE_linuxstdbase = "lsb" -SYSVINITTYPE = "sysv" +LSB = "" +LSB_linuxstdbase = "lsb" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
@@ -40,19 +40,16 @@ SYSTEMD_PACKAGES = "${PN}-base winbind" SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" SYSTEMD_SERVICE_winbind = "winbind.service" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ acl cups ldap \ " -RDEPENDS_${PN}-base += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb', '', d)}" +RDEPENDS_${PN}-base += "${LSB}" RDEPENDS_${PN}-ctdb-tests += "bash" PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[lsb] = ",,lsb" -PACKAGECONFIG[sysv] = ",,sysvinit" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[sasl] = ",,cyrus-sasl"
@@ -112,7 +109,7 @@ do_install_append() { install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf echo "d ${localstatedir}/log/samba 0755 root root -" \ >> ${D}${sysconfdir}/tmpfiles.d/samba.conf - if ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then + if [ "${LSB}" = "lsb" ]; then install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba else
Signature · 1 line
2.7.4
PATCH 17/17 Revert "samba: blacklist, fails to build with new binutils-2.27"
In reply to Andreas OberritterThis reverts commit 80b2d4de0ee2a5e6a3302a527e3fcfd2b99c3e37.
Disable cluster support, which causes the error.
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +1 -1
@@ -81,7 +81,7 @@ EXTRA_OECONF += "--enable-fhs \ --with-system-mitkrb5 \ --without-ad-dc \ ${@base_conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ - --with-cluster-support \ + --without-cluster-support \ --with-profiling-data \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \ --with-pam --with-pammodulesdir=${base_libdir}/security \
Signature · 1 line
2.7.4
Re: [meta-networking][PATCH 17/17] Revert "samba: blacklist, fails to build with new binutils-2.27"
Quoted 23 lines · Andreas Oberritter
This reverts commit
80b2d4de0ee2a5e6a3302a527e3fcfd2b99c3e37.Disable cluster support, which causes the error.
Signed-off-by Andreas Oberritter <[email protected]>--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +1
-2@@ -81,7 +81,7 @@ EXTRA_OECONF += "--enable-fhs \ --with-system-mitkrb5 \ --without-ad-dc \ ${@base_conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ - --with-cluster-support \ + --without-cluster-support \ --with-profiling-data \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \ --with-pam --with-pammodulesdir=${base_libdir}/security \ --
Quoted 2 lines
2.7.4
Commit message confuses at least me - samba isn't blacklisted currently
Andreas
Re: [meta-networking][PATCH 17/17] Revert "samba: blacklist, fails to build with new binutils-2.27"
Quoted 20 lines · Andreas Müller
Quoted 18 lines · Andreas Oberritter
This reverts commit
80b2d4de0ee2a5e6a3302a527e3fcfd2b99c3e37.Disable cluster support, which causes the error.
Signed-off-by Andreas Oberritter <[email protected]>--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +0
-1@@ -81,7 +81,7 @@ EXTRA_OECONF += "--enable-fhs \ --with-system-mitkrb5 \ --without-ad-dc \ ${@base_conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ - --with-cluster-support \
Quoted 8 lines
Quoted 7 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +1
-1+ --without-cluster-support \ --with-profiling-data \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \ --with-pam --with-pammodulesdir=${base_libdir}/security \ --2.7.4
Commit message confuses at least me - samba isn't blacklisted currently
Right. It was auto-merged with commit 3fdfdd8ff4f2cb8c70dd08d5c0cf363384259563 when rebasing from krogoth.
As your workaround from b60c60806e57f69233db582ef88d113867c2ecd1 beats mine, please ignore this patch.
Regards,
Andreas