samba: refresh pending patches
cover samba: refresh pending patches
As I mentioned earlier this week, I'm taking a stab at updating the samba patches from Andreas Oberritter that now have conflicts due to other changes queued up for samba. Quite a few of them actually applied cleanly after resolving earlier conflicts and the basic smoke tests seem to pass for me, but this definitely needs a bit of soak time in master-next and if you're around, Andreas, and can double-check my work on your patches, that'd be much appreciated.
Signature · 2 lines
-Joe MacDonald. :wq
PATCH 1/11 samba: rename initscript from 'samba.sh' to more common 'samba'
From: Andreas Oberritter <[email protected]>
This 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
@@ -41,7 +41,7 @@ LDFLAGS_append_libc-musl = " -ltirpc" 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)} \
@@ -109,16 +109,16 @@ 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' \ + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ -e 's,/usr/bin,${base_bindir},g' \ - -i ${D}${sysconfdir}/init.d/samba.sh + -i ${D}${sysconfdir}/init.d/samba fi install -d ${D}${sysconfdir}/samba
Signature · 1 line
1.9.1
PATCH 2/11 samba: install systemd units and initscripts unconditionally
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
Fixes 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
@@ -98,19 +98,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
1.9.1
PATCH 3/11 samba: remove unused variable DISABLE_STATIC
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- 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
@@ -93,7 +93,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
1.9.1
Re: [meta-networking][PATCH 03/11] samba: remove unused variable DISABLE_STATIC
Oh, I just realized this one sneaked back in despite my having thrown it out at least twice now. I've already rejected it in patchwork, but if anyone is picking this up off the mailing list, DISABLE_STATIC is very much still needed AFAICT.
-J.
Quoted 23 lines · [[oe] [meta-networking][PATCH 03/11] samba: remove unused variable…
From: Andreas Oberritter <[email protected]>
Signed-off-by Andreas Oberritter <[email protected]>Signed-off-by Joe MacDonald <[email protected]>--- 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@@ -93,7 +93,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
1.9.1
Signature · 2 lines
-Joe MacDonald. :wq
Re: [meta-networking][PATCH 03/11] samba: remove unused variable DISABLE_STATIC
Quoted 4 lines · Joe MacDonald
Oh, I just realized this one sneaked back in despite my having thrown it out at least twice now. I've already rejected it in patchwork, but if anyone is picking this up off the mailing list,
DISABLE_STATICis very much still needed AFAICT.
Sorry, I didn't recognize it as a global variable.
Regards,
Andreas
Quoted 30 lines
-J.
Quoted 25 lines · [[oe] [meta-networking][PATCH 03/11] samba: remove unused variable…
From: Andreas Oberritter <[email protected]>
Signed-off-by Andreas Oberritter <[email protected]>Signed-off-by Joe MacDonald <[email protected]>--- 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@@ -93,7 +93,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
1.9.1
Re: [meta-networking][PATCH 03/11] samba: remove unused variable DISABLE_STATIC
Quoted 7 lines · [Re: [oe] [meta-networking][PATCH 03/11] samba: remove unused variable…
Quoted 4 lines · Joe MacDonald
Oh, I just realized this one sneaked back in despite my having thrown it out at least twice now. I've already rejected it in patchwork, but if anyone is picking this up off the mailing list,
DISABLE_STATICis very much still needed AFAICT.Sorry, I didn't recognize it as a global variable.
No worries, honest mistake, it does look a little odd when you first encounter it. :-)
-J.
Quoted 35 lines
Regards,
AndreasQuoted 30 lines
-J.
Quoted 25 lines · [[oe] [meta-networking][PATCH 03/11] samba: remove unused variable…
From: Andreas Oberritter <[email protected]>
Signed-off-by Andreas Oberritter <[email protected]>Signed-off-by Joe MacDonald <[email protected]>--- 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@@ -93,7 +93,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
1.9.1
Signature · 2 lines
-Joe MacDonald. :wq
PATCH 4/11 samba: add smbclient package
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- .../recipes-connectivity/samba/samba_4.4.5.bb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +15 -4
@@ -143,10 +143,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${BPN}-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"
@@ -301,5 +301,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
1.9.1
Re: [meta-networking][PATCH 04/11] samba: add smbclient package
Quoted 13 lines · Joe MacDonald
From: Andreas Oberritter <[email protected]>
Signed-off-by Andreas Oberritter <[email protected]>Signed-off-by Joe MacDonald <[email protected]>--- .../recipes-connectivity/samba/samba_4.4.5.bb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +0
-0
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb do_install_append() { · line 148
Quoted 10 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +3
-4@@ -143,10 +143,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${BPN}-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 \
^
This partially reverts commit 8f92aa970a34fa5af019c164d9e650de8fe511d3.
Regards,
Andreas
Quoted 22 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +12
-0+ smbclient" RDEPENDS_${PN} += "${PN}-base"@@ -301,5 +301,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"
Re: [meta-networking][PATCH 04/11] samba: add smbclient package
Quoted 25 lines · [Re: [meta-networking][PATCH 04/11] samba: add smbclient package] On 16.12.17…
Quoted 13 lines · Joe MacDonald
From: Andreas Oberritter <[email protected]>
Signed-off-by Andreas Oberritter <[email protected]>Signed-off-by Joe MacDonald <[email protected]>--- .../recipes-connectivity/samba/samba_4.4.5.bb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +0
-0meta-networking/recipes-connectivity/samba/samba_4.4.5.bb do_install_append() { · line 148
Quoted 10 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +3
-4@@ -143,10 +143,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${BPN}-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 \^
Quoted 1 line
This partially reverts commit
8f92aa970a34fa5af019c164d9e650de8fe511d3.
Correct, I missed that. Thanks.
-J.
Quoted 27 lines
Regards,
AndreasQuoted 22 lines
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +12
-0+ smbclient" RDEPENDS_${PN} += "${PN}-base"@@ -301,5 +301,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 · 2 lines
-Joe MacDonald. :wq
PATCH 5/11 samba: install manpages
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- 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
@@ -97,6 +97,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
1.9.1
PATCH 6/11 samba: simplify files list for samba-python
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- .../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
@@ -292,23 +292,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
1.9.1
PATCH 7/11 samba: split libraries into their own packages
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
It'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 | 134 +++++---------------- 1 file changed, 30 insertions(+), 104 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +30 -104
@@ -152,11 +152,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 \
@@ -177,121 +199,25 @@ 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${BPN}-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_${BPN}-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
1.9.1
PATCH 8/11 samba: add packages samba-dsdb-modules, samba-testsuite and registry-tools
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
Inspired 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
@@ -153,6 +153,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"
@@ -209,6 +210,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
1.9.1
PATCH 9/11 samba: move /etc/sysconfig to more common /etc/default, package tmpfiles.d in samba-common
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +6 -3
@@ -108,7 +108,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
@@ -133,8 +135,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 # install ctdb config file and test cases install -D -m 0644 ${S}/ctdb/tests/onnode/nodes ${D}${sysconfdir}/ctdb/nodes
@@ -202,6 +204,7 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ FILES_${BPN}-common = "${sysconfdir}/default \ ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d \ " FILES_${PN} += "${libdir}/vfs/*.so \
Signature · 1 line
1.9.1
PATCH 10/11 samba: start on boot with systemd
In reply to Joe MacDonaldFrom: 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 +4 -0
@@ -44,6 +44,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
1.9.1
PATCH 11/11 samba: simplify LSB handling
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- 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
@@ -38,8 +38,8 @@ DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" LDFLAGS_append_libc-musl = " -ltirpc" -SYSVINITTYPE_linuxstdbase = "lsb" -SYSVINITTYPE = "sysv" +LSB = "" +LSB_linuxstdbase = "lsb" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
@@ -48,19 +48,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 util-linux-getopt" 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"
@@ -120,7 +117,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
1.9.1
Quoted 8 lines · Joe MacDonald
As I mentioned earlier this week, I'm taking a stab at updating the samba patches from Andreas Oberritter that now have conflicts due to other changes queued up for samba. Quite a few of them actually applied cleanly after resolving earlier conflicts and the basic smoke tests seem to pass for me, but this definitely needs a bit of soak time in master-next and if you're around, Andreas, and can double-check my work on your patches, that'd be much appreciated.
Joe, apart from my comment to patch 4, your rebase looks good to me. I hope that patch 7 doesn't introduce a regression for multilib, but I guess someone using multilib has to find out.
Regards,
Andreas
Quoted 10 lines · [Re: [meta-networking][PATCH 00/11] samba: refresh pending patches] On…
Quoted 8 lines · Joe MacDonald
As I mentioned earlier this week, I'm taking a stab at updating the samba patches from Andreas Oberritter that now have conflicts due to other changes queued up for samba. Quite a few of them actually applied cleanly after resolving earlier conflicts and the basic smoke tests seem to pass for me, but this definitely needs a bit of soak time in master-next and if you're around, Andreas, and can double-check my work on your patches, that'd be much appreciated.
Quoted 3 lines
Joe, apart from my comment to patch 4, your rebase looks good to me. I hope that patch 7 doesn't introduce a regression for multilib, but I guess someone using multilib has to find out.
That's a good point and I am setting up a multilib build here to try it out, but since I never use multilib and since patch 7 only hits the one package list that was using BPN, I'm thinking multilib builds were broken in a different way before any of this anyway.
Thanks for the review, Andreas.
Signature · 2 lines
-Joe MacDonald. :wq
v2 cover samba: refresh pending patches
In reply to Joe MacDonaldRev two of the updated patch set, this time with potentially less multlib issues (thanks for catching that, Andreas) and formally dropping the DISABLE_STATIC patch.
Signature · 2 lines
-Joe MacDonald. :wq
PATCH 1/10 samba: rename initscript from 'samba.sh' to more common 'samba'
From: Andreas Oberritter <[email protected]>
This 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
@@ -41,7 +41,7 @@ LDFLAGS_append_libc-musl = " -ltirpc" 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)} \
@@ -109,16 +109,16 @@ 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' \ + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ -e 's,/usr/bin,${base_bindir},g' \ - -i ${D}${sysconfdir}/init.d/samba.sh + -i ${D}${sysconfdir}/init.d/samba fi install -d ${D}${sysconfdir}/samba
Signature · 1 line
1.9.1
PATCH 2/10 samba: install systemd units and initscripts unconditionally
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
Fixes 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
@@ -98,19 +98,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
1.9.1
PATCH 3/10 samba: add smbclient package
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- .../recipes-connectivity/samba/samba_4.4.5.bb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +15 -4
@@ -144,10 +144,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${BPN}-base ${PN}-base ${PN}-ctdb-tests" - +PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator \ + libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \ + libsmbclient lib${BPN}-base ${PN}-base ${PN}-ctdb-tests \ + smbclient" RDEPENDS_${PN} += "${PN}-base"
@@ -302,5 +302,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
1.9.1
PATCH 4/10 samba: install manpages
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- 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
@@ -98,6 +98,15 @@ DISABLE_STATIC = "" 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
1.9.1
PATCH 5/10 samba: simplify files list for samba-python
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- .../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
@@ -293,23 +293,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
1.9.1
PATCH 6/10 samba: split libraries into their own packages
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
It'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 | 134 +++++---------------- 1 file changed, 30 insertions(+), 104 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +30 -104
@@ -153,11 +153,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${BPN}-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 \
@@ -178,121 +200,25 @@ 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${BPN}-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_${BPN}-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
1.9.1
PATCH 7/10 samba: add packages samba-dsdb-modules, samba-testsuite and registry-tools
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
Inspired 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
@@ -154,6 +154,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"
@@ -210,6 +211,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
1.9.1
PATCH 8/10 samba: move /etc/sysconfig to more common /etc/default, package tmpfiles.d in samba-common
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +6 -3
@@ -109,7 +109,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
@@ -134,8 +136,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 # install ctdb config file and test cases install -D -m 0644 ${S}/ctdb/tests/onnode/nodes ${D}${sysconfdir}/ctdb/nodes
@@ -203,6 +205,7 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ FILES_${BPN}-common = "${sysconfdir}/default \ ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d \ " FILES_${PN} += "${libdir}/vfs/*.so \
Signature · 1 line
1.9.1
PATCH 9/10 samba: start on boot with systemd
In reply to Joe MacDonaldFrom: 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 +4 -0
@@ -44,6 +44,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
1.9.1
PATCH 10/10 samba: simplify LSB handling
In reply to Joe MacDonaldFrom: Andreas Oberritter <[email protected]>
--- 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
@@ -38,8 +38,8 @@ DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" LDFLAGS_append_libc-musl = " -ltirpc" -SYSVINITTYPE_linuxstdbase = "lsb" -SYSVINITTYPE = "sysv" +LSB = "" +LSB_linuxstdbase = "lsb" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
@@ -48,19 +48,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 util-linux-getopt" 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"
@@ -121,7 +118,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
1.9.1
Quoted 8 lines · Joe MacDonald
As I mentioned earlier this week, I'm taking a stab at updating the samba patches from Andreas Oberritter that now have conflicts due to other changes queued up for samba. Quite a few of them actually applied cleanly after resolving earlier conflicts and the basic smoke tests seem to pass for me, but this definitely needs a bit of soak time in master-next and if you're around, Andreas, and can double-check my work on your patches, that'd be much appreciated.
Are some of these changes appropriate for Morty?
- Armin
Quoted 12 lines · On 17.12.2016 18:33, akuster808 wrote:
Quoted 8 lines · Joe MacDonald
As I mentioned earlier this week, I'm taking a stab at updating the samba patches from Andreas Oberritter that now have conflicts due to other changes queued up for samba. Quite a few of them actually applied cleanly after resolving earlier conflicts and the basic smoke tests seem to pass for me, but this definitely needs a bit of soak time in master-next and if you're around, Andreas, and can double-check my work on your patches, that'd be much appreciated.
Quoted 1 line
Are some of these changes appropriate for Morty?
Not necessarily, but I'd consider commit bb2cbb9 (samba: Avoid timeout for nmbd if started offline with systemd), which was sent separately.
Regards,
Andreas