[PATCH] osmo-bsc[master]: drop libcommon-cs completely
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/6443 to look at the new patch set (#4). drop libcommon-cs completely Change-Id: I07d4a48af3154ee4d904686f230a51b8b8a94ff9 --- M configure.ac M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/common_bsc.h D include/osmocom/bsc/common_cs.h M include/osmocom/bsc/gsm_data.h M src/Makefile.am M src/ipaccess/Makefile.am M src/libbsc/Makefile.am M src/libbsc/bsc_vty.c M src/libbsc/net_init.c D src/libcommon-cs/Makefile.am D src/libcommon-cs/common_cs.c D src/libcommon-cs/common_cs_vty.c M src/osmo-bsc/Makefile.am M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc_nat/Makefile.am M src/osmo-bsc_nat/bsc_nat.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/bsc-nat/Makefile.am M tests/bsc/Makefile.am M tests/bssap/Makefile.am M tests/channel/Makefile.am M tests/gsm0408/Makefile.am M tests/nanobts_omlattr/Makefile.am M tests/subscr/Makefile.am 26 files changed, 2 insertions(+), 114 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/6443/4 diff --git a/configure.ac b/configure.ac index b2644fe..dac222f 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,6 @@ src/Makefile src/libbsc/Makefile src/libfilter/Makefile -src/libcommon-cs/Makefile src/osmo-bsc/Makefile src/ipaccess/Makefile src/utils/Makefile diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index c503a50..f975947 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -16,7 +16,6 @@ chan_alloc.h \ common.h \ common_bsc.h \ - common_cs.h \ ctrl.h \ debug.h \ e1_config.h \ diff --git a/include/osmocom/bsc/common_bsc.h b/include/osmocom/bsc/common_bsc.h index 32e5097..d3c7ff5 100644 --- a/include/osmocom/bsc/common_bsc.h +++ b/include/osmocom/bsc/common_bsc.h @@ -1,7 +1,6 @@ #pragma once #include -#include struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, diff --git a/include/osmocom/bsc/common_cs.h b/include/osmocom/bsc/common_cs.h deleted file mode 100644 index b6a8ed8..000 --- a/include/osmocom/bsc/common_cs.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include -#include - -struct msgb; -struct gsm_network; - -struct vty; diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 8af594f..d1a901e 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/src/Makefile.am b/src/Makefile.am index 28b070e..fc9bf8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,6 @@ # Libraries SUBDIRS = \ - libcommon-cs \ libbsc \ libfilter \ $(NULL) diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 0301d3a..a6195b9 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -46,7 +46,6 @@ # FIXME: resolve the bogus dependencies patched around here: ipaccess_config_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index e68ada8..e8e69c7 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -19,8 +19,6 @@ libbsc.a \ $(NULL) -libbsc_a_LIBADD = $(top_builddir)/src/libcommon-cs/libcommon-cs.a - libbsc_a_SOURCES = \ abis_nm.c \ abis_nm_vty.c \ diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index 1407061..f1cbb54 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index c5c7c5e..90f668f 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -17,7 +17,6 @@ * */ -#include #include #include #include diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am deleted file mode 100644 index e549509..000 --- a/src/libcommon-cs/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - -I$(top_builddir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(LIBOSMOSIGTRAN_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -noinst_LIBRARIES = libcommon-cs.a - -libcommon_cs_a_SOURCES = \ - common_cs.c \ - common_cs_vty.c diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c deleted file mode 100644 index 9307f63..000 --- a/src/libcommon-cs/common_cs.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Code used by both libbsc and libmsc
[PATCH] osmo-bsc[master]: drop libcommon-cs completely
Review at https://gerrit.osmocom.org/6443 drop libcommon-cs completely Change-Id: I07d4a48af3154ee4d904686f230a51b8b8a94ff9 --- M configure.ac M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/common_bsc.h D include/osmocom/bsc/common_cs.h M include/osmocom/bsc/gsm_data.h M src/Makefile.am M src/ipaccess/Makefile.am M src/libbsc/Makefile.am M src/libbsc/bsc_vty.c M src/libbsc/net_init.c D src/libcommon-cs/Makefile.am D src/libcommon-cs/common_cs.c D src/libcommon-cs/common_cs_vty.c M src/libfilter/bsc_msg_filter.c M src/osmo-bsc/Makefile.am M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc_nat/Makefile.am M src/osmo-bsc_nat/bsc_nat.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/bsc-nat/Makefile.am M tests/bsc/Makefile.am M tests/bssap/Makefile.am M tests/channel/Makefile.am M tests/gsm0408/Makefile.am M tests/nanobts_omlattr/Makefile.am M tests/subscr/Makefile.am 27 files changed, 3 insertions(+), 115 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/6443/1 diff --git a/configure.ac b/configure.ac index 3356229..05f2d17 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,6 @@ src/Makefile src/libbsc/Makefile src/libfilter/Makefile -src/libcommon-cs/Makefile src/osmo-bsc/Makefile src/osmo-bsc_nat/Makefile src/ipaccess/Makefile diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index c503a50..f975947 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -16,7 +16,6 @@ chan_alloc.h \ common.h \ common_bsc.h \ - common_cs.h \ ctrl.h \ debug.h \ e1_config.h \ diff --git a/include/osmocom/bsc/common_bsc.h b/include/osmocom/bsc/common_bsc.h index 32e5097..d3c7ff5 100644 --- a/include/osmocom/bsc/common_bsc.h +++ b/include/osmocom/bsc/common_bsc.h @@ -1,7 +1,6 @@ #pragma once #include -#include struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, diff --git a/include/osmocom/bsc/common_cs.h b/include/osmocom/bsc/common_cs.h deleted file mode 100644 index b6a8ed8..000 --- a/include/osmocom/bsc/common_cs.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include -#include - -struct msgb; -struct gsm_network; - -struct vty; diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 8af594f..d1a901e 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/src/Makefile.am b/src/Makefile.am index 814571f..82cf0be 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,6 @@ # Libraries SUBDIRS = \ - libcommon-cs \ libbsc \ libfilter \ $(NULL) diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 0301d3a..a6195b9 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -46,7 +46,6 @@ # FIXME: resolve the bogus dependencies patched around here: ipaccess_config_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index e68ada8..e8e69c7 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -19,8 +19,6 @@ libbsc.a \ $(NULL) -libbsc_a_LIBADD = $(top_builddir)/src/libcommon-cs/libcommon-cs.a - libbsc_a_SOURCES = \ abis_nm.c \ abis_nm_vty.c \ diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index feb343a..6229aa2 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index c5c7c5e..90f668f 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -17,7 +17,6 @@ * */ -#include #include #include #include diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am deleted file mode 100644 index e549509..000 --- a/src/libcommon-cs/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - -I$(top_builddir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(LIBOSMOSIGTRAN_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -noinst_LIBRARIES = libcommon-cs.a - -libcommon_cs_a_SOURCES = \ - common_cs.c \ - common_cs_vty.c diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c deleted file mode 100644 index 9307f63..000 --- a/src/libcommon-cs/common_cs.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Code used by both libbsc and libmsc (common_cs means "BSC or MSC"). - * - * (C) 2016 by sysmocom s.m.f.c.
