<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13504">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">configure.ac: Add --disable-remsim-bankd<br><br>This allows builds on small/embedded platforms to avoid all the<br>dependencies required by remsim-bankd, including libpcsc-lite<br><br>Change-Id: I29a1a0131fdfea6742ec12d81228879066b1ff7e<br>---<br>M configure.ac<br>M doc/Makefile.am<br>R doc/examples/bankd_pcsc_slots.csv<br>M src/Makefile.am<br>A src/bankd/Makefile.am<br>R src/bankd/bankd.h<br>R src/bankd/bankd_main.c<br>R src/bankd/bankd_pcsc.c<br>R src/bankd/driver_core.c<br>R src/bankd/driver_pcsc.c<br>R src/bankd/internal.h<br>R src/bankd/main.c<br>12 files changed, 41 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index b369133..e87c8c8 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -39,7 +39,6 @@</span><br><span> PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0)</span><br><span> PKG_CHECK_MODULES(OSMOABIS, libosmoabis)</span><br><span> PKG_CHECK_MODULES(OSMOSIM, libosmosim)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(PCSC, libpcsclite)</span><br><span> PKG_CHECK_MODULES(USB, libusb-1.0)</span><br><span> </span><br><span> AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])],</span><br><span>@@ -52,6 +51,16 @@</span><br><span> AM_CONDITIONAL(BUILD_SERVER, test "x$osmo_ac_build_server" = "xyes")</span><br><span> AC_SUBST(BUILD_SERVER)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE([remsim-bankd],[AS_HELP_STRING([--disable-remsim-bankd], [Build osmo-remsim-bankd])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [osmo_ac_build_bankd="$enableval"],[osmo_ac_build_bankd="yes"])</span><br><span style="color: hsl(120, 100%, 40%);">+if test "$osmo_ac_build_bankd" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE(BUILD_BANKD, 1, [Define if we want to build osmo-remsim-bankd])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL(BUILD_BANKD, test "x$osmo_ac_build_bankd" = "xyes")</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(PCSC, libpcsclite)</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST(BUILD_BANKD)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AC_CONFIG_MACRO_DIR([m4])</span><br><span> </span><br><span> dnl checks for header files</span><br><span>@@ -142,6 +151,7 @@</span><br><span> doc/manuals/Makefile</span><br><span> src/Makefile</span><br><span> src/rspro/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ src/bankd/Makefile</span><br><span> src/server/Makefile</span><br><span> include/Makefile</span><br><span> include/osmocom/Makefile</span><br><span>diff --git a/doc/Makefile.am b/doc/Makefile.am</span><br><span>index adfdcf7..dd4a573 100644</span><br><span>--- a/doc/Makefile.am</span><br><span>+++ b/doc/Makefile.am</span><br><span>@@ -1,3 +1,5 @@</span><br><span> SUBDIRS = \</span><br><span> manuals \</span><br><span> $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = examples/bankd_pcsc_slots.csv</span><br><span>diff --git a/src/bankd_pcsc_slots.csv b/doc/examples/bankd_pcsc_slots.csv</span><br><span>similarity index 100%</span><br><span>rename from src/bankd_pcsc_slots.csv</span><br><span>rename to doc/examples/bankd_pcsc_slots.csv</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 5b6efb9..165c3f7 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -1,4 +1,7 @@</span><br><span> SUBDIRS = rspro</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_BANKD</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS += bankd</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span> if BUILD_SERVER</span><br><span> SUBDIRS += server</span><br><span> endif</span><br><span>@@ -15,7 +18,7 @@</span><br><span> rspro/libosmo-asn1-rspro.la</span><br><span> libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = debug.h bankd.h client.h internal.h rspro_util.h slotmap.h rspro_client_fsm.h \</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \</span><br><span> asn1c_helpers.h \</span><br><span> simtrace2/apdu_dispatch.h \</span><br><span> simtrace2/libusb_util.h \</span><br><span>@@ -23,16 +26,7 @@</span><br><span> simtrace2/simtrace_prot.h \</span><br><span> simtrace2/simtrace_usb.h</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = osmo-remsim-bankd osmo-remsim-client-st2</span><br><span style="color: hsl(0, 100%, 40%);">-noinst_PROGRAMS = pcsc_test remsim-client</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c</span><br><span style="color: hsl(0, 100%, 40%);">-pcsc_test_LDADD = $(OSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(PCSC_LIBS) libosmo-rspro.la</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_remsim_bankd_SOURCES = slotmap.c bankd_main.c bankd_pcsc.c rspro_client_fsm.c debug.c</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(PCSC_LIBS) libosmo-rspro.la -lcsv</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = osmo-remsim-client-st2</span><br><span> </span><br><span> remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c bankd_client_fsm.c debug.c</span><br><span> remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span>diff --git a/src/bankd/Makefile.am b/src/bankd/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..62ed581</span><br><span>--- /dev/null</span><br><span>+++ b/src/bankd/Makefile.am</span><br><span>@@ -0,0 +1,23 @@</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src \</span><br><span style="color: hsl(120, 100%, 40%);">+ -I$(top_srcdir)/include/osmocom/rspro \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) $(OSMOSIM_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(PCSC_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = bankd.h internal.h</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = osmo-remsim-bankd</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_PROGRAMS = pcsc_test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c</span><br><span style="color: hsl(120, 100%, 40%);">+pcsc_test_LDADD = $(OSMOCORE_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(PCSC_LIBS) $(top_builddir)/src/libosmo-rspro.la</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_bankd_SOURCES = ../slotmap.c ../rspro_client_fsm.c ../debug.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ bankd_main.c bankd_pcsc.c</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) $(OSMOSIM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(PCSC_LIBS) $(top_builddir)/src/libosmo-rspro.la -lcsv</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# as suggested in http://lists.gnu.org/archive/html/automake/2009-03/msg00011.html</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE:</span><br><span style="color: hsl(120, 100%, 40%);">+$(top_builddir)/src/libosmo-rspro.la: FORCE</span><br><span style="color: hsl(120, 100%, 40%);">+ (cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libosmo-rspro.la)</span><br><span>diff --git a/src/bankd.h b/src/bankd/bankd.h</span><br><span>similarity index 100%</span><br><span>rename from src/bankd.h</span><br><span>rename to src/bankd/bankd.h</span><br><span>diff --git a/src/bankd_main.c b/src/bankd/bankd_main.c</span><br><span>similarity index 100%</span><br><span>rename from src/bankd_main.c</span><br><span>rename to src/bankd/bankd_main.c</span><br><span>diff --git a/src/bankd_pcsc.c b/src/bankd/bankd_pcsc.c</span><br><span>similarity index 100%</span><br><span>rename from src/bankd_pcsc.c</span><br><span>rename to src/bankd/bankd_pcsc.c</span><br><span>diff --git a/src/driver_core.c b/src/bankd/driver_core.c</span><br><span>similarity index 100%</span><br><span>rename from src/driver_core.c</span><br><span>rename to src/bankd/driver_core.c</span><br><span>diff --git a/src/driver_pcsc.c b/src/bankd/driver_pcsc.c</span><br><span>similarity index 100%</span><br><span>rename from src/driver_pcsc.c</span><br><span>rename to src/bankd/driver_pcsc.c</span><br><span>diff --git a/src/internal.h b/src/bankd/internal.h</span><br><span>similarity index 100%</span><br><span>rename from src/internal.h</span><br><span>rename to src/bankd/internal.h</span><br><span>diff --git a/src/main.c b/src/bankd/main.c</span><br><span>similarity index 100%</span><br><span>rename from src/main.c</span><br><span>rename to src/bankd/main.c</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13504">change 13504</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13504"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I29a1a0131fdfea6742ec12d81228879066b1ff7e </div>
<div style="display:none"> Gerrit-Change-Number: 13504 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>