December 2024 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-sysmon[master]: jenkins.sh: Skip building unneeded libosmo-abis

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sysmon/+/39090?usp=email ) Change subject: jenkins.sh: Skip building unneeded libosmo-abis ...................................................................... jenkins.sh: Skip building unneeded libosmo-abis Change-Id: I38b2a5297e967ca570b9a44cfd36373771280beb --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index bf983b5..bec114d 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -26,7 +26,6 @@ export LD_LIBRARY_PATH="$inst/lib" osmo-build-dep.sh libosmo-netif "" '--disable-doxygen' -osmo-build-dep.sh libosmo-abis set +x echo -- To view, visit https://gerrit.osmocom.org/c/osmo-sysmon/+/39090?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-Change-Id: I38b2a5297e967ca570b9a44cfd36373771280beb Gerrit-Change-Number: 39090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-sysmon[master]: jenkins.sh: Skip building unneeded libosmo-abis

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sysmon/+/39090?usp=email ) Change subject: jenkins.sh: Skip building unneeded libosmo-abis ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sysmon/+/39090?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-Change-Id: I38b2a5297e967ca570b9a44cfd36373771280beb Gerrit-Change-Number: 39090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 22:31:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in osmocom-bb[master]: jenkins.sh: Use --disable-doxygen configure param

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39107?usp=email ) Change subject: jenkins.sh: Use --disable-doxygen configure param ...................................................................... jenkins.sh: Use --disable-doxygen configure param Change-Id: I09eab54587e5d310143faaa57257fe05e4f0e7f6 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3127873..cd36e2f 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -24,7 +24,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false +osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-gprs osmo-build-dep.sh gapk -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39107?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I09eab54587e5d310143faaa57257fe05e4f0e7f6 Gerrit-Change-Number: 39107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-remsim[master]: Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39044?usp=email ) Change subject: Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif ...................................................................... Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif Related: OS#5896 Depends: libosmo-netif.git Change-Id I5c36e06e0dc29ec4679b20ad6c426f051b659acd Change-Id: Id9784c69f1524872053436b59712f67ad5fbfe94 --- M TODO-RELEASE M src/client/client.h M src/client/user_simtrace2.c M src/rspro_client_fsm.c M src/rspro_client_fsm.h M src/server/rspro_server.c M src/server/rspro_server.h 7 files changed, 78 insertions(+), 69 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index 7aeffd4..730a421 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmocore > 1.9.0 working (compiling) gsmtap_inst_fd2() libosmo-simtrace2 >= 0.9.0 required to compile (sim presence polarity) +libosmo-netif >1.5.1 osmo_ipa_ka_fsm_inst APIs diff --git a/src/client/client.h b/src/client/client.h index df95312..6ec94b7 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -2,7 +2,6 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/fsm.h> -#include <osmocom/abis/ipa.h> #include <osmocom/rspro/RsproPDU.h> #include "rspro_util.h" diff --git a/src/client/user_simtrace2.c b/src/client/user_simtrace2.c index 65d4cde..2535efb 100644 --- a/src/client/user_simtrace2.c +++ b/src/client/user_simtrace2.c @@ -22,6 +22,7 @@ #include <libusb.h> #include <osmocom/core/fsm.h> +#include <osmocom/core/select.h> #include <osmocom/core/utils.h> #include <osmocom/usb/libusb.h> diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index dcde0e4..29e0287 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -33,9 +33,6 @@ #include <osmocom/netif/stream.h> #include <osmocom/netif/ipa.h> -/* libosmo-abis still needed for ipa_keepalive_fsm: */ -#include <osmocom/abis/ipa.h> - #include "debug.h" #include "asn1c_helpers.h" #include "rspro_client_fsm.h" @@ -137,7 +134,6 @@ OSMO_VALUE_STRING(SRVC_E_TCP_UP), OSMO_VALUE_STRING(SRVC_E_TCP_DOWN), OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT), - OSMO_VALUE_STRING(SRVC_E_KA_TERMINATED), OSMO_VALUE_STRING(SRVC_E_CLIENT_CONN_RES), OSMO_VALUE_STRING(SRVC_E_RSPRO_TX), { 0, NULL } @@ -156,6 +152,13 @@ struct rspro_server_conn *srvc = osmo_stream_cli_get_data(cli); LOGPFSML(srvc->fi, LOGL_NOTICE, "RSPRO link to %s:%d DOWN\n", srvc->server_host, srvc->server_port); + + if (srvc->ka_fi) { + osmo_ipa_ka_fsm_stop(srvc->ka_fi); + osmo_ipa_ka_fsm_free(srvc->ka_fi); + srvc->ka_fi = NULL; + } + osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_TCP_DOWN, 0); return 0; } @@ -239,7 +242,7 @@ } switch (msg_type) { case IPAC_MSGT_PONG: - ipa_keepalive_fsm_pong_received(srvc->keepalive_fi); + osmo_ipa_ka_fsm_pong_received(srvc->ka_fi); rc = 0; break; default: @@ -275,11 +278,6 @@ return -EBADF; } -static const struct ipa_keepalive_params ka_params = { - .interval = 30, - .wait_for_resp = 10, -}; - static int64_t get_monotonic_ms(void) { struct timespec t; @@ -334,7 +332,7 @@ struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; RsproPDU_t *pdu; - ipa_keepalive_fsm_start(srvc->keepalive_fi); + osmo_ipa_ka_fsm_start(srvc->ka_fi); if (srvc->own_comp_id.type == ComponentType_remsimClient) pdu = rspro_gen_ConnectClientReq(&srvc->own_comp_id, srvc->clslot); @@ -407,29 +405,25 @@ osmo_fsm_inst_dispatch(fi->proc.parent, srvc->parent_disc_evt, NULL); } -static void ipa_keepalive_send_cb(struct osmo_fsm_inst *fi, void *conn, struct msgb *msg) +static int ipa_keepalive_send_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, struct msgb *msg, void *data) { - struct osmo_stream_cli *cli = (struct osmo_stream_cli *)conn; + struct osmo_stream_cli *cli = data; osmo_stream_cli_send(cli, msg); + return 0; } -static int ipa_kaepalive_timeout_cb(struct osmo_fsm_inst *ka_fi, void *conn) +static int ipa_keepalive_timeout_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, void *data) { - struct osmo_fsm_inst *fi = ka_fi->proc.parent; - osmo_fsm_inst_dispatch(fi, SRVC_E_KA_TIMEOUT, NULL); - return 0; /* we will explicitly terminate it */ + struct osmo_stream_cli *cli = data; + struct rspro_server_conn *srvc = osmo_stream_cli_get_data(cli); + osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_KA_TIMEOUT, NULL); + return 0; } static void srvc_st_reestablish_delay_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; - if (srvc->keepalive_fi) { - ipa_keepalive_fsm_stop(srvc->keepalive_fi); - osmo_fsm_inst_term(srvc->keepalive_fi, OSMO_FSM_TERM_REGULAR, NULL); - srvc->keepalive_fi = NULL; - } - if (srvc->conn) { LOGPFSML(fi, LOGL_INFO, "Destroying existing connection to server\n"); osmo_stream_cli_destroy(srvc->conn); @@ -449,6 +443,7 @@ OSMO_ASSERT(0); } } + static void srvc_st_reestablish_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; @@ -461,7 +456,7 @@ srvc->conn = osmo_stream_cli_create(fi); if (!srvc->conn) { LOGPFSML(fi, LOGL_FATAL, "Unable to create socket: %s\n", strerror(errno)); - exit(1); + goto err_exit; } osmo_stream_cli_set_name(srvc->conn, fi->id); @@ -479,15 +474,16 @@ osmo_stream_cli_set_disconnect_cb(srvc->conn, srvc_disconnect_cb); osmo_stream_cli_set_read_cb2(srvc->conn, srvc_read_cb); - srvc->keepalive_fi = ipa_generic_conn_alloc_keepalive_fsm(srvc->conn, srvc->conn, &ka_params, fi->id); - if (!srvc->keepalive_fi) { + srvc->ka_fi = osmo_ipa_ka_fsm_alloc(srvc->conn, fi->id); + if (!srvc->ka_fi) { LOGPFSM(fi, "Unable to create keepalive FSM\n"); - exit(1); + goto err_free_cli; } - ipa_keepalive_fsm_set_send_cb(srvc->keepalive_fi, ipa_keepalive_send_cb); - ipa_keepalive_fsm_set_timeout_cb(srvc->keepalive_fi, ipa_kaepalive_timeout_cb); - /* ensure parent is notified once keepalive FSM instance is dying */ - osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TERMINATED); + osmo_ipa_ka_fsm_set_data(srvc->ka_fi, srvc->conn); + osmo_ipa_ka_fsm_set_ping_interval(srvc->ka_fi, 30); + osmo_ipa_ka_fsm_set_pong_timeout(srvc->ka_fi, 10); + osmo_ipa_ka_fsm_set_send_cb(srvc->ka_fi, ipa_keepalive_send_cb); + osmo_ipa_ka_fsm_set_timeout_cb(srvc->ka_fi, ipa_keepalive_timeout_cb); /* Attempt to connect TCP socket */ rc = osmo_stream_cli_open(srvc->conn); @@ -495,8 +491,17 @@ LOGPFSML(fi, LOGL_FATAL, "Unable to connect RSPRO to %s:%u - %s\n", srvc->server_host, srvc->server_port, strerror(errno)); /* FIXME: retry? Timer? Abort? */ - OSMO_ASSERT(0); + goto err_free_ka_fi; } + +err_free_ka_fi: + osmo_ipa_ka_fsm_free(srvc->ka_fi); + srvc->ka_fi = NULL; +err_free_cli: + osmo_stream_cli_destroy(srvc->conn); + srvc->conn = NULL; +err_exit: + exit(1); } static void srvc_st_reestablish(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -525,11 +530,6 @@ srvc_do_reestablish(fi); break; case SRVC_E_DISCONNECT: - if (srvc->keepalive_fi) { - ipa_keepalive_fsm_stop(srvc->keepalive_fi); - osmo_fsm_inst_term(srvc->keepalive_fi, OSMO_FSM_TERM_REGULAR, NULL); - srvc->keepalive_fi = NULL; - } if (srvc->conn) { LOGPFSML(fi, LOGL_INFO, "Destroying existing connection to server\n"); osmo_stream_cli_destroy(srvc->conn); diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index 152ae5c..6ac40e5 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -13,7 +13,6 @@ SRVC_E_TCP_UP, SRVC_E_TCP_DOWN, SRVC_E_KA_TIMEOUT, - SRVC_E_KA_TERMINATED, SRVC_E_CLIENT_CONN_RES, SRVC_E_RSPRO_TX /* transmit a RSPRO PDU to the peer */ }; @@ -23,7 +22,7 @@ /* state */ struct osmo_stream_cli *conn; struct osmo_fsm_inst *fi; - struct osmo_fsm_inst *keepalive_fi; + struct osmo_ipa_ka_fsm_inst *ka_fi; int (*handle_rx)(struct rspro_server_conn *conn, const RsproPDU_t *pdu); /* index into k_reestablish_delay[] for this connection */ diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index c2001af..0936238 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -11,7 +11,6 @@ #include <osmocom/core/socket.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/netif/ipa.h> -#include <osmocom/abis/ipa.h> #include <osmocom/rspro/RsproPDU.h> @@ -164,9 +163,7 @@ rspro2client_slot(&conn->client.slot, cclreq->clientSlot); osmo_fsm_inst_update_id_f(fi, "C%u:%u", conn->client.slot.client_id, conn->client.slot.slot_nr); - osmo_fsm_inst_update_id_f(conn->keepalive_fi, "C%u:%u", - conn->client.slot.client_id, - conn->client.slot.slot_nr); + osmo_ipa_ka_fsm_set_id(conn->ka_fi, fi->id); LOGPFSML(fi, LOGL_INFO, "Client connected from %s:%s\n", ip_str, port_str); /* check for unique-ness */ @@ -214,7 +211,7 @@ conn->bank.bank_id = cbreq->bankId; conn->bank.num_slots = cbreq->numberOfSlots; osmo_fsm_inst_update_id_f(fi, "B%u", conn->bank.bank_id); - osmo_fsm_inst_update_id_f(conn->keepalive_fi, "B%u", conn->bank.bank_id); + osmo_ipa_ka_fsm_set_id(conn->ka_fi, fi->id); LOGPFSML(fi, LOGL_INFO, "Bankd connected from %s:%s\n", ip_str, port_str); if (!strncmp(ip_str, "127.", 4)) { @@ -671,7 +668,7 @@ return 0; case IPAC_MSGT_PONG: LOGPFSML(conn->fi, LOGL_DEBUG, "PONG!\n"); - ipa_keepalive_fsm_pong_received(conn->keepalive_fi); + osmo_ipa_ka_fsm_pong_received(conn->ka_fi); return 0; case IPAC_MSGT_ID_ACK: LOGPFSML(conn->fi, LOGL_DEBUG, "ID_ACK? -> ACK!\n"); @@ -764,29 +761,38 @@ static int sock_closed_cb(struct osmo_stream_srv *peer) { struct rspro_client_conn *conn = osmo_stream_srv_get_data(peer); - if (!conn) - return 0; /* rspro conn is already being destroyed, do nothing. */ + OSMO_ASSERT(conn); osmo_stream_srv_set_data(peer, NULL); - if (conn->fi) { - conn->peer = NULL; - osmo_fsm_inst_dispatch(conn->fi, CLNTC_E_TCP_DOWN, NULL); + if (conn->ka_fi) { + osmo_ipa_ka_fsm_stop(conn->ka_fi); + osmo_ipa_ka_fsm_free(conn->ka_fi); + conn->ka_fi = NULL; } - /* FIXME: who cleans up conn? */ - /* ipa server code relases 'peer' just after this */ + if (conn->fi) { + if (conn->peer) { + conn->peer = NULL; + osmo_fsm_inst_dispatch(conn->fi, CLNTC_E_TCP_DOWN, NULL); + } /* else: rspro conn is already being destroyed, do nothing. */ + } return 0; } -static const struct ipa_keepalive_params ka_params = { - .interval = 30, - .wait_for_resp = 10, -}; - -static void ipa_keepalive_send_cb(struct osmo_fsm_inst *fi, void *conn, struct msgb *msg) +static int ipa_keepalive_send_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, struct msgb *msg, void *data) { - struct osmo_stream_srv *srv = (struct osmo_stream_srv *)conn; + struct osmo_stream_srv *srv = data; osmo_stream_srv_send(srv, msg); + return 0; } +static int ipa_keepalive_timeout_cb(struct osmo_ipa_ka_fsm_inst *ka_fi, void *data) +{ + struct osmo_stream_srv *peer = data; + struct rspro_client_conn *conn = osmo_stream_srv_get_data(peer); + osmo_fsm_inst_dispatch(conn->fi, CLNTC_E_KA_TIMEOUT, NULL); + return 0; +} + + /* a new TCP connection was accepted on the RSPRO server socket */ static int accept_cb(struct osmo_stream_srv_link *link, int fd) { @@ -812,13 +818,15 @@ goto out_err_conn; /* use ipa_keepalive_fsm to periodically send an IPA_PING and expect a PONG in response */ - conn->keepalive_fi = ipa_generic_conn_alloc_keepalive_fsm(conn->peer, conn->peer, &ka_params, NULL); - if (!conn->keepalive_fi) + conn->ka_fi = osmo_ipa_ka_fsm_alloc(conn->peer, conn->fi->id); + if (!conn->ka_fi) goto out_err_fi; - /* ensure parent is notified once keepalive FSM instance is dying */ - osmo_fsm_inst_change_parent(conn->keepalive_fi, conn->fi, CLNTC_E_KA_TIMEOUT); - ipa_keepalive_fsm_set_send_cb(conn->keepalive_fi, ipa_keepalive_send_cb); - ipa_keepalive_fsm_start(conn->keepalive_fi); + osmo_ipa_ka_fsm_set_data(conn->ka_fi, conn->peer); + osmo_ipa_ka_fsm_set_ping_interval(conn->ka_fi, 30); + osmo_ipa_ka_fsm_set_pong_timeout(conn->ka_fi, 10); + osmo_ipa_ka_fsm_set_send_cb(conn->ka_fi, ipa_keepalive_send_cb); + osmo_ipa_ka_fsm_set_timeout_cb(conn->ka_fi, ipa_keepalive_timeout_cb); + osmo_ipa_ka_fsm_start(conn->ka_fi); INIT_LLIST_HEAD(&conn->bank.maps_new); INIT_LLIST_HEAD(&conn->bank.maps_unack); @@ -910,9 +918,9 @@ { /* this will internally call closed_cb() which will dispatch a TCP_DOWN event */ if (conn->peer) { - osmo_stream_srv_set_data(conn->peer, NULL); - osmo_stream_srv_destroy(conn->peer); + struct osmo_stream_srv *peer = conn->peer; conn->peer = NULL; + osmo_stream_srv_destroy(peer); return; } /* else: destroy initiated by conn->peer's closed_cb(). */ diff --git a/src/server/rspro_server.h b/src/server/rspro_server.h index 4843821..1bef81f 100644 --- a/src/server/rspro_server.h +++ b/src/server/rspro_server.h @@ -4,6 +4,7 @@ #include <osmocom/core/select.h> #include <osmocom/core/fsm.h> #include <osmocom/netif/stream.h> +#include <osmocom/netif/ipa.h> #include "rspro_util.h" #include "slotmap.h" @@ -36,7 +37,7 @@ /* remote component identity (after it has been received) */ struct app_comp_id comp_id; /* keep-alive handling FSM */ - struct osmo_fsm_inst *keepalive_fi; + struct osmo_ipa_ka_fsm_inst *ka_fi; struct { struct llist_head maps_new; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39044?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Id9784c69f1524872053436b59712f67ad5fbfe94 Gerrit-Change-Number: 39044 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-remsim[master]: Drop dependency on libosmo-abis

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39045?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Drop dependency on libosmo-abis ...................................................................... Drop dependency on libosmo-abis Change-Id: I7658b0c92c589b24a9f2bfe101ada5fc0077059f --- M configure.ac M contrib/jenkins.sh M debian/control M src/Makefile.am M src/bankd/Makefile.am M src/client/Makefile.am M src/server/Makefile.am 7 files changed, 2 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 0296197..ad2dcdb 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,6 @@ PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.6.0) PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 1.5.0) -PKG_CHECK_MODULES(OSMOABIS, libosmoabis >= 1.6.0) AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], [osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"]) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 2aa56a4..bfc4f57 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,5 @@ #!/bin/sh -# jenkins build helper script for libosmo-abis. This is how we build on jenkins.osmocom.org +# jenkins build helper script for osmo-remsim. This is how we build on jenkins.osmocom.org # # environment variables: # * WITH_MANUALS: build manual PDFs if set to "1" @@ -30,7 +30,6 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-netif "" --disable-doxygen -osmo-build-dep.sh libosmo-abis osmo-build-dep.sh simtrace2 # Additional configure options and depends diff --git a/debian/control b/debian/control index 1d6d7b3..3e98465 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ osmo-gsm-manuals-dev, libcsv-dev, libosmocore-dev (>= 1.6.0), - libosmo-abis-dev (>= 1.6.0), libosmo-netif-dev (>= 1.5.0), libosmo-simtrace2-dev (>= 0.8.0), libpcsclite-dev, diff --git a/src/Makefile.am b/src/Makefile.am index 6bb3d79..c2551a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,6 @@ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOABIS_CFLAGS) \ $(OSMONETIF_CFLAGS) \ $(OSMOGSM_CFLAGS) \ $(OSMOCORE_CFLAGS) \ @@ -20,7 +19,7 @@ RSPRO_LIBVERSION=2:0:0 lib_LTLIBRARIES = libosmo-rspro.la libosmo_rspro_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RSPRO_LIBVERSION) -# OSMOABIS_LIBS, OSMONETIF_LIBS, OSMOGSM_LIBS not needed, we don't use any of its symbols, only the header above +# OSMONETIF_LIBS, OSMOGSM_LIBS not needed, we don't use any of its symbols, only the header above libosmo_rspro_la_LIBADD = $(OSMOCORE_LIBS) \ rspro/libosmo-asn1-rspro.la libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c diff --git a/src/bankd/Makefile.am b/src/bankd/Makefile.am index d5eee87..1e2db28 100644 --- a/src/bankd/Makefile.am +++ b/src/bankd/Makefile.am @@ -3,7 +3,6 @@ -I$(top_builddir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOABIS_CFLAGS) \ $(OSMONETIF_CFLAGS) \ $(OSMOGSM_CFLAGS) \ $(OSMOCORE_CFLAGS) \ @@ -24,7 +23,6 @@ osmo_remsim_bankd_SOURCES = ../slotmap.c ../rspro_client_fsm.c ../debug.c \ bankd_main.c bankd_pcsc.c gsmtap.c osmo_remsim_bankd_LDADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ diff --git a/src/client/Makefile.am b/src/client/Makefile.am index dc61196..6c7abc6 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -3,7 +3,6 @@ -I/$(top_builddir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOABIS_CFLAGS) \ $(OSMONETIF_CFLAGS) \ $(OSMOGSM_CFLAGS) \ $(OSMOCORE_CFLAGS) \ @@ -17,7 +16,6 @@ remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c osmo_remsim_client_shell_CFLAGS = $(AM_CFLAGS) osmo_remsim_client_shell_LDADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ @@ -36,7 +34,6 @@ libifd_remsim_client_la_CPPFLAGS = $(PCSC_CFLAGS) libifd_remsim_client_la_LDFLAGS = -no-undefined libifd_remsim_client_la_LIBADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ @@ -50,7 +47,6 @@ osmo_remsim_client_st2_CPPFLAGS = -DUSB_SUPPORT -DSIMTRACE_SUPPORT osmo_remsim_client_st2_CFLAGS = $(AM_CFLAGS) osmo_remsim_client_st2_LDADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOSIMTRACE2_LIBS) \ $(OSMOGSM_LIBS) \ diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 5a1908a..308c8f7 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -4,7 +4,6 @@ -I$(top_builddir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOABIS_CFLAGS) \ $(OSMONETIF_CFLAGS) \ $(OSMOGSM_CFLAGS) \ $(OSMOCORE_CFLAGS) \ @@ -20,7 +19,6 @@ osmo_remsim_server_SOURCES = remsim_server.c rspro_server.c rest_api.c \ ../rspro_util.c ../slotmap.c ../debug.c osmo_remsim_server_LDADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39045?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7658b0c92c589b24a9f2bfe101ada5fc0077059f Gerrit-Change-Number: 39045 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-smlc[master]: jenkins.sh: No need to build libosmo-sigtran with doxygen

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/39100?usp=email ) Change subject: jenkins.sh: No need to build libosmo-sigtran with doxygen ...................................................................... jenkins.sh: No need to build libosmo-sigtran with doxygen Change-Id: Ic63fbd92cc6e1a5f784ced2ccb5f998e6cabaf27 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 100bcbc..fdd2f42 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -32,7 +32,7 @@ export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-netif "" --disable-doxygen -osmo-build-dep.sh libosmo-sigtran +osmo-build-dep.sh libosmo-sigtran "" --disable-doxygen # Additional configure options and depends CONFIG="" -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/39100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ic63fbd92cc6e1a5f784ced2ccb5f998e6cabaf27 Gerrit-Change-Number: 39100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-smlc[master]: jenkins.sh: Skip building unneeded libosmo-abis

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/39092?usp=email ) Change subject: jenkins.sh: Skip building unneeded libosmo-abis ...................................................................... jenkins.sh: Skip building unneeded libosmo-abis Change-Id: I9e763963f22e7fb425faef3b70b821ebd7e7ce60 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 88b03c4..100bcbc 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -32,7 +32,6 @@ export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-netif "" --disable-doxygen -osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-sigtran # Additional configure options and depends -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/39092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I9e763963f22e7fb425faef3b70b821ebd7e7ce60 Gerrit-Change-Number: 39092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-smlc[master]: jenkins.sh: Skip building unneeded libosmo-abis

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-smlc/+/39092?usp=email ) Change subject: jenkins.sh: Skip building unneeded libosmo-abis ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/39092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I9e763963f22e7fb425faef3b70b821ebd7e7ce60 Gerrit-Change-Number: 39092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 21:31:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-smlc[master]: jenkins.sh: No need to build libosmo-sigtran with doxygen

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-smlc/+/39100?usp=email ) Change subject: jenkins.sh: No need to build libosmo-sigtran with doxygen ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/39100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ic63fbd92cc6e1a5f784ced2ccb5f998e6cabaf27 Gerrit-Change-Number: 39100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 21:31:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-cbc[master]: jenkins.sh: Skip building unneeded libosmo-abis

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/39091?usp=email ) Change subject: jenkins.sh: Skip building unneeded libosmo-abis ...................................................................... jenkins.sh: Skip building unneeded libosmo-abis Change-Id: Ia8d93b276ace5798778354f25c4e8980e3412413 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a8f85b1..c32a00e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -31,7 +31,6 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-netif "" --disable-doxygen -osmo-build-dep.sh libosmo-abis # Additional configure options and depends CONFIG="" -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/39091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia8d93b276ace5798778354f25c4e8980e3412413 Gerrit-Change-Number: 39091 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024