pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28433 )
Change subject: Bump version: 1.6.0.132-0239-dirty → 1.7.0
......................................................................
Bump version: 1.6.0.132-0239-dirty → 1.7.0
Change-Id: Idb0d20aa4336a69cb100e140fb1fa9e7ac25b984
---
M TODO-RELEASE
M contrib/libosmocore.spec.in
M debian/changelog
M debian/control
R debian/libosmocore19.install
R debian/libosmogb14.install
R debian/libosmogsm18.install
M src/Makefile.am
M src/codec/Makefile.am
M src/coding/Makefile.am
M src/ctrl/Makefile.am
M src/gb/Makefile.am
M src/gsm/Makefile.am
M src/sim/Makefile.am
M src/usb/Makefile.am
M src/vty/Makefile.am
16 files changed, 200 insertions(+), 46 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/28433/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 5f9d6e8..8ccfa49 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,9 +7,3 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public release: c:r:0.
#library what description / commit summary line
-libosmogsm ABI BREAKAGE CELL_IDENT_WHOLE_GLOBAL_PS changed enum number
-libosmogsm add struct member Add codec_list_bss_supported to gsm0808_handover_request_ack (more_items flag ensures ABI compat)
-libosmogb ABI BREAKAGE Add reset_ack_notification function pointer to struct bssgp_bvc_fsm_ops
-libosmogsm add API Add rach_tx_integer_raw2val() in gsm_utils.h
-libosmogsm add API iuup.h
-libosmogsm add API cbsp.h enum osmo_cbsp_cause, osmo_cbsp_cause_name(s)
diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in
index d699b58..208f42d 100644
--- a/contrib/libosmocore.spec.in
+++ b/contrib/libosmocore.spec.in
@@ -112,13 +112,13 @@
This subpackage contains libraries and header files for developing
applications that want to make use of libosmocoding.
-%package -n libosmocore18
+%package -n libosmocore19
Summary: Osmocom core library
# crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+
License: GPL-2.0-only AND GPL-2.0-or-later
Group: System/Libraries
-%description -n libosmocore18
+%description -n libosmocore19
libosmocore is a library with various utility functions shared
between OpenBSC and OsmocomBB.
@@ -127,7 +127,7 @@
# crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+
License: GPL-2.0-only AND GPL-2.0-or-later
Group: Development/Libraries/C and C++
-Requires: libosmocore18 = %version
+Requires: libosmocore19 = %version
Requires: libtalloc-devel
Requires: lksctp-tools-devel
@@ -165,12 +165,12 @@
This subpackage contains libraries and header files for developing
applications that want to make use of libosmoctrl.
-%package -n libosmogb12
+%package -n libosmogb14
Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library
License: AGPL-3.0-or-later
Group: System/Libraries
-%description -n libosmogb12
+%description -n libosmogb14
libosmocore is a package with various utility functions that were
originally developed as part of the OpenBSC project.
@@ -181,7 +181,7 @@
License: AGPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libosmocore-devel = %version
-Requires: libosmogb12 = %version
+Requires: libosmogb14 = %version
Requires: libosmovty-devel = %version
%description -n libosmogb-devel
@@ -190,12 +190,12 @@
This subpackage contains libraries and header files for developing
applications that want to make use of libosmogb.
-%package -n libosmogsm17
+%package -n libosmogsm18
Summary: Osmocom GSM utility library
License: GPL-2.0-or-later AND AGPL-3.0-or-later
Group: System/Libraries
-%description -n libosmogsm17
+%description -n libosmogsm18
libosmocore is a package with various utility functions that were
originally developed as part of the OpenBSC project.
@@ -210,7 +210,7 @@
License: GPL-2.0-or-later AND AGPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libosmocore-devel = %version
-Requires: libosmogsm17 = %version
+Requires: libosmogsm18 = %version
%description -n libosmogsm-devel
The libosmogsm library in particular is a collection of common code
@@ -324,14 +324,14 @@
%postun -n libosmocodec0 -p /sbin/ldconfig
%post -n libosmocoding0 -p /sbin/ldconfig
%postun -n libosmocoding0 -p /sbin/ldconfig
-%post -n libosmocore18 -p /sbin/ldconfig
-%postun -n libosmocore18 -p /sbin/ldconfig
+%post -n libosmocore19 -p /sbin/ldconfig
+%postun -n libosmocore19 -p /sbin/ldconfig
%post -n libosmoctrl0 -p /sbin/ldconfig
%postun -n libosmoctrl0 -p /sbin/ldconfig
-%post -n libosmogb12 -p /sbin/ldconfig
-%postun -n libosmogb12 -p /sbin/ldconfig
-%post -n libosmogsm17 -p /sbin/ldconfig
-%postun -n libosmogsm17 -p /sbin/ldconfig
+%post -n libosmogb14 -p /sbin/ldconfig
+%postun -n libosmogb14 -p /sbin/ldconfig
+%post -n libosmogsm18 -p /sbin/ldconfig
+%postun -n libosmogsm18 -p /sbin/ldconfig
%post -n libosmosim2 -p /sbin/ldconfig
%postun -n libosmosim2 -p /sbin/ldconfig
%post -n libosmovty9 -p /sbin/ldconfig
@@ -367,9 +367,9 @@
%_libdir/libosmocoding.so
%_libdir/pkgconfig/libosmocoding.pc
-%files -n libosmocore18
+%files -n libosmocore19
%defattr(-,root,root)
-%_libdir/libosmocore.so.18*
+%_libdir/libosmocore.so.19*
%files -n libosmocore-devel
%defattr(-,root,root)
@@ -393,9 +393,9 @@
%_libdir/libosmoctrl.so
%_libdir/pkgconfig/libosmoctrl.pc
-%files -n libosmogb12
+%files -n libosmogb14
%defattr(-,root,root)
-%_libdir/libosmogb.so.12*
+%_libdir/libosmogb.so.14*
%files -n libosmogb-devel
%defattr(-,root,root)
@@ -405,9 +405,9 @@
%_libdir/libosmogb.so
%_libdir/pkgconfig/libosmogb.pc
-%files -n libosmogsm17
+%files -n libosmogsm18
%defattr(-,root,root)
-%_libdir/libosmogsm.so.17*
+%_libdir/libosmogsm.so.18*
%files -n libosmogsm-devel
%defattr(-,root,root)
diff --git a/debian/changelog b/debian/changelog
index 8d44cf6..05eb1b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,163 @@
+libosmocore (1.7.0) unstable; urgency=medium
+
+ [ Vadim Yanitskiy ]
+ * .gitignore: add utils/osmo-aka-verify binary
+ * tests/vty: fix use of GNU 'missing =' extension in designator
+ * debian/control: minimum version of libtalloc-dev must be >= 2.1.0
+ * tests/tdef: rename the binaries to end with '_test'
+ * tdef: fix wrong path in documentation: tests/vty -> tests/tdef
+ * bitvec_read_field(): indicate errors using errno
+ * bitvec_read_field(): fix incorrect bit-shift issue found by UBSan
+ * bitvec_read_field(): optimize by expanding bytenum_from_bitnum()
+ * tests/testsuite.at: ensure empty stderr for the bitvec_test
+ * VTY: enable talloc introspection for OTC_GLOBAL
+ * VTY: implement 'no log gsmtap [HOSTNAME]' command
+ * contrib/libosmocore.spec.in: mention osmo-config-merge in utils
+ * gsm_7bit_encode_n(): use regular malloc() instead of calloc()
+ * tests/logging: ensure both stream and wqueue modes are tested
+ * tests/logging: also test printing the filename information
+ * logging: fix coding style issues in _output_buf()
+ * logging: fix printing of '\0' when filename printed last
+ * tests/logging: merge both logging_test_{stream,wqueue}.err
+ * core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros
+ * core/utils.h: wrap OSMO_ASSERT() with do { ... } while (0)
+ * core/msgb.h: make use of OSMO_LIKELY / OSMO_UNLIKELY
+ * core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT
+ * libosmocodec: osmo_hr_check_sid(): simplify the logic
+ * contrib/jenkins_amd64.sh: remove FreeBSD specific quirks
+ * bssmap_le: support additional IEs in Perform Location Request
+ * Use internal <osmocom/core/talloc.h> everywhere
+ * coding: fix comments for detect_afs_sid_{first,update,onset}
+ * coding: cosmetic: move 'dtx_prev' to the scope where it's used
+ * coding: use switch statement in gsm0503_tch_a[fh]s_decode_dtx()
+ * coding: properly handle AFS_SID_UPDATE frames in DTX mode
+ * coding: prevent marking FACCH frames as AMR's special DTX frames
+ * tests/dtx: test detection/decoding of A[FH]S_SID_UPDATE
+ * tests/dtx: test tagging of FACCH/[FH] frames
+ * coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%)
+ * coding: do not reset codec ID on receipt of DTX frames
+ * coding: add gsm0503_detect_a[fh]s_dtx_frame2()
+ * coding: separate gsm0503_tch_a[fh]s_decode_inband()
+
+ [ Eric ]
+ * fix isdigit taking unsigned as input
+ * logging: allow disabling macros using a new define: LIBOSMOCORE_NO_LOGGING
+
+ [ Daniel Willmann ]
+ * bssgp_bvc_fsm: Move log message to the correct place
+ * bssgp_bvc_fsm: Add a hook to notify when a reset was acknowledged
+
+ [ Harald Welte ]
+ * logging: Fix memory leak in case async log write queue overflows
+ * write_queue: Document it that caller is responsible if enqueue fails
+ * gsmtap: Add gsmtap_sendmsg_free() as alternative to gsmtap_sendmsg()
+ * Introduce CRC and FSM for IuUP (user plane) as used in 3G RTP data
+ * tcp_stats: fix compilation on CentOS 7
+ * iuup: Fix signed/unsigned loop counter control flow issue
+ * src/conv.c: Align better with Osmocom coding style
+ * bitvec: Fix -Wsign-compare warnings
+ * utils: Fix -Wsign-compare warnings
+ * log_taget_find() should use enum log_target_type, not int
+ * bits.c: Fix -Wsign-compare warnings
+ * socket, select: Fix -Wsign-compare warnings
+ * msgb: Fix -Wsign-compare warnings
+ * osmo_libusb: Fix NULL check in osmo_usb_removed_cb()
+ * osmo_libusb: Use libusb_get_pollfds() to get initial file descriptors
+ * osmo_libusb: Print log message on libusb initialization error
+ * gsm0808: Test if we properly decode a SRVCC cell identifier list
+ * usb: Match device by VID/PID without path/addr if it is unique
+ * clean-up pkg-config files: Make use of "Requires" as documented
+ * debian/control: libosmocore-dev must depend on libsctp-dev and libusb-1.0-0-dev
+ * libosmo{gb,vty}.pc.in: Add talloc to 'Requires'
+ * libosmocore.spec: Make libosmocore-devel require libsctp
+ * libosmovty: Link libosmovty against libpthread
+ * vty: Support platforms that don't support pthread_getname_np()
+ * vty: Add a 'skip-zero' version of 'show stats' and 'show rate-counters'
+ * stats: Functions with no arguments should specify(void)
+ * stats: Avoid NULL pointer deref in allocation failure paths.
+ * stats: don't try to save unknown stats reporter types
+ * fsm_vty: use unsigned int when left-shifting 31 bits!
+ * update git URLs (git -> https; gitea)
+
+ [ Eric Wild ]
+ * logging: make LIBOSMOCORE_NO_LOGGING work as expected
+
+ [ Oliver Smith ]
+ * treewide: remove FSF address
+ * select_main: don't poll forever during shutdown
+ * Cosmetic: linuxlist.h: fix misleading comment
+
+ [ Philipp Maier ]
+ * stats: fix typo
+ * stat_item: tolerate NULL pointer argument in osmo_stat_item_group_free
+ * select: gather statistics for TCP connections
+ * stats_tcp: use a default batch size of 5 instead of 1
+ * stats_tcp: fix stats item identifier
+ * gsm23003: fix docstring for osmo_plmn_from_bcd()
+ * iuup: do not use illegal characters in state/event names.
+ * logging: log to stderr when logging is not initialized
+ * reader: more meaningful null pointer check in get_sw
+
+ [ Pau Espin Pedrol ]
+ * include/: Adapt some headers to match contrib/struct_endianess.py format
+ * logging: Fix Not enough tailroom msgb_put in _output_buf callers
+ * osmo-release.sh: Use variable containing bumpversion path everywhere
+ * iuup: Fix decoding of 1byte-length subflow size fields
+ * iuup: Submit RNL-STATUS-Initialization.ind upon rx of Init
+ * iuup: Improve CRC checksum error logging
+ * gsm: [ABI BREAK] Support CellId SAI, change CellId CGI-PS id number
+ * gsm: lapd_core: Change log line NOTICE->INFO
+ * gsm0808_test: Add new unit test showing dec error
+ * gsm0808: Fix decoding of IE GSM0808_IE_LCS_CLIENT_TYPE
+ * cosmetic: gsm_08_08.h: Add space between assignment sides
+ * gsm0808: Add missing IEs in bss_att_tlvdef
+ * jenkins: Validate IEs are added to tlv_definition
+ * libosmocore.pc.in: put libsctp in Requires.private
+ * configure: Support libsctp < 1.0.17 without libsctp.pc
+ * rsl: Fix tlv_parse of IPAC_DLCX_IND message
+ * jenkins: Validate gsm 08.58 IEs are added to tlv_definition
+ * gsm: Introduce helper rach_tx_integer_raw2val()
+ * cosmetic: logging.h: fix indentation
+ * gsm_12_21.h: Fix abis_nm_avail_state InTest and Failed values
+ * gsm_12_21.h: Add header description pointing to TS files
+ * coding: Refactor function to avoid gcc false positive warn
+ * osmo-arfcn: Fix false positive in gcc 12.1.0
+ * coding: Use ARRAY_SIZE macro
+ * iuup: Rework API to support RFCI IDs != RFCI index
+ * cosmetic: iuup.h: Fix indentation
+ * iuup: Fix IPTIs_present not set to 0 if no IPTIs received
+ * cbsp: Add enum and value string for Cause
+ * iuup: Add missing state to bitmask for st SMpSDU_Data_Transfer_Ready
+ * iuup: Drop unused events
+ * tests/iuup: Showcase IuUP stack not answering subsequent Init msgs
+ * iuup: Fix Handling of subsequent Initialization msgs
+ * vty: command.c: Add assert
+
+ [ Sylvain Munaut ]
+ * conv: Fix the traceback for tail biting codes
+ * build: Disable libusb and libmnl for embedded builds
+
+ [ Neels Hofmeyr ]
+ * PFCP: add DLPFCP and osmo-upf port numbers
+ * ports.h: add osmo-pfcp-tool ports
+ * add osmo_sockaddr_to_str_c(), osmo_sockaddr_to_str_buf2()
+ * log: socket.c: rather use the osmo_sockaddr_str _FMT
+ * add osmo_quote_str_buf3, osmo_escape_str_buf3
+ * add osmo_sockaddr_from/to_octets()
+ * follow-up to osmo_sockaddr_from/to_octets()
+ * BSSAP: HO Request Ack: add missing Codec List (BSS Supported)
+ * add osmo_sockaddr_set_port()
+ * osmo_time_cc: rate_ctr presence should not affect counting
+ * cosmetic tweak in Makefile.am
+
+ [ Michael Iedema ]
+ * stats: use tcp stat names as provided
+
+ [ Karsten Ohme ]
+ * APDU parsing support for GlobalPlatform
+
+ -- Pau Espin Pedrol <pespin(a)sysmocom.de> Tue, 28 Jun 2022 17:00:51 +0200
+
libosmocore (1.6.0) unstable; urgency=medium
[ Pau Espin Pedrol ]
diff --git a/debian/control b/debian/control
index ff11656..ec23133 100644
--- a/debian/control
+++ b/debian/control
@@ -31,9 +31,9 @@
Multi-Arch: foreign
Depends: libosmocodec0 (= ${binary:Version}),
libosmocoding0 (= ${binary:Version}),
- libosmocore18 (= ${binary:Version}),
- libosmogb12 (= ${binary:Version}),
- libosmogsm17 (= ${binary:Version}),
+ libosmocore19 (= ${binary:Version}),
+ libosmogb14 (= ${binary:Version}),
+ libosmogsm18 (= ${binary:Version}),
libosmovty9 (= ${binary:Version}),
libosmoctrl0 (= ${binary:Version}),
libosmosim2 (= ${binary:Version}),
@@ -115,7 +115,7 @@
.
This package contains the documentation for the libosmocoding library.
-Package: libosmocore18
+Package: libosmocore19
Section: libs
Architecture: any
Multi-Arch: same
@@ -129,14 +129,14 @@
(at least) other programs that are developed in the sphere of Free Software /
Open Source mobile communication.
.
- The libosmocore18 library in particular is a collection of common code used in
+ The libosmocore library in particular is a collection of common code used in
various sub-projects inside the Osmocom family of projects.
Package: libosmocore-doc
Architecture: all
Section: doc
Depends: ${misc:Depends},
- libosmocore18,
+ libosmocore19,
libjs-jquery,
libosmocodec-doc,
libosmocoding-doc,
@@ -151,7 +151,7 @@
.
This package contains the documentation for the libosmocore library.
-Package: libosmogb12
+Package: libosmogb14
Section: libs
Architecture: any
Multi-Arch: same
@@ -172,7 +172,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends},
- libosmogb12,
+ libosmogb14,
libjs-jquery
Description: Documentation for the Osmo GPRS Gb library
This is part of the libosmocore "meta"-library. The libosmocore library
@@ -183,7 +183,7 @@
.
This package contains the documentation for the libosmogb library.
-Package: libosmogsm17
+Package: libosmogsm18
Section: libs
Architecture: any
Multi-Arch: same
@@ -207,7 +207,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends},
- libosmogsm17,
+ libosmogsm18,
libjs-jquery
Description: Documentation for the Osmo GSM utility library
This is part of the libosmocore "meta"-library. The libosmocore library
diff --git a/debian/libosmocore18.install b/debian/libosmocore19.install
similarity index 100%
rename from debian/libosmocore18.install
rename to debian/libosmocore19.install
diff --git a/debian/libosmogb12.install b/debian/libosmogb14.install
similarity index 100%
rename from debian/libosmogb12.install
rename to debian/libosmogb14.install
diff --git a/debian/libosmogsm17.install b/debian/libosmogsm18.install
similarity index 100%
rename from debian/libosmogsm17.install
rename to debian/libosmogsm18.install
diff --git a/src/Makefile.am b/src/Makefile.am
index 5777c31..2c73af6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=18:0:0
+LIBVERSION=19:0:0
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS)
diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am
index b85749d..b712591 100644
--- a/src/codec/Makefile.am
+++ b/src/codec/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=3:0:3
+LIBVERSION=3:1:3
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS)
AM_CFLAGS = -Wall
diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am
index a574f98..9a24f38 100644
--- a/src/coding/Makefile.am
+++ b/src/coding/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read Chapter 6 "Library interface versions" of the libtool
# documentation before making any modification
-LIBVERSION=1:2:1
+LIBVERSION=2:0:2
AM_CPPFLAGS = \
-I"$(top_srcdir)/include" \
diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am
index 807b672..5921f04 100644
--- a/src/ctrl/Makefile.am
+++ b/src/ctrl/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=6:0:6
+LIBVERSION=7:0:7
AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS)
diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am
index 018342c..022578f 100644
--- a/src/gb/Makefile.am
+++ b/src/gb/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=13:0:1
+LIBVERSION=14:0:0
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing \
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index 326efd2..7e2949e 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=17:0:0
+LIBVERSION=18:0:0
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS)
AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN}
diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am
index a88e341..a73ce4b 100644
--- a/src/sim/Makefile.am
+++ b/src/sim/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=3:0:1
+LIBVERSION=3:1:1
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS)
diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am
index 2dee434..50d45c2 100644
--- a/src/usb/Makefile.am
+++ b/src/usb/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=0:0:0
+LIBVERSION=0:1:0
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -fPIC -Wall $(LIBUSB_CFLAGS) $(TALLOC_CFLAGS)
diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am
index 37faad6..3142d75 100644
--- a/src/vty/Makefile.am
+++ b/src/vty/Makefile.am
@@ -1,7 +1,7 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=10:0:1
+LIBVERSION=11:0:2
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28433
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Idb0d20aa4336a69cb100e140fb1fa9e7ac25b984
Gerrit-Change-Number: 28433
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28429 )
Change subject: cbsp: Change log level ERROR->INFO on CBSP tx and link down
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28429
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I64356ec6a7b3a4e11a0e66b17efab2788b1ca5cc
Gerrit-Change-Number: 28429
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 28 Jun 2022 14:36:33 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28428 )
Change subject: cbsp: Avoid encoding CBSP message if link is down
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28428
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I25c8681d2ee987ac6ebfce42ee409926eb88301d
Gerrit-Change-Number: 28428
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 28 Jun 2022 14:29:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28417 )
Change subject: Use Osmocom OBS
......................................................................
Use Osmocom OBS
Related: OS#5557
Change-Id: I880f8134e4f7e6ae4125237e6b3983c04cea9ec6
---
M README.md
M centos7-build/Dockerfile
M centos7-obs-latest/Dockerfile
M centos8-build/Dockerfile
M centos8-obs-latest/Dockerfile
M common/Release.key
M debian-bullseye-build/Dockerfile
M debian-bullseye-erlang/Dockerfile
M debian-bullseye-obs-latest/Dockerfile
M debian-bullseye-titan/Dockerfile
M debian-buster-build/Dockerfile
M debian-buster-jenkins/Dockerfile
M debian-buster-simtrace2/Dockerfile
M debian-jessie-osmocom/Dockerfile
M debian-sid-jenkins/Dockerfile
M debian-stretch-build/Dockerfile
M debian-stretch-jenkins/Dockerfile
M debian-stretch-obs-latest/Dockerfile
M make/Makefile
M osmo-ran/Dockerfile
M osmo-ran/split/ran-bsc_mgw/Dockerfile
M osmo-ran/split/ran-bts_pcu/Dockerfile
M osmo-ran/split/ran-trx-ipc/Dockerfile
M osmo-ran/split/ran-trx-uhd/Dockerfile
24 files changed, 70 insertions(+), 72 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/README.md b/README.md
index 9a1889e..dd3d992 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@
2021q1-centos8:
```
-export OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
+export OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org"
export OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
export OSMOCOM_REPO_PATH="osmo-maintained"
export OSMOCOM_REPO_VERSION="2021q1"
@@ -75,7 +75,7 @@
The OBS repository mirror consists of
`${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}`,
-e.g. `https://download.opensuse.org/repositories/network:/osmocom:/latest/`.
+e.g. `https://downloads.osmocom.org/packages/osmocom:/latest/`.
### Creating kernel config fragments
For the kernel tests, we are storing kernel config fragments in the git
diff --git a/centos7-build/Dockerfile b/centos7-build/Dockerfile
index 2e04efb..f449d42 100644
--- a/centos7-build/Dockerfile
+++ b/centos7-build/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=centos:centos7
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
# Use dnf package manager instead of yum, so we can use all the dnf codepaths
# that were originally written for CentOS8 in this CentOS7 image too
diff --git a/centos7-obs-latest/Dockerfile b/centos7-obs-latest/Dockerfile
index dfe12fc..2c06882 100644
--- a/centos7-obs-latest/Dockerfile
+++ b/centos7-obs-latest/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=centos:centos7
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO_VERSION="latest"
# Use dnf package manager instead of yum, so we can use all the dnf codepaths
diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index 26ef819..19593c1 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=almalinux:8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
# Let package metadata expire after 60 seconds instead of 48 hours
RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile
index 69eeb79..ccbef81f 100644
--- a/centos8-obs-latest/Dockerfile
+++ b/centos8-obs-latest/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=almalinux:8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO_VERSION="latest"
# Let package metadata expire after 60 seconds instead of 48 hours
diff --git a/common/Release.key b/common/Release.key
index 30aebe8..ecca084 100644
--- a/common/Release.key
+++ b/common/Release.key
@@ -1,20 +1,26 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
-mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
-a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
-CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
-5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
-S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
-CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
-b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCYo5k
-AwIbAwUJFGtcBwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fU7YI
-AKtt2TSRJ6M+vJlAGEafD0OIwbLCQ5XY9xd0ncbW2HfsIznUafgRPgTz2YN5n1iO
-hGAhAQVQrm7HIqZEJBmdvUHxiOgsVYviaVAo8t2fNH5TYdK4y5fjIjzNrFtJFr3z
-ImxPmu/kuIhTCzl09Xd0vtIi7wDy1J0l5Chy4DR/X+NeduyvtgpbMCv8DX3G95GH
-MHpsmFaFtKY0Mbuwu+aEZ97k/I1BkmPSDYFWycqe/fGYNRHjSQjopqD2+3sNyeAg
-Bs7jPDnJ8RILRz7YnxMqT69z64mgrvlPj7jX2w8jdWKzhAythbbYDKOb7rYQ9U2g
-NEpwNGuOkrZYSLlna1ZXYjiIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
-d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
-=wfqq
+mQENBGKzE1QBCADFcM3ZzggvgxNRNNqDGWf5xIDAiK5qzFLdGes7L6F9VCHdaPy0
+RAOB5bFb/Q1tSDFNEBLtaauXKz+4iGL6qMVjZcyjzpB5w4jKN+kkrFRhjDNUv/SH
+BX6d+P7v5WBGSNArNgA8D1BGzckp5a99EZ0okMJFEqIcN40PD6OGugpq5XnVV5Nk
+e93fLa2Cu8vhFBcVn6CuHeEhsmuMf6NLbQRNfNNCEEUYaZn7beMYtpZ7t1djsKx5
+1xGm50OzI22FLu8lELQ9d7qMVGRG3WHYawX9BDteRybiyqxfwUHm1haWazRJtlGt
+UWyzvwAb80BK1J2Nu5fbAa3w5CoEPAbUuCyrABEBAAG0JW9zbW9jb20gT0JTIFBy
+b2plY3QgPG9zbW9jb21Ab3Ntb2NvbT6JAVQEEwEIAD4WIQRrKp83ktFetw1Oao+G
+pzC2U3JZcwUCYrMV4wIbAwUJBB6yjwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK
+CRCGpzC2U3JZc4FRCACQQkKIrnvQ7n2u7GSmyVZa3I+oLoFXSGqaGyey5TW/nrMm
+vFDKU3qliHiuNSmUY35SnAhXUsvqOYppxVRoO1MLrqUvzMOnIWqkJpf8mtjGUnsW
+jyVeto7Rsjs75y2i1Hk+e7ljb/V65J3NlfrfEYWbqR9AKd53ReNXTdrQ0J05A38N
+GdI4Ld/2lNISAwaBmGhqdeKsLHpQw/JERU1TApVJR1whFiIwDF1rOCg9GPnNKIk7
+yRZdK267XzztrainX/cbPILyzUZEDhYs6wQuyACyQ1YUxZIxrwVfk7PMNay8CrLH
+z42B73Ne5IAj8+op/3iJafFONLm7YXiDUFN+QDYAiQEzBBMBCAAdFiEExoiYhHND
+S7aVYlnqa51NyAUyjdsFAmKzE1UACgkQa51NyAUyjdvuZgf+OXmr//i7u7Gg7eWB
+7e0qUsyCId9lXS8J437x3K6ciJfD7/6RSy8TFW5Nglm/uSkbyq582I8t+SoOirMD
+E6cg9U/5+h5s46bAf+Kd2XS/6tLGeNLM18i4el8CP06NpFzDrsKu76uYFpyRiiHD
+otBdtgxeLJ83LugGfZslF+/5cigJkAJMhAdVvGO8h85R6fba8ZSOKtMKkaQRfi76
+nhyOrJPlLuS+DLEnHwdkOFgtKnxHdjM97K+Tx0gisb6uwaWroXfSLnhP8RTLLZZy
+Z+noU1Hw3c+mn4c/NYbcC/uwHYHKRzuf9gHnQ3dGgv0Z5sbeLRVo92hjGj7Ftlyd
+4hmKBg==
+=HxK4
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian-bullseye-build/Dockerfile b/debian-bullseye-build/Dockerfile
index 3c8bf4b..b1e7cd5 100644
--- a/debian-bullseye-build/Dockerfile
+++ b/debian-bullseye-build/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=debian:bullseye
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_11/"
RUN apt-get update && \
diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile
index 9c3d4f3..e7a584e 100644
--- a/debian-bullseye-erlang/Dockerfile
+++ b/debian-bullseye-erlang/Dockerfile
@@ -1,10 +1,8 @@
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:bullseye
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
-
-
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_11/"
# install the erlang vm and rebar (2)
diff --git a/debian-bullseye-obs-latest/Dockerfile b/debian-bullseye-obs-latest/Dockerfile
index 6707838..16320c0 100644
--- a/debian-bullseye-obs-latest/Dockerfile
+++ b/debian-bullseye-obs-latest/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=debian:bullseye
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_11/"
RUN apt-get update && \
diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile
index 576041c..68c27ee 100644
--- a/debian-bullseye-titan/Dockerfile
+++ b/debian-bullseye-titan/Dockerfile
@@ -2,10 +2,8 @@
ARG UPSTREAM_DISTRO=debian:bullseye
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
-
-
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_11/"
+ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_11/"
RUN apt-get update && apt-get install -y \
ca-certificates \
diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile
index 7000ca5..80e5678 100644
--- a/debian-buster-build/Dockerfile
+++ b/debian-buster-build/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=debian:buster
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"
RUN apt-get update && \
diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile
index 04c6c4c..5229373 100644
--- a/debian-buster-jenkins/Dockerfile
+++ b/debian-buster-jenkins/Dockerfile
@@ -5,8 +5,8 @@
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:${DEBIAN_VERSION}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
# Make "$DEBIAN_VERSION" available after FROM
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-fr…
diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile
index 71309b5..c697d16 100644
--- a/debian-buster-simtrace2/Dockerfile
+++ b/debian-buster-simtrace2/Dockerfile
@@ -1,10 +1,8 @@
ARG USER
FROM $USER/debian-buster-build
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
-
-
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"
COPY .common/Release.key /tmp/Release.key
diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile
index 011f5aa..da0eb9b 100644
--- a/debian-jessie-osmocom/Dockerfile
+++ b/debian-jessie-osmocom/Dockerfile
@@ -1,10 +1,8 @@
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:jessie
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
-
-
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_8.0/"
COPY .common/Release.key /tmp/Release.key
diff --git a/debian-sid-jenkins/Dockerfile b/debian-sid-jenkins/Dockerfile
index 944e514..bb66f13 100644
--- a/debian-sid-jenkins/Dockerfile
+++ b/debian-sid-jenkins/Dockerfile
@@ -5,8 +5,8 @@
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:${DEBIAN_VERSION}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
# Make "$DEBIAN_VERSION" available after FROM
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-fr…
diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile
index b144e13..509e4d5 100644
--- a/debian-stretch-build/Dockerfile
+++ b/debian-stretch-build/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=debian:stretch
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_9.0/"
RUN apt-get update && \
diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile
index d44e394..42ed09a 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -5,8 +5,8 @@
ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:${DEBIAN_VERSION}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
# Make "$DEBIAN_VERSION" available after FROM
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-fr…
diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile
index fe3420b..ced8a7d 100644
--- a/debian-stretch-obs-latest/Dockerfile
+++ b/debian-stretch-obs-latest/Dockerfile
@@ -2,8 +2,8 @@
ARG UPSTREAM_DISTRO=debian:stretch
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_9.0/"
RUN apt-get update && \
diff --git a/make/Makefile b/make/Makefile
index 89310dd..d3bd727 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -46,15 +46,15 @@
# Full OBS repository mirror consists of:
# ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}
-# e.g. "https://download.opensuse.org/repositories/network:/osmocom:/latest/"
+# e.g. "https://downloads.osmocom.org/packages/osmocom:/latest/"
#
# Use if down: OSMOCOM_REPO_MIRROR=http://ftp.uni-stuttgart.de/opensuse
-OSMOCOM_REPO_MIRROR?=http://download.opensuse.org
-OSMOCOM_REPO_PATH?=repositories/network:/osmocom:
+OSMOCOM_REPO_MIRROR?=https://downloads.osmocom.org
+OSMOCOM_REPO_PATH?=packages/osmocom:
# Use "nightly" to use the nightly feed
OSMOCOM_REPO_VERSION?=latest
# Build the testsuite with the following mirror. In jenkins we always want to
-# point this to http://download.opensuse.org, so the same testsuite can be
+# point this to http://downloads.osmocom.org, so the same testsuite can be
# used no matter which OSMOCOM_REPO_MIRROR is set. This avoids rebuilding the
# testsuite when we only want to change OSMOCOM_REPO_MIRROR to build different
# subjects under test, and it works even if the OSMOCOM_REPO_MIRROR only has
diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile
index 07c8551..a0bf9b9 100644
--- a/osmo-ran/Dockerfile
+++ b/osmo-ran/Dockerfile
@@ -2,8 +2,8 @@
FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile
index 03c16fe..b090d6c 100644
--- a/osmo-ran/split/ran-bsc_mgw/Dockerfile
+++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile
@@ -2,8 +2,8 @@
FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile
index 0129b75..19f68c4 100644
--- a/osmo-ran/split/ran-bts_pcu/Dockerfile
+++ b/osmo-ran/split/ran-bts_pcu/Dockerfile
@@ -2,8 +2,8 @@
FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile
index 467adab..0cd2713 100644
--- a/osmo-ran/split/ran-trx-ipc/Dockerfile
+++ b/osmo-ran/split/ran-trx-ipc/Dockerfile
@@ -2,8 +2,8 @@
FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile
index 3603685..75a596b 100644
--- a/osmo-ran/split/ran-trx-uhd/Dockerfile
+++ b/osmo-ran/split/ran-trx-uhd/Dockerfile
@@ -2,8 +2,8 @@
FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28417
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I880f8134e4f7e6ae4125237e6b3983c04cea9ec6
Gerrit-Change-Number: 28417
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: laforge.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28417 )
Change subject: Use Osmocom OBS
......................................................................
Patch Set 1: Code-Review+2
(2 comments)
Patchset:
PS1:
> LGTM, but we should of course only deploy it once the nightly jenkins job is deployed, i.e. […]
ACK. It's deployed and packages built today, merging now.
PS1:
1+1=2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28417
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I880f8134e4f7e6ae4125237e6b3983c04cea9ec6
Gerrit-Change-Number: 28417
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 28 Jun 2022 14:08:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment