subject:"\[PATCH\] openbsc\[master\]\: rename osmo\-bsc to osmo\-bsc\-sccplite"

[PATCH] openbsc[master]: rename osmo-bsc to osmo-bsc-sccplite

2017-10-25 Thread Harald Welte

Hello 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   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 000..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 000..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..000
--- 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..000
--- 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

[PATCH] openbsc[master]: rename osmo-bsc to osmo-bsc-sccplite

2017-10-25 Thread Harald Welte

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/4421

to look at the new patch set (#2).

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/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
15 files changed, 29 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/21/4421/2

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 000..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 000..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..000
--- 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..000
--- 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
---

[PATCH] openbsc[master]: rename osmo-bsc to osmo-bsc-sccplite

2017-10-25 Thread Harald Welte


Review at  https://gerrit.osmocom.org/4421

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/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
15 files changed, 29 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/21/4421/1

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 000..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 000..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..000
--- 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..000
--- 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

[PATCH] openbsc[master]: rename osmo-bsc to osmo-bsc-sccplite

[PATCH] openbsc[master]: rename osmo-bsc to osmo-bsc-sccplite

[PATCH] openbsc[master]: rename osmo-bsc to osmo-bsc-sccplite

3 matches

Site Navigation

Mail list logo

Footer information