- gerrit-log - lists.osmocom.org

Change in osmo-e1d[master]: e1d/usb: Use wMaxPacketSize to know maximum number of frames to send

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26794 ) Change subject: e1d/usb: Use wMaxPacketSize to know maximum number of frames to send ...................................................................... e1d/usb: Use wMaxPacketSize to know maximum number of frames to send Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I9595cba39377e45303d41a06753861bf72d5a93a --- M src/usb.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/94/26794/1 diff --git a/src/usb.c b/src/usb.c index 348c104..d5107bc 100644 --- a/src/usb.c +++ b/src/usb.c @@ -126,7 +126,7 @@ { struct e1_line *line = flow->line; struct e1_usb_line_data *ld = (struct e1_usb_line_data *) line->drv_data; - int fts; + int fm, fts; if (size <= 0) { LOGPLI(line, DXFR, LOGL_ERROR, "OUT ERROR: %d\n", size); @@ -136,9 +136,10 @@ /* Flow regulation */ ld->r_acc += ld->r_sw; + fm = (ld->pkt_size - 4) / 32; fts = ld->r_acc >> 10; if (fts < 4) fts = 4; - else if (fts > 12) fts = 12; + else if (fts > fm) fts = fm; ld->r_acc -= fts << 10; if (ld->r_acc & 0x80000000) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9595cba39377e45303d41a06753861bf72d5a93a Gerrit-Change-Number: 26794 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in osmo-iuh[master]: ranap_common: add decoder for RAB SetupOrModifyItemFirst

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26723 ) Change subject: ranap_common: add decoder for RAB SetupOrModifyItemFirst ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/26723/3/src/ranap_common.c File src/ranap_common.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26723/3/src/ranap_common.c@589 PS3, Line 589: int decoded = 0; > no need to init the variable. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id7293c1035cf6de34b7a416fa9265a5a32ed3216 Gerrit-Change-Number: 26723 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jan 2022 16:18:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common: add decoder for RAB SetupOrModifyItemFirst

by dexter

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26723 to look at the new patch set (#4). Change subject: ranap_common: add decoder for RAB SetupOrModifyItemFirst ...................................................................... ranap_common: add decoder for RAB SetupOrModifyItemFirst The RAB SetupOrModifyItemFirst is contained in the RAB Assignment Request. We currently have no decoder for it, so lets add one. Change-Id: Id7293c1035cf6de34b7a416fa9265a5a32ed3216 Related: OS#5152 --- M include/osmocom/ranap/ranap_common.h M src/ranap_common.c 2 files changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/23/26723/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id7293c1035cf6de34b7a416fa9265a5a32ed3216 Gerrit-Change-Number: 26723 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: iu_helpers: make new_transp_info_(rtp|gtp) public

by dexter

Hello Jenkins Builder, neels, laforge, pespin, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 to look at the new patch set (#4). Change subject: iu_helpers: make new_transp_info_(rtp|gtp) public ...................................................................... iu_helpers: make new_transp_info_(rtp|gtp) public The functions new_transp_info_rtp and new_transp_info_gtp are needed to generate the transport layer information struct. The functions are currently not public since they are only used in ranap_msg_factory.c but to reqwrite the RANAP RAB AssignmentReqtest / AssignmentResponse messages we can reuse this code, so lets make them public. Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Related: OS#5152 --- M include/osmocom/ranap/iu_helpers.h M src/iu_helpers.c M src/ranap_msg_factory.c M src/tests/test-helpers.c M src/tests/test-helpers.ok 5 files changed, 267 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/22/26722/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Gerrit-Change-Number: 26722 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: iu_helpers: make new_transp_info_(rtp|gtp) public

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26722 ) Change subject: iu_helpers: make new_transp_info_(rtp|gtp) public ...................................................................... Patch Set 4: (8 comments) https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/iu_helpers.c File src/iu_helpers.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/iu_helpers.c@134 PS3, Line 134: switch (addr->u.sin.sin_family) { > you should better use u.sa here conceptually, since you don't really know whether it's AF_INET (u. […] Done https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/iu_helpers.c@140 PS3, Line 140: ip_len = sizeof(addr->u.sin6.sin6_addr.s6_addr); > Not sure if this is correct or needs to be sizeof(addr->u.sin6.sin6_addr) or it doesn't matter. This should be uint8_t s6_addr[16], so its correct I think. https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/iu_helpers.c@148 PS3, Line 148: len = 160 / 8; > can you explain/document these numbers? Its a fixed size, x213 supports a ton of different address formats. I have now put the references to the various sections and tables in the code. https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/iu_helpers.c@183 PS3, Line 183: binding_id[0] = port & 0xff; > probably osmo_store16be() would be more clear here. Done https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/iu_helpers.c@187 PS3, Line 187: new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap); > check return code an return NULL Done https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/iu_helpers.c@201 PS3, Line 201: new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap); > check return code an return NULL Done https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/ranap_msg_factory.c File src/ranap_msg_factory.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/ranap_msg_factory.c@753 PS3, Line 753: rtp_addr.u.sin.sin_addr.s_addr = htonl(rtp_ip); > are you sure the rtp_ip is passed above in host byte order? looks weird to me. Yes, I think this is correct and it also works in real life too. can you have a alook at test-helpers.c, there I am using inet_pton to initialize the value and the output is correct. As far as I am aware sin_port and sin_addr are in network byte order. Otherwise it also wouln't integrate with sockaddr_str. https://gerrit.osmocom.org/c/osmo-iuh/+/26722/3/src/ranap_msg_factory.c@826 PS3, Line 826: gtp_addr.u.sin.sin_addr.s_addr = htonl(gtp_ip); > same Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Gerrit-Change-Number: 26722 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jan 2022 16:11:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-e1d[master]: e1d/usb: Limit feedback EP transfer size to 3

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26793 ) Change subject: e1d/usb: Limit feedback EP transfer size to 3 ...................................................................... e1d/usb: Limit feedback EP transfer size to 3 Newer descriptors have the max packet size set to 3 to save on isochronous bandwidth. By specs, the feed back endpoints transfer are 24 bits anyway, so no point is using anything larger. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I09e259db539e62571fd17fc16ffaa317564ba257 --- M src/usb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/93/26793/1 diff --git a/src/usb.c b/src/usb.c index 465aecd..348c104 100644 --- a/src/usb.c +++ b/src/usb.c @@ -583,7 +583,7 @@ line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); - line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb, line_data->ep_fb, 2, 8, 1); + line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb, line_data->ep_fb, 2, 3, 1); e1uf_start(line_data->flow_in); e1uf_start(line_data->flow_out); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I09e259db539e62571fd17fc16ffaa317564ba257 Gerrit-Change-Number: 26793 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Fix race condition where Init is answered while connec...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26804 ) Change subject: RTP_Emulation: Fix race condition where Init is answered while connect is in progress ...................................................................... RTP_Emulation: Fix race condition where Init is answered while connect is in progress HNB test connects the RTP socket on the HNBGW side once it receives the Audio-CONN_ESTABLISH.cnf with the ip+port info. However, while doing so, osmo-hnodeb is already sending an Init which then the RTP_Emulation (connection in progress) tries to answer with an Init-ACK. RTP_Emulation.ttcn:201 Called on RTPEM_CTRL to TC_cs_mo_call-RTPEM(6) @RTP_Emulation.RTPEM_connect : { remote_host := "172.18.33.20", remote_port := 16384 } ... IuUP_Emulation.ttcn:76 dec_IuUP_PDU(): Decoded @IuUP_Types.IuUP_PDU: { type_14 := { pdu_type := 14, ack_nack := IuUP_ACKNACK_CTRL (0), frame_nr := 0, iuup_version := 0, procedure_ind := IuUP_PRI_INITIALIZATION (0), header_crc := 55, payload_crc := 637, u := { proc_sending := { payload := '060051673C0127000082000000000300'O } } } } ... RTP_Emulation.ttcn:355 Sent on RTP to system @RTP_CodecPort.RTP_Send : { connId := 1, msg := { rtp := { version := 2, padding_ind := '0'B, extension_ind := '0'B, CSRC_count := 0, marker_bit := '0'B, payload_type := 96, sequence_number := 0, time_stamp := '00000000000000000000000000000000'B, SSRC_id := '11011110101011011011111011101111'B, CSRCs := omit, ext_header := omit, data := 'E4002400'O } } } ... RTP_Emulation.ttcn:355 Message enqueued on RTP from system @Socket_API_Definitions.PortEvent : { result := { errorCode := ERROR_SOCKET (4), connId := 1, os_error_code := 89, os_error_text := "Destination address required" } } id 2 Change-Id: I61200ddb035b310eced871a9954dfcbf1dc49360 --- M library/RTP_Emulation.ttcn 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/26804/1 diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index 8c5dbc9..f4d926e 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -448,6 +448,10 @@ mtc.stop; } g_tx_connected := true; + /* Send any pending IuUP CTRL message whichwas delayed due to not being connected: */ + if (isvalue(g_iuup_ent.pending_tx_pdu)) { + f_tx_rtp(''O); + } CTRL.reply(RTPEM_connect:{g_remote_host, g_remote_port}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_NONE}) { @@ -511,7 +515,7 @@ if (lengthof(rx_rtp.msg.rtp.data) != 0) { /* Unexpected RTP payload (user data) arrived: */ g_stats_rtp.num_pkts_rx_err_disabled := g_stats_rtp.num_pkts_rx_err_disabled+1; - } else if (isvalue(g_iuup_ent.pending_tx_pdu)) { + } else if (g_tx_connected and isvalue(g_iuup_ent.pending_tx_pdu)) { /* IuUP Control packet was received and requires sending back something: */ f_tx_rtp(''O); } @@ -536,7 +540,7 @@ rx_rtp.msg.rtp.data := f_IuUP_Em_rx_decaps(g_iuup_ent, rx_rtp.msg.rtp.data); /* IuUP Control packet was received which may require sending back something: */ if (lengthof(rx_rtp.msg.rtp.data) == 0) { - if (isvalue(g_iuup_ent.pending_tx_pdu)) { + if (g_tx_connected and isvalue(g_iuup_ent.pending_tx_pdu)) { f_tx_rtp(''O); } repeat; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I61200ddb035b310eced871a9954dfcbf1dc49360 Gerrit-Change-Number: 26804 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in libosmocore[master]: stats_tcp: fix stats item identifier

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26799 ) Change subject: stats_tcp: fix stats item identifier ...................................................................... stats_tcp: fix stats item identifier The identifier of stats item STATS_TCP_REORD_SEEN is tcp:sndbuf_limited, it should be tcp:reord_seen. Change-Id: If3539ceb570ae784cc9b6567c59da7afd11acf82 Related: OS#5701 --- M src/stats_tcp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/26799/1 diff --git a/src/stats_tcp.c b/src/stats_tcp.c index d2be6a9..dec5b5d 100644 --- a/src/stats_tcp.c +++ b/src/stats_tcp.c @@ -83,7 +83,7 @@ [STATS_TCP_NOTSENT_BYTES] = { "tcp:notsent_bytes", "bytes not yet sent", "", 60, 0 }, [STATS_TCP_RWND_LIMITED] = { "tcp:rwnd_limited", "time (usec) limited by receive window", "", 60, 0 }, [STATS_TCP_SNDBUF_LIMITED] = { "tcp:sndbuf_limited", "Time (usec) limited by send buffer", "", 60, 0 }, - [STATS_TCP_REORD_SEEN] = { "tcp:sndbuf_limited", "reordering events seen", "", 60, 0 }, + [STATS_TCP_REORD_SEEN] = { "tcp:reord_seen", "reordering events seen", "", 60, 0 }, }; static struct osmo_stat_item_group_desc stats_tcp_desc = { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If3539ceb570ae784cc9b6567c59da7afd11acf82 Gerrit-Change-Number: 26799 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

3
2
0 0

Change in meta-telephony[201705]: Update recipes to refelct osmo-iuh and osmo-hnbgw repo split

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/26802 ) Change subject: Update recipes to refelct osmo-iuh and osmo-hnbgw repo split ...................................................................... Update recipes to refelct osmo-iuh and osmo-hnbgw repo split Since version 1.2.0 in both repos, osmo-hnbgw binary is placed in its own repository, and no longer available in osmo-iuh.git. Change-Id: I3ced52c1a9fccca34fe7c4ec245363d041105c2b --- A recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc A recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh.inc M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb 4 files changed, 68 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/02/26802/1 diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc new file mode 100644 index 0000000..3e45f9b --- /dev/null +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "Osmocom HNB-GW implementation" +HOMEPAGE = "https://osmocom.org/projects/osmohnbgw" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +DEPENDS = "libosmocore libosmo-netif libosmo-sccp osmo-iuh libasn1c lksctp-tools" + +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" + +# Workaround to oe-core meta/site/* CONFIG_SITE files passed to autoconf forcing unavailability of netinet/sctp.h. +# Patch fixing issue upstream: https://patchwork.openembedded.org/patch/168892/ +CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=yes" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${(a)bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + +SYSTEMD_SERVICE_${PN} = "${PN}.service" + +CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg" diff --git a/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb new file mode 100644 index 0000000..df8c946 --- /dev/null +++ b/recipes-osmocom/osmo-hnbgw/osmo-hnbgw_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "1.2.0" +SRC_URI = "git://git.osmocom.org/osmo-hnbgw.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.2.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 92b4633..a5674af 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -1,26 +1,34 @@ -DESCRIPTION = "Osmocom Iuh and HNB-GW implementation" +DESCRIPTION = "Osmocom Iuh implementation" HOMEPAGE = "https://osmocom.org/projects/osmohnbgw" LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c lksctp-tools" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r3.${META_TELEPHONY_OSMO_INC}" # Workaround to oe-core meta/site/* CONFIG_SITE files passed to autoconf forcing unavailability of netinet/sctp.h. # Patch fixing issue upstream: https://patchwork.openembedded.org/patch/168892/ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=yes" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig -PACKAGECONFIG ??= "\ - ${(a)bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - " -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" +PACKAGES =+ " \ + libosmo-hnbap libosmo-hnbap-dev \ + libosmo-ranap libosmo-ranap-dev \ + libosmo-rua libosmo-rua-dev \ + libosmo-sabp libosmo-sabp-dev \ + " -PACKAGES =+ "libosmo-ranap libosmo-ranap-dev osmo-hnbgw" -SYSTEMD_PACKAGES = "osmo-hnbgw" -SYSTEMD_SERVICE_osmo-hnbgw = "osmo-hnbgw.service" +FILES_libosmo-hnbap = " \ + ${libdir}/libosmo-hnbap${SOLIBS} \ + " + +FILES_libosmo-hnbap-dev = " \ + ${includedir}/osmocom/hnbap \ + ${libdir}/pkgconfig/libosmo-hnbap.pc \ + ${libdir}/libosmo-hnbap${SOLIBSDEV} \ + " FILES_libosmo-ranap = " \ ${libdir}/libosmo-ranap${SOLIBS} \ @@ -32,10 +40,24 @@ ${libdir}/libosmo-ranap${SOLIBSDEV} \ " -FILES_osmo-hnbgw = " \ - ${bindir}/osmo-hnbgw \ - ${sysconfdir}/osmocom/osmo-hnbgw.cfg \ +FILES_libosmo-rua = " \ + ${libdir}/libosmo-rua${SOLIBS} \ " -CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg" + +FILES_libosmo-rua-dev = " \ + ${includedir}/osmocom/rua \ + ${libdir}/pkgconfig/libosmo-rua.pc \ + ${libdir}/libosmo-rua${SOLIBSDEV} \ + " + +FILES_libosmo-sabp = " \ + ${libdir}/libosmo-sabp${SOLIBS} \ + " + +FILES_libosmo-sabp-dev = " \ + ${includedir}/osmocom/sabp \ + ${libdir}/pkgconfig/libosmo-sabp.pc \ + ${libdir}/libosmo-sabp${SOLIBSDEV} \ + " ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index d790774..c10fc66 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.1.0" +SRCREV = "1.2.0" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/26802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I3ced52c1a9fccca34fe7c4ec245363d041105c2b Gerrit-Change-Number: 26802 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in osmo-iuh[master]: Drop no longer needed systemd config in build system

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26801 ) Change subject: Drop no longer needed systemd config in build system ...................................................................... Drop no longer needed systemd config in build system It was only used to install osmo-hnbgw, which is no longer there. Change-Id: Idae258d895d8b25dbbfb5e9bb4386997475a71dd --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/rules 4 files changed, 1 insertion(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/01/26801/1 diff --git a/Makefile.am b/Makefile.am index c1359a1..ab3ed63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,9 +13,6 @@ debian \ $(NULL) -AM_DISTCHECK_CONFIGURE_FLAGS = \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index b16f3d2..866d6d9 100644 --- a/configure.ac +++ b/configure.ac @@ -130,22 +130,6 @@ AC_SUBST([OSMO_GSM_MANUALS_DIR]) fi -# https://www.freedesktop.org/software/systemd/man/daemon.html -AC_ARG_WITH([systemdsystemunitdir], - [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, - [with_systemdsystemunitdir=auto]) -AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ - def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) - - AS_IF([test "x$def_systemdsystemunitdir" = "x"], - [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], - [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) - with_systemdsystemunitdir=no], - [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) -AS_IF([test "x$with_systemdsystemunitdir" != "xno"], - [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) -AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) - AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index e542533..ae5fd0c 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -27,9 +27,6 @@ BuildRequires: pkgconfig >= 0.20 # python3 for asn1tostruct.py BuildRequires: python3 -%if 0%{?suse_version} -BuildRequires: systemd-rpm-macros -%endif BuildRequires: pkgconfig(libasn1c) >= 0.9.30 BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 @@ -38,7 +35,6 @@ BuildRequires: pkgconfig(libosmogb) >= 1.5.0 BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 BuildRequires: pkgconfig(libosmovty) >= 1.5.0 -%{?systemd_requires} %description Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) @@ -118,8 +114,7 @@ autoreconf -fi %configure \ --disable-static \ - --docdir="%{_docdir}/%{name}" \ - --with-systemdsystemunitdir=%{_unitdir} + --docdir="%{_docdir}/%{name}" make %{?_smp_mflags} %install diff --git a/debian/rules b/debian/rules index d1b2ab6..aa1ed32 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,6 @@ %: dh $@ --with autoreconf -CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals -override_dh_auto_configure: - dh_auto_configure -- $(CONFIGURE_FLAGS) - # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practic… override_dh_strip: dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idae258d895d8b25dbbfb5e9bb4386997475a71dd Gerrit-Change-Number: 26801 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

2025

2024

2023

2022

gerrit-log