Hi Gyorgy, [[oe] [meta-networking][PATCH] Samba: use only libsystemd] On 16.06.18 (Sat 21:06) Gyorgy Szombathelyi wrote:
> This patch was disappeared while moved to 4.4.2 I can't find this patch in the git history, but I'm happy to merge it if you can provide a bit more detail on it. Is it always valid to assume HAVE_LIBSYSTEMD will always mean HAVE_LIBSYSTEMD_JOURNAL and HAVE_LIBSYSTEMD_DAEMON? Also, can you provide an upstream-status on this? Thanks. -J. > > Signed-off-by: Gyorgy Szombathelyi <[email protected]> > --- > .../samba/samba-4.4.2/10-use-only-libsystemd.patch | 81 > ++++++++++++++++++++++ > .../recipes-connectivity/samba/samba_4.4.2.bb | 1 + > 2 files changed, 82 insertions(+) > create mode 100644 > meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch > > diff --git > a/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch > > b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch > new file mode 100644 > index 0000000..81621ff > --- /dev/null > +++ > b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch > @@ -0,0 +1,81 @@ > +diff -ur samba-4.4.2/lib/util/become_daemon.c > samba-4.4.2/lib/util/become_daemon.c > +--- samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:33:24.000000000 > +0200 > ++++ samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:26:50.275177918 > +0200 > +@@ -24,7 +24,7 @@ > + #include "includes.h" > + #include "system/filesys.h" > + #include "system/locale.h" > +-#if HAVE_LIBSYSTEMD_DAEMON > ++#if HAVE_LIBSYSTEMD > + #include <systemd/sd-daemon.h> > + #endif > + #include "lib/util/close_low_fd.h" > +@@ -69,9 +69,9 @@ > + if (do_fork) { > + newpid = fork(); > + if (newpid) { > +-#if HAVE_LIBSYSTEMD_DAEMON > ++#if HAVE_LIBSYSTEMD > + sd_notifyf(0, "READY=0\nSTATUS=Starting > process...\nMAINPID=%lu", (unsigned long) newpid); > +-#endif /* HAVE_LIBSYSTEMD_DAEMON */ > ++#endif /* HAVE_LIBSYSTEMD */ > + _exit(0); > + } > + } > +@@ -98,7 +98,7 @@ > + > + _PUBLIC_ void exit_daemon(const char *msg, int error) > + { > +-#ifdef HAVE_LIBSYSTEMD_DAEMON > ++#ifdef HAVE_LIBSYSTEMD > + if (msg == NULL) { > + msg = strerror(error); > + } > +@@ -117,7 +117,7 @@ > + if (name == NULL) { > + name = "Samba"; > + } > +-#ifdef HAVE_LIBSYSTEMD_DAEMON > ++#ifdef HAVE_LIBSYSTEMD > + sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", > name); > + #endif > + DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve " > +@@ -129,7 +129,7 @@ > + if (name == NULL) { > + name = "Samba"; > + } > +-#ifdef HAVE_LIBSYSTEMD_DAEMON > ++#ifdef HAVE_LIBSYSTEMD > + sd_notifyf(0, "\nSTATUS=%s: %s", name, msg); > + #endif > + DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg)); > +diff -ur samba-4.4.2/lib/util/debug.c samba-4.4.2/lib/util/debug.c > +--- samba-4.4.2/lib/util/debug.c 2016-05-08 18:33:24.000000000 +0200 > ++++ samba-4.4.2/lib/util/debug.c 2016-05-08 18:27:09.341481492 +0200 > +@@ -102,7 +102,7 @@ > + .fd = 2 /* stderr by default */ > + }; > + > +-#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL) > ++#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD) > + static int debug_level_to_priority(int level) > + { > + /* > +@@ -179,7 +179,7 @@ > + } > + #endif /* WITH_SYSLOG */ > + > +-#ifdef HAVE_LIBSYSTEMD_JOURNAL > ++#ifdef HAVE_LIBSYSTEMD > + #include <systemd/sd-journal.h> > + static void debug_systemd_log(int msg_level, > + const char *msg, const char *msg_no_nl) > +@@ -251,7 +251,7 @@ > + }, > + #endif > + > +-#ifdef HAVE_LIBSYSTEMD_JOURNAL > ++#ifdef HAVE_LIBSYSTEMD > + { > + .name = "systemd", > + .log = debug_systemd_log, > diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb > b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb > index 50c100e..b7ee730 100644 > --- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb > +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb > @@ -13,6 +13,7 @@ ${SAMBA_MIRROR} > http://www.mirrorservice.org/sites/ftp.samba.org \n \ > > SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ > file://00-fix-typos-in-man-pages.patch \ > + file://10-use-only-libsystemd.patch \ > file://16-do-not-check-xsltproc-manpages.patch \ > file://20-do-not-import-target-module-while-cross-compile.patch \ > file://21-add-config-option-without-valgrind.patch \ > -- > 2.7.4 > -- -Joe MacDonald. :wq
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
