Skip to contentSkip to conversation

build: link dundee with ell

PATCH Applied Denis Kenzior 2 participants 3 messages May 28, 2024 Kbuild

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 build: link dundee with ell

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile.am +1 -1
index 44fb7b1baef0..e60f4f2d2bee 100644
@@ -991,7 +991,7 @@ dundee_common_sources = $(gatchat_sources) \
 			dundee/dbus.c dundee/manager.c dundee/device.c
 
 dundee_dundee_LDADD = $(builtin_libadd) gdbus/libgdbus-internal.la \
-			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
+			$(ell_ldadd) @GLIB_LIBS@ @DBUS_LIBS@ -ldl
 
 if DATAFILES
 dist_dbusconf_DATA += dundee/dundee.conf
Signature · 1 line
2.45.0
#1 lore raw

PATCH 2/2 log: Use l_basename instead of basename

---
 src/log.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
src/log.c +3 -2
index fdfad362cfd1..4348f1be6191 100644
@@ -28,13 +28,14 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <syslog.h>
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 #endif
 #include <dlfcn.h>
 
+#include <ell/ell.h>
+
 #include "ofono.h"
 
 static const char *program_exec;
@@ -309,7 +310,7 @@ int __ofono_log_init(const char *program, const char *debug,
 	signal_setup(signal_handler);
 #endif
 
-	openlog(basename(program), option, LOG_DAEMON);
+	openlog(l_basename(program), option, LOG_DAEMON);
 
 	syslog(LOG_INFO, "oFono version %s", VERSION);
 
Signature · 1 line
2.45.0
#2 lore raw
In reply to Denis Kenzior
This series was applied to ofono.git (master) by Denis Kenzior <[email protected]>:

Hello:

This series was applied to ofono.git (master)
by Denis Kenzior <[email protected]>:

Quoted 3 lines · On Tue, 28 May 2024 13:53:35 -0500 you wrote:
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Here is the summary with links:
- [1/2] build: link dundee with ell

    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=59322e4d77ff
  - [2/2] log: Use l_basename instead of basename
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=47165d458c32

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html