Max has submitted this change and it was merged.
Change subject: Fix embedded build
......................................................................
Fix embedded build
Do not attempt to load auth plugins - this does not make sense on
embedded target anyway.
Change-Id: Ie92d2eea21e19e499b3f3bb4d5a82e31fbbea3f0
---
M src/gsm/auth_core.c
M src/gsm/gprs_cipher_core.c
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c
index 9e3b2c0..400708f 100644
--- a/src/gsm/auth_core.c
+++ b/src/gsm/auth_core.c
@@ -20,6 +20,8 @@
*
*/
+#include "config.h"
+
#include <errno.h>
#include <stdint.h>
#include <string.h>
@@ -71,7 +73,11 @@
int osmo_auth_load(const char *path)
{
/* load all plugins available from path */
+#if !defined(EMBEDDED)
return osmo_plugin_load_all(path);
+#else
+ return -1;
+#endif
}
/*! Determine if a given authentication algorithm is supported
diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
index 6fa25d6..7f2b1a5 100644
--- a/src/gsm/gprs_cipher_core.c
+++ b/src/gsm/gprs_cipher_core.c
@@ -23,6 +23,8 @@
*
*/
+#include "config.h"
+
#include <errno.h>
#include <stdint.h>
@@ -68,9 +70,11 @@
/* load all available GPRS cipher plugins */
int gprs_cipher_load(const char *path)
{
+#if !defined(EMBEDDED)
/* load all plugins available from path */
if (path)
return osmo_plugin_load_all(path);
+#endif
return 0;
}
--
To view, visit https://gerrit.osmocom.org/5122
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie92d2eea21e19e499b3f3bb4d5a82e31fbbea3f0
Gerrit-PatchSet: 2
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Max <msur...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msur...@sysmocom.de>
