- gerrit-log - lists.osmocom.org

Build failure of network:osmocom:nightly/osmo-pcap in openSUSE_Leap_15.2/x86_64
by OBS Notification 28 Mar '22

28 Mar '22

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-pcap failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 35s] checking how to run the C preprocessor... gcc -E [ 35s] checking for grep that handles long lines and -e... /usr/bin/grep [ 35s] checking for egrep... /usr/bin/grep -E [ 35s] checking for ANSI C header files... yes [ 35s] checking whether to enable VTY tests... no [ 35s] checking for pcap-config... /usr/bin/pcap-config [ 35s] checking for libosmocore >= 1.6.0... no [ 36s] configure: error: Package requirements (libosmocore >= 1.6.0) were not met: [ 36s] [ 36s] Package 'libsctp', required by 'libosmocore', not found [ 36s] [ 36s] Consider adjusting the PKG_CONFIG_PATH environment variable if you [ 36s] installed software in a non-standard prefix. [ 36s] [ 36s] Alternatively, you may set the environment variables LIBOSMOCORE_CFLAGS [ 36s] and LIBOSMOCORE_LIBS to avoid the need to call pkg-config. [ 36s] See the pkg-config man page for more details. [ 36s] error: Bad exit status from /var/tmp/rpm-tmp.patfK2 (%build) [ 36s] [ 36s] [ 36s] RPM build errors: [ 36s] Bad exit status from /var/tmp/rpm-tmp.patfK2 (%build) [ 36s] ### VM INTERACTION START ### [ 36s] [ 29.696995] sysrq: Power Off [ 36s] [ 29.700878] reboot: Power down [ 36s] ### VM INTERACTION END ### [ 36s] [ 36s] lamb17 failed "build osmo-pcap.spec" at Mon Mar 28 00:32:25 UTC 2022. [ 36s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 0

Change in libosmocore[master]: libosmovty: Link libosmovty against libpthread
by laforge 28 Mar '22

28 Mar '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27580 ) Change subject: libosmovty: Link libosmovty against libpthread ...................................................................... libosmovty: Link libosmovty against libpthread Ever since Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a in 2020 (part of libosmocore >= 1.4.0) we have introduced cpu_sched_vty.c, which directly uses libpthread. As a result, libosmovty should be using pthread compiler flags and link against libpthread. This missing dependency is causing osmocom applications to fail to link on OpenWRT (at leats for ath79-generic). Change-Id: I7febbf88cbe61eacd05f46a9316e773b5c148e77 Related: SYS#4986 --- M src/vty/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/27580/1 diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index c73dbb2..37faad6 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -4,7 +4,7 @@ LIBVERSION=10:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = -Wall $(TALLOC_CFLAGS) +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) if ENABLE_VTY lib_LTLIBRARIES = libosmovty.la @@ -14,5 +14,5 @@ fsm_vty.c talloc_ctx_vty.c \ cpu_sched_vty.c tdef_vty.c libosmovty_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) +libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS) endif -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7febbf88cbe61eacd05f46a9316e773b5c148e77 Gerrit-Change-Number: 27580 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-e1d[master]: usb: Pass not just the actual transfer length but also the buffer size
by laforge 28 Mar '22

28 Mar '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27578 ) Change subject: usb: Pass not just the actual transfer length but also the buffer size ...................................................................... usb: Pass not just the actual transfer length but also the buffer size Change-Id: I5088a5213d2945fdfaf3b242a63e35d0ed511914 --- M src/usb.c 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/78/27578/1 diff --git a/src/usb.c b/src/usb.c index 40518d8..4d30742 100644 --- a/src/usb.c +++ b/src/usb.c @@ -104,7 +104,8 @@ struct libusb_transfer *xfr; }; -typedef int (*xfer_cb_t)(struct e1_usb_flow *flow, uint8_t *buf, int len); +/* len == actual length, size == underlying size of buffer */ +typedef int (*xfer_cb_t)(struct e1_usb_flow *flow, uint8_t *buf, int len, size_t size); struct e1_usb_flow { struct e1_line *line; @@ -124,7 +125,7 @@ // --------------------------------------------------------------------------- static int -e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int len) +e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int len, size_t size) { if (len == 0) return 0; @@ -132,7 +133,7 @@ } static int -e1_usb_xfer_out(struct e1_usb_flow *flow, uint8_t *buf, int len) +e1_usb_xfer_out(struct e1_usb_flow *flow, uint8_t *buf, int len, size_t size) { struct e1_line *line = flow->line; struct e1_usb_line_data *ld = (struct e1_usb_line_data *) line->drv_data; @@ -161,7 +162,7 @@ } static int -e1_usb_xfer_fb(struct e1_usb_flow *flow, uint8_t *buf, int len) +e1_usb_xfer_fb(struct e1_usb_flow *flow, uint8_t *buf, int len, size_t size) { struct e1_usb_line_data *ld = (struct e1_usb_line_data *) flow->line->drv_data; @@ -216,7 +217,8 @@ } flow->cb(flow, libusb_get_iso_packet_buffer_simple(xfr, j), - (iso_pd->status == LIBUSB_TRANSFER_COMPLETED) ? (int)iso_pd->actual_length : -1 + (iso_pd->status == LIBUSB_TRANSFER_COMPLETED) ? (int)iso_pd->actual_length : -1, + iso_pd->length ); len += (iso_pd->length = flow->size); } @@ -227,7 +229,7 @@ LOGPLI(flow->line, DE1D, LOGL_ERROR, "OUT EP %02x ISO packet %d failed with status %s\n", flow->ep, j, get_value_string(libusb_status_str, iso_pd->status)); } - len += (iso_pd->length = flow->cb(flow, &xfr->buffer[len], flow->size)); + len += (iso_pd->length = flow->cb(flow, &xfr->buffer[len], flow->size, flow->size)); } } @@ -300,7 +302,7 @@ len += (xfr->iso_packet_desc[j].length = flow->size); } else { for (j = 0; j < flow->ppx; j++) - len += (xfr->iso_packet_desc[j].length = flow->cb(flow, &flow->entries[i].buf[len], flow->size)); + len += (xfr->iso_packet_desc[j].length = flow->cb(flow, &flow->entries[i].buf[len], flow->size, flow->size)); } libusb_fill_iso_transfer(xfr, id->devh, flow->ep, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I5088a5213d2945fdfaf3b242a63e35d0ed511914 Gerrit-Change-Number: 27578 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-e1d[master]: usb: Deal with truncated ISO IN transfers
by laforge 28 Mar '22

28 Mar '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27579 ) Change subject: usb: Deal with truncated ISO IN transfers ...................................................................... usb: Deal with truncated ISO IN transfers It seems that in some circumstances, an ISO IN transfer can be truncated by the bus / host. In such situation we'd currently pass a non-modulo-32 length to the mux_demux (deframer) code, and it ASSERTs on that. Let's try to handle this more gracefully by substituting random garbage and letting higher layers deal with massive bit errors. Related: OS#5490 Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 --- M src/usb.c 1 file changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/79/27579/1 diff --git a/src/usb.c b/src/usb.c index 4d30742..074e836 100644 --- a/src/usb.c +++ b/src/usb.c @@ -201,9 +201,9 @@ { struct e1_usb_flow *flow = (struct e1_usb_flow *) xfr->user_data; struct e1_usb_intf_data *id = (struct e1_usb_intf_data *) flow->line->intf->drv_data; - int j, rv, len; + int j, rv, size; - len = 0; + size = 0; /* FIXME: Check transfer status ? Error handling ? */ @@ -211,16 +211,34 @@ if (flow->ep & 0x80) { for (j = 0; j < flow->ppx; j++) { struct libusb_iso_packet_descriptor *iso_pd = &xfr->iso_packet_desc[j]; + int len = (int) iso_pd->actual_length; if (iso_pd->status != LIBUSB_TRANSFER_COMPLETED) { LOGPLI(flow->line, DE1D, LOGL_ERROR, "IN EP %02x ISO packet %d failed with status %s\n", flow->ep, j, get_value_string(libusb_status_str, iso_pd->status)); + } else if (len > 4 && (len - 4) % 32) { + /* some ISO IN packet was truncated. Apparently this + * does happen, see https://osmocom.org/issues/5490 - + * there is little we can do here, but instead of the + * earlier ASSERT, we just feed some garbage for the + * last few timeslots, resulting in bit errors etc. */ + LOGPLI(flow->line, DE1D, LOGL_ERROR, "IN EP %02x ISO packet %d truncated: len-4 = %u\n", + flow->ep, j, len-4); + + /* The assumption here is that only the last E1 frame is + * truncated, as we have no idea how many E1 frames the + * USB device firmware wanted to send us. */ + len += 32 - (len % 32); + /* don't overflow the underlying buffer */ + if (len > (int) iso_pd->length) + len = iso_pd->length; } + flow->cb(flow, libusb_get_iso_packet_buffer_simple(xfr, j), - (iso_pd->status == LIBUSB_TRANSFER_COMPLETED) ? (int)iso_pd->actual_length : -1, + (iso_pd->status == LIBUSB_TRANSFER_COMPLETED) ? len : -1, iso_pd->length ); - len += (iso_pd->length = flow->size); + size += (iso_pd->length = flow->size); } } else { for (j = 0; j < flow->ppx; j++) { @@ -229,12 +247,12 @@ LOGPLI(flow->line, DE1D, LOGL_ERROR, "OUT EP %02x ISO packet %d failed with status %s\n", flow->ep, j, get_value_string(libusb_status_str, iso_pd->status)); } - len += (iso_pd->length = flow->cb(flow, &xfr->buffer[len], flow->size, flow->size)); + size += (iso_pd->length = flow->cb(flow, &xfr->buffer[size], flow->size, flow->size)); } } libusb_fill_iso_transfer(xfr, id->devh, flow->ep, - xfr->buffer, len, flow->ppx, + xfr->buffer, size, flow->ppx, _e1uf_xfr, flow, 0 ); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 Gerrit-Change-Number: 27579 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-e1d[master]: usb: rename 'size' to 'len' in callback functions
by laforge 28 Mar '22

28 Mar '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27577 ) Change subject: usb: rename 'size' to 'len' in callback functions ...................................................................... usb: rename 'size' to 'len' in callback functions What we are passing is not the [underlying] size of the buffer, but the length of the valid data in them. Change-Id: I8ce91527351a56c103bd077c9565be2a81d175ac --- M src/usb.c 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/77/27577/1 diff --git a/src/usb.c b/src/usb.c index 747b9c5..40518d8 100644 --- a/src/usb.c +++ b/src/usb.c @@ -104,7 +104,7 @@ struct libusb_transfer *xfr; }; -typedef int (*xfer_cb_t)(struct e1_usb_flow *flow, uint8_t *buf, int size); +typedef int (*xfer_cb_t)(struct e1_usb_flow *flow, uint8_t *buf, int len); struct e1_usb_flow { struct e1_line *line; @@ -124,22 +124,22 @@ // --------------------------------------------------------------------------- static int -e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int size) +e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int len) { - if (size == 0) + if (len == 0) return 0; - return e1_line_demux_in(flow->line, buf + 4, size - 4, buf[3] & 0xf); + return e1_line_demux_in(flow->line, buf + 4, len - 4, buf[3] & 0xf); } static int -e1_usb_xfer_out(struct e1_usb_flow *flow, uint8_t *buf, int size) +e1_usb_xfer_out(struct e1_usb_flow *flow, uint8_t *buf, int len) { struct e1_line *line = flow->line; struct e1_usb_line_data *ld = (struct e1_usb_line_data *) line->drv_data; int fm, fts; - if (size <= 0) { - LOGPLI(line, DXFR, LOGL_ERROR, "OUT ERROR: %d\n", size); + if (len <= 0) { + LOGPLI(line, DXFR, LOGL_ERROR, "OUT ERROR: %d\n", len); return -1; } @@ -161,15 +161,15 @@ } static int -e1_usb_xfer_fb(struct e1_usb_flow *flow, uint8_t *buf, int size) +e1_usb_xfer_fb(struct e1_usb_flow *flow, uint8_t *buf, int len) { struct e1_usb_line_data *ld = (struct e1_usb_line_data *) flow->line->drv_data; - if (size < 0) { + if (len < 0) { LOGPLI(flow->line, DE1D, LOGL_ERROR, "Feedback transfer error\n"); return 0; - } else if (size != 3) { - LOGPLI(flow->line, DE1D, LOGL_ERROR, "Feedback packet invalid size (%d)\n", size); + } else if (len != 3) { + LOGPLI(flow->line, DE1D, LOGL_ERROR, "Feedback packet invalid len (%d)\n", len); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I8ce91527351a56c103bd077c9565be2a81d175ac Gerrit-Change-Number: 27577 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in pysim[master]: ts_31_103: Correct file-id of EF.DOMAIN in ADF.ISIM
by laforge 27 Mar '22

27 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27575 ) Change subject: ts_31_103: Correct file-id of EF.DOMAIN in ADF.ISIM ...................................................................... ts_31_103: Correct file-id of EF.DOMAIN in ADF.ISIM While the short ID of this file is 05, the actual file-id is 6f03. Reference to TS 31.103 section 4.2.3. Change-Id: Idd572ab064ea38e74dffd583c27ea505b23214a2 --- M pySim/ts_31_103.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index fb164ef..a4f7983 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -91,7 +91,7 @@ class domain(BER_TLV_IE, tag=0x80): _construct = GreedyString("utf8") - def __init__(self, fid='6f05', sfid=0x05, name='EF.DOMAIN', desc='Home Network Domain Name', **kwargs): + def __init__(self, fid='6f03', sfid=0x05, name='EF.DOMAIN', desc='Home Network Domain Name', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_DOMAIN.domain -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Idd572ab064ea38e74dffd583c27ea505b23214a2 Gerrit-Change-Number: 27575 Gerrit-PatchSet: 2 Gerrit-Owner: astrid smith <astrid(a)shady.tel> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in pysim[master]: ts_31_103: Correct file-id of EF.DOMAIN in ADF.ISIM
by laforge 27 Mar '22

27 Mar '22

Attention is currently required from: astrid smith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27575 ) Change subject: ts_31_103: Correct file-id of EF.DOMAIN in ADF.ISIM ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Idd572ab064ea38e74dffd583c27ea505b23214a2 Gerrit-Change-Number: 27575 Gerrit-PatchSet: 2 Gerrit-Owner: astrid smith <astrid(a)shady.tel> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: astrid smith <astrid(a)shady.tel> Gerrit-Comment-Date: Sun, 27 Mar 2022 11:47:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: ts_31_102: Avoid pylint false positive
by laforge 27 Mar '22

27 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27576 ) Change subject: ts_31_102: Avoid pylint false positive ...................................................................... ts_31_102: Avoid pylint false positive This should avoid the following pylint error: ************* Module pySim.ts_31_102 pySim/ts_31_102.py:621:100: E0601: Using variable 'sw' before assignment (used-before-assignment) Change-Id: I0bb9607cdab0e6e3cd17b4d27129a51a607bc0f2 --- M pySim/ts_31_102.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index fec81bf..fa3af75 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -609,6 +609,7 @@ should_exist = f.should_exist_for_services(active_services) try: cmd.rs.select_file(f) + sw = None exists = True except SwMatchError as e: sw = str(e) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0bb9607cdab0e6e3cd17b4d27129a51a607bc0f2 Gerrit-Change-Number: 27576 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in pysim[master]: ts_31_102: Avoid pylint false positive
by laforge 27 Mar '22

27 Mar '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27576 ) Change subject: ts_31_102: Avoid pylint false positive ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0bb9607cdab0e6e3cd17b4d27129a51a607bc0f2 Gerrit-Change-Number: 27576 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 27 Mar 2022 10:43:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: gr-gsm-master: migrate from archlinux to debian-bullseye-build
by laforge 27 Mar '22

27 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27574 ) Change subject: gr-gsm-master: migrate from archlinux to debian-bullseye-build ...................................................................... gr-gsm-master: migrate from archlinux to debian-bullseye-build Arch Linux ships gnuradio-3.9.4.0, while gr-gsm has not been migrated to 3.9 yet. Let's use debian:bullseye, which ships gnuradio-3.8.2.0. Change-Id: I9900addf152fd254283ef340cea16583ee5ac1c5 --- M gr-gsm-master/Dockerfile 1 file changed, 14 insertions(+), 70 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index 71dc610..5e878c1 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -1,85 +1,29 @@ -ARG REGISTRY=docker.io -FROM ${REGISTRY}/archlinux/base +ARG REGISTRY=docker.io +ARG USER +FROM $USER/debian-bullseye-build MAINTAINER Vadim Yanitskiy <axilirator(a)gmail.com> -ARG LIBOSMOCORE_BRANCH="master" +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + libosmocore-dev \ + gnuradio-dev \ + gr-osmosdr \ + cmake \ + swig + ARG GR_GSM_BRANCH="master" -# Build dependencies -ENV BUILD_DEPS \ - automake \ - autoconf \ - libtool \ - pkgconf \ - cmake \ - make \ - swig \ - gcc - -# Sync pacman -RUN pacman -Syyu --noconfirm - -# Install persistent packages -RUN pacman -S --needed --noconfirm \ - gnuradio \ - python2 \ - python2-scipy \ - python2-requests \ - talloc \ - boost - -# Download USRP firmware -RUN uhd_images_downloader - -# Install build dependencies -RUN pacman -S --needed --noconfirm \ - $BUILD_DEPS - -# Make Python2 default -RUN ln -s /usr/bin/python2 /usr/bin/python - -# Install and configure git -RUN pacman -S --needed --noconfirm git \ - && git config --global user.email docker(a)dock.er \ - && git config --global user.name "Dock Er" - -WORKDIR /tmp - -# Download, build and install libosmocore -RUN git clone git://git.osmocom.org/libosmocore -ADD http://git.osmocom.org/libosmocore/patch?h=$LIBOSMOCORE_BRANCH /tmp/commit-libosmocore - -RUN cd libosmocore \ - && git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \ - && git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \ - && autoreconf -fi \ - && ./configure \ - --disable-doxygen \ - --disable-pcsc \ - --prefix=/usr \ - && make "-j$(nproc)" \ - && make install \ - && make distclean - RUN git clone git://git.osmocom.org/gr-gsm ADD http://git.osmocom.org/gr-gsm/patch?h=$GR_GSM_BRANCH /tmp/commit-gr-gsm RUN cd gr-gsm \ && git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \ - && git rev-parse HEAD \ + && git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \ && mkdir build/ \ && cd build/ \ - && cmake \ + && cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -Wno-dev \ - -DENABLE_GRCC=OFF \ - ../ \ && make "-j$(nproc)" \ - && make install \ - && cd ../ \ - && rm -rf build/ - -# Remove build dependencies -RUN pacman -Rs --noconfirm \ - $BUILD_DEPS + && make install -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9900addf152fd254283ef340cea16583ee5ac1c5 Gerrit-Change-Number: 27574 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log