osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmocom-bb/+/39001?usp=email )
Change subject: debian: add subpackage osmocom-bb-virtphy
......................................................................
debian: add subpackage osmocom-bb-virtphy
I've decided to name the package osmocom-bb-virtphy so there is no
underscore in it (would look weird in addition to the minus character)
and because it matches the name of the binary "virtphy".
Change-Id: I09d98aba81ab6c76ad46aae36e7369114cef7dd7
---
M debian/control
M debian/rules
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/39001/2
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39001?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I09d98aba81ab6c76ad46aae36e7369114cef7dd7
Gerrit-Change-Number: 39001
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38999?usp=email )
Change subject: debian: prepare for more subpackages
......................................................................
debian: prepare for more subpackages
Prepare to add these subpackages in follow-up patches:
* osmocom-bb-trx-toolkit
* osmocom-bb-trxcon
* osmocom-bb-virtphy
We need these components to run some of the ttnc3 testsuites. By having
them packaged, we can just install them from the binary repositories
along with the SUT.
trxcon and virtphy are autootols based, so rework debian/rules to
support building multiple autotools projects.
Related: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38851/1..2//COMMIT_MSG#b9
Change-Id: I77ad988f5405e6fa9e585eeb646e513ac7d92485
---
M debian/rules
1 file changed, 21 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/99/38999/1
diff --git a/debian/rules b/debian/rules
index 8dd0df8..df0520e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,26 @@
#!/usr/bin/make -f
+DH_ARGS := -D src/host/$$SUBPKG_DIR --with-autoreconf
%:
- dh $@ -D src/host/layer23 --with-autoreconf
+ export SUBPKG=layer23; \
+ export SUBPKG_DIR=layer23; \
+ export SUBPKG_CFG=--with-gapk-io; \
+ dh $@ $(DH_ARGS)
+
+# We need to run autoreconf multiple times, but dh_autoreconf can only run once
+# (see dh-autoreconf(7)). Run autoreconf directly to work around this.
+override_dh_autoreconf:
+ cd src/host/$$SUBPKG_DIR && autoreconf -fi
override_dh_auto_configure:
- dh_auto_configure -D src/host/layer23 -- --with-gapk-io
+ dh_auto_configure -D src/host/$$SUBPKG_DIR -- $$SUBPKG_CFG
+
+override_dh_auto_install:
+ dh_auto_install -O-Dsrc/host/$$SUBPKG_DIR --destdir=debian/osmocom-bb-$$SUBPKG/
+
+# Run dh_prep only for the first subpackage. Otherwise previously built
+# binaries get removed and we end up with empty packages.
+override_dh_prep:
+ if [ "$$SUBPKG" = "layer23" ]; then \
+ dh_prep; \
+ fi
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38999?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I77ad988f5405e6fa9e585eeb646e513ac7d92485
Gerrit-Change-Number: 38999
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email )
Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h
......................................................................
Drop use of libosmo-abis osmocom/abis/ipaccess.h
That header is only really used to provide an old hack for
ipaccess-proxy tool in openbsc.h/osmo-bsc.h, and will be deprecated
soon.
Take the chance to organize a bit better the includes based on dependency
chain.
Change-Id: I393cd23a09af6d1eefa68dc955415f4fe334d71b
---
M include/osmocom/hlr/gsup_server.h
M src/gsup_server.c
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/hlr/gsup_server.h b/include/osmocom/hlr/gsup_server.h
index 86ae4ec..5767dec 100644
--- a/include/osmocom/hlr/gsup_server.h
+++ b/include/osmocom/hlr/gsup_server.h
@@ -2,9 +2,9 @@
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/msgb.h>
-#include <osmocom/abis/ipa.h>
-#include <osmocom/abis/ipaccess.h>
#include <osmocom/gsm/gsup.h>
+#include <osmocom/gsm/protocol/ipaccess.h>
+#include <osmocom/abis/ipa.h>
#include <osmocom/gsupclient/cni_peer_id.h>
#include <osmocom/gsupclient/gsup_req.h>
diff --git a/src/gsup_server.c b/src/gsup_server.c
index 1510bd0..2df2d3d 100644
--- a/src/gsup_server.c
+++ b/src/gsup_server.c
@@ -24,12 +24,12 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/logging.h>
#include <osmocom/core/linuxlist.h>
-#include <osmocom/abis/ipa.h>
-#include <osmocom/abis/ipaccess.h>
-#include <osmocom/gsm/ipa.h>
#include <osmocom/gsm/gsm48_ie.h>
#include <osmocom/gsm/apn.h>
+#include <osmocom/gsm/protocol/ipaccess.h>
+#include <osmocom/gsm/ipa.h>
#include <osmocom/gsm/gsm23003.h>
+#include <osmocom/abis/ipa.h>
#include <osmocom/hlr/gsup_server.h>
#include <osmocom/hlr/gsup_router.h>
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I393cd23a09af6d1eefa68dc955415f4fe334d71b
Gerrit-Change-Number: 38989
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email )
Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I5f9daaf7789a56a08d2ec24b5e25e2e3b65b8b5b
Gerrit-Change-Number: 38991
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 02 Dec 2024 13:04:46 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/38990?usp=email )
Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h
......................................................................
Drop use of libosmo-abis osmocom/abis/ipaccess.h
That header is only really used to provide an old hack for
ipaccess-proxy tool in openbsc.h/osmo-bsc.h, and will be deprecated
soon.
Take the chance to organize a bit better the includes based on dependency
chain.
Change-Id: Ie4540eb6f535375a1e4ddf3849602aecb6260914
---
M src/common/abis.c
M src/common/oml.c
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
osmith: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/abis.c b/src/common/abis.c
index e619ec8..d9c56e9 100644
--- a/src/common/abis.c
+++ b/src/common/abis.c
@@ -39,10 +39,10 @@
#include <osmocom/core/signal.h>
#include <osmocom/core/macaddr.h>
#include <osmocom/core/fsm.h>
+#include <osmocom/gsm/protocol/ipaccess.h>
+#include <osmocom/gsm/ipa.h>
#include <osmocom/abis/abis.h>
#include <osmocom/abis/e1_input.h>
-#include <osmocom/abis/ipaccess.h>
-#include <osmocom/gsm/ipa.h>
#include <osmo-bts/abis.h>
#include <osmo-bts/logging.h>
diff --git a/src/common/oml.c b/src/common/oml.c
index a9e13b5..35b8664 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -36,10 +36,10 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/utils.h>
#include <osmocom/gsm/protocol/gsm_12_21.h>
+#include <osmocom/gsm/protocol/ipaccess.h>
#include <osmocom/gsm/abis_nm.h>
#include <osmocom/gsm/tlv.h>
#include <osmocom/abis/e1_input.h>
-#include <osmocom/abis/ipaccess.h>
#include <osmo-bts/logging.h>
#include <osmo-bts/gsm_data.h>
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38990?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ie4540eb6f535375a1e4ddf3849602aecb6260914
Gerrit-Change-Number: 38990
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>