This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/4421 to look at the new patch set (#3). rename osmo-bsc to osmo-bsc-sccplite This is to avoid naming conflicts with the new osmo-bsc, which resides in its own git repository (osmo-bsc.git) and which uses libosmo-sigtran and implements (primarily) 3GPP AoIP. Change-Id: If10d1599b62d010726336134091a4e855c380d93 --- M debian/changelog M debian/control A debian/osmocom-bsc-sccplite.examples A debian/osmocom-bsc-sccplite.install D debian/osmocom-bsc.examples D debian/osmocom-bsc.install M debian/rules M openbsc/.gitignore M openbsc/contrib/bsc-test/msc.sh R openbsc/contrib/systemd/osmo-bsc-sccplite.service R openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg M openbsc/osmoappdesc.py M openbsc/src/osmo-bsc/Makefile.am M openbsc/src/osmo-bsc/osmo_bsc_main.c M openbsc/tests/ctrl_test_runner.py M openbsc/tests/vty_test_runner.py 16 files changed, 33 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/21/4421/3 diff --git a/debian/changelog b/debian/changelog index e9a4212..dd850be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ * Prevent SGSN starting with 'auth-policy remote' when no 'gsup remote-*' are configured. Note: such configs are broken without extra workarounds anyway. + [ Harald Welte ] + * Rename osmo-bsc to osmo-bsc-sccplite to avoid clashes with new 3GPP AoIP + osmo-bsc.git code + -- Holger Hans Peter Freyther <holger at moiji-mobile.com> Tue, 24 May 2016 23:14:31 +0200 openbsc (0.14.0) unstable; urgency=low diff --git a/debian/control b/debian/control index 58e8966..e31d0c4 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Vcs-Browser: http://openbsc.osmocom.org/trac/browser Homepage: https://projects.osmocom.org/projects/openbsc -Package: osmocom-bsc +Package: osmocom-bsc-sccplite Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -40,7 +40,7 @@ Description: GSM Network-in-a-Box, implements BSC, MSC, SMSC, HLR, VLR This is the Network-in-a-Box version of OpenBSC. It has all the GSM network components bundled together. When using osmocom-nitb, there is no need for a - Mobile Switching Center (MSC) which is needed when using osmocom-bsc. + Mobile Switching Center (MSC) which is needed when using osmocom-bsc-sccplite. Package: osmocom-ipaccess-utils Architecture: any @@ -64,13 +64,13 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: osmocom-bsc +Recommends: osmocom-bsc-sccplite Description: Osmocom Base Station Controller Network Address Translation This NAT is useful for masquerading multiple BSCs behind one. It listens for incoming BSCs on port 5000 and connects to a specified Mobile Switching Center (MSC). . - This package is part of OpenBSC and closely related to osmocom-bsc. + This package is part of OpenBSC and closely related to osmocom-bsc-sccplite. Package: openbsc-dev Architecture: all @@ -83,11 +83,11 @@ The directory structure is copied after the structure in the repository and the header and .c file are installed into /usr/src/osmocom/openbsc/. -Package: osmocom-bsc-dbg +Package: osmocom-bsc-sccplite-dbg Architecture: any Section: debug Priority: extra -Depends: osmocom-bsc (= ${binary:Version}), ${misc:Depends} +Depends: osmocom-bsc-sccplite (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for the OpenBSC BSC Make debugging possible diff --git a/debian/osmocom-bsc-sccplite.examples b/debian/osmocom-bsc-sccplite.examples new file mode 100644 index 0000000..545709b --- /dev/null +++ b/debian/osmocom-bsc-sccplite.examples @@ -0,0 +1,2 @@ +openbsc/doc/examples/osmo-bsc_mgcp +openbsc/doc/examples/osmo-bsc-sccplite diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install new file mode 100644 index 0000000..9ce795c --- /dev/null +++ b/debian/osmocom-bsc-sccplite.install @@ -0,0 +1,2 @@ +/usr/bin/osmo-bsc_mgcp +/usr/bin/osmo-bsc-sccplite diff --git a/debian/osmocom-bsc.examples b/debian/osmocom-bsc.examples deleted file mode 100644 index a95f12b..0000000 --- a/debian/osmocom-bsc.examples +++ /dev/null @@ -1 +0,0 @@ -openbsc/doc/examples/osmo-bsc_mgcp diff --git a/debian/osmocom-bsc.install b/debian/osmocom-bsc.install deleted file mode 100644 index ab9459e..0000000 --- a/debian/osmocom-bsc.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/osmo-bsc_mgcp -/usr/bin/osmo-bsc diff --git a/debian/rules b/debian/rules index d1d74a5..05bbbef 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ cd openbsc && autoreconf --install --force override_dh_strip: - dh_strip -posmocom-bsc --dbg-package=osmocom-bsc-dbg + dh_strip -posmocom-bsc-sccplite --dbg-package=osmocom-bsc-sccplite-dbg dh_strip -posmocom-nitb --dbg-package=osmocom-nitb-dbg dh_strip -posmocom-ipaccess-utils --dbg-package=osmocom-ipaccess-utils-dbg dh_strip -posmocom-bs11-utils --dbg-package=osmocom-bs11-utils-dbg diff --git a/openbsc/.gitignore b/openbsc/.gitignore index f54aa59..3a811e7 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -9,7 +9,7 @@ openbsc.pc src/osmo-nitb/osmo-nitb src/osmo-bsc_mgcp/osmo-bsc_mgcp -src/osmo-bsc/osmo-bsc +src/osmo-bsc/osmo-bsc-sccplite src/utils/meas_vis src/utils/meas_json src/utils/osmo-meas-pcap2db diff --git a/openbsc/contrib/bsc-test/msc.sh b/openbsc/contrib/bsc-test/msc.sh index bec011d..766603d 100755 --- a/openbsc/contrib/bsc-test/msc.sh +++ b/openbsc/contrib/bsc-test/msc.sh @@ -2,7 +2,7 @@ while true; do - echo "Kill the osmo-bsc" - /usr/bin/kill -s SIGUSR2 `pidof osmo-bsc` + echo "Kill the osmo-bsc-sccplite" + /usr/bin/kill -s SIGUSR2 `pidof osmo-bsc-sccplite` sleep 58s done diff --git a/openbsc/contrib/systemd/osmo-bsc.service b/openbsc/contrib/systemd/osmo-bsc-sccplite.service similarity index 65% rename from openbsc/contrib/systemd/osmo-bsc.service rename to openbsc/contrib/systemd/osmo-bsc-sccplite.service index 4047fef..70cda5f 100644 --- a/openbsc/contrib/systemd/osmo-bsc.service +++ b/openbsc/contrib/systemd/osmo-bsc-sccplite.service @@ -5,7 +5,7 @@ [Service] Type=simple Restart=always -ExecStart=/usr/bin/osmo-bsc -c /etc/osmocom/osmo-bsc.cfg -s +ExecStart=/usr/bin/osmo-bsc-sccplite -c /etc/osmocom/osmo-bsc-sccplite.cfg -s RestartSec=2 [Install] diff --git a/openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg b/openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg similarity index 100% rename from openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg rename to openbsc/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py index ba6d954..c5b20ac 100644 --- a/openbsc/osmoappdesc.py +++ b/openbsc/osmoappdesc.py @@ -28,7 +28,7 @@ app_configs = { - "osmo-bsc": ["doc/examples/osmo-bsc/osmo-bsc.cfg"], + "osmo-bsc-sccplite": ["doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"], "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"], "mgcp": ["doc/examples/osmo-bsc_mgcp/mgcp.cfg"], "nitb": ["doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg", @@ -36,7 +36,7 @@ } -apps = [(4242, "src/osmo-bsc/osmo-bsc", "OsmoBSC", "osmo-bsc"), +apps = [(4242, "src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "osmo-bsc-sccplite"), (4244, "src/osmo-bsc_nat/osmo-bsc_nat", "OsmoBSCNAT", "nat"), (4243, "src/osmo-bsc_mgcp/osmo-bsc_mgcp", "OpenBSC MGCP", "mgcp"), (4242, "src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb"), diff --git a/openbsc/src/osmo-bsc/Makefile.am b/openbsc/src/osmo-bsc/Makefile.am index ae9410c..343af70 100644 --- a/openbsc/src/osmo-bsc/Makefile.am +++ b/openbsc/src/osmo-bsc/Makefile.am @@ -21,10 +21,10 @@ $(NULL) bin_PROGRAMS = \ - osmo-bsc \ + osmo-bsc-sccplite \ $(NULL) -osmo_bsc_SOURCES = \ +osmo_bsc_sccplite_SOURCES = \ osmo_bsc_main.c \ osmo_bsc_vty.c \ osmo_bsc_api.c \ @@ -38,7 +38,7 @@ $(NULL) # once again since TRAU uses CC symbol :( -osmo_bsc_LDADD = \ +osmo_bsc_sccplite_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 6081460..022cd3d 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -70,7 +70,7 @@ static void print_usage() { - printf("Usage: osmo-bsc\n"); + printf("Usage: osmo-bsc-sccplite\n"); } static void print_help() diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py index 46c4dcf..fb69027 100644 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -155,11 +155,11 @@ os.unlink("tmp_dummy_sock") def ctrl_command(self): - return ["./src/osmo-bsc/osmo-bsc", "-r", "tmp_dummy_sock", "-c", - "doc/examples/osmo-bsc/osmo-bsc.cfg"] + return ["./src/osmo-bsc/osmo-bsc-sccplite", "-r", "tmp_dummy_sock", "-c", + "doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"] def ctrl_app(self): - return (4249, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") + return (4249, "./src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "bsc") def testCtrlErrs(self): r = self.do_get('invalid') @@ -606,7 +606,7 @@ # added. e.g. by implementing a get for the list. def add_bsc_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")): + if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc-sccplite")): print("Skipping the BSC test") return test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlBSC) diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 8bec7c0..a3161fb 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -579,11 +579,11 @@ class TestVTYBSC(TestVTYGenericBSC): def vty_command(self): - return ["./src/osmo-bsc/osmo-bsc", "-c", - "doc/examples/osmo-bsc/osmo-bsc.cfg"] + return ["./src/osmo-bsc/osmo-bsc-sccplite", "-c", + "doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"] def vty_app(self): - return (4242, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") + return (4242, "./src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "bsc") def testConfigNetworkTree(self): self._testConfigNetworkTree() @@ -1113,7 +1113,7 @@ return bsc def add_bsc_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")): + if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc-sccplite")): print("Skipping the BSC test") return test = unittest.TestLoader().loadTestsFromTestCase(TestVTYBSC) -- To view, visit https://gerrit.osmocom.org/4421 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If10d1599b62d010726336134091a4e855c380d93 Gerrit-PatchSet: 3 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder