dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31254 )
Change subject: e1_input: add define constant for full subslot (whole E1 timeslot)
......................................................................
e1_input: add define constant for full subslot (whole E1 timeslot)
The struct gsm_e1_subslot has a memeber e1_ts_ss, which describes the
I.460 subslot to use inside an E1 timeslot. This is usually just an
integer number (e.g. 0,1,2,3 for a line with 4 16kbps subslots). However
it is also possible to use no subslots at all. This is encoded by
setting e1_ts_ss to 0xff. When this magic number is used somewhere in
the code it is not immediately obvious what it means, so lets add a
define constant.
Change-Id: I62725420d1cb2803b87fe5aa5e6ca1f3740be9eb
Related: OS#5198
---
M include/osmocom/abis/e1_input.h
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h
index 8e7f20b..91bf181 100644
--- a/include/osmocom/abis/e1_input.h
+++ b/include/osmocom/abis/e1_input.h
@@ -148,12 +148,14 @@
struct msgb *pending_msg;
};
+#define E1_SUBSLOT_FULL 0xff
+
struct gsm_e1_subslot {
/* Number of E1 link */
uint8_t e1_nr;
/* Number of E1 TS inside E1 link */
uint8_t e1_ts;
- /* Sub-slot within the E1 TS, 0xff if full TS */
+ /* Sub-slot within the E1 TS, 0xff (E1_SUBSLOT_FULL) if full TS */
uint8_t e1_ts_ss;
};
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31254
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I62725420d1cb2803b87fe5aa5e6ca1f3740be9eb
Gerrit-Change-Number: 31254
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31256 )
Change subject: debian/libgtp6.shlibs: new file
......................................................................
debian/libgtp6.shlibs: new file
List the most recent library version where new symbols where added, so
debian properly upgrades libgtp6 when upgrading osmo-sgsn from the
version that is currently in Debian to a version from the Osmocom
repositories.
Closes: OS#5318
Change-Id: Ida5dae4655c0acaeb377bc9d556a2ac333bca10a
---
A debian/libgtp6.shlibs
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/debian/libgtp6.shlibs b/debian/libgtp6.shlibs
new file mode 100644
index 0000000..43d45e7
--- /dev/null
+++ b/debian/libgtp6.shlibs
@@ -0,0 +1,2 @@
+# Most recent version of the package that added new symbols (OS#5318)
+libgtp 6 libgtp6 (>= 1.8.0)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31256
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ida5dae4655c0acaeb377bc9d556a2ac333bca10a
Gerrit-Change-Number: 31256
Gerrit-PatchSet: 2
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
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31251 )
Change subject: release-tarball: add var to use list from jenkins
......................................................................
release-tarball: add var to use list from jenkins
Add a parameter that can be used to reproduce the failure locally with
the last list from jenkins, without having SSH set up to download the
list of existing tarballs.
Change-Id: I9af310c24aa65c21cc4bd365d3df7804cba02df7
---
M release-tarball-build-dist/Dockerfile
M release-tarball-build-dist/jenkins.sh
M release-tarball-build-dist/osmocom-release-tarballs.sh
3 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/release-tarball-build-dist/Dockerfile b/release-tarball-build-dist/Dockerfile
index dcfea51..e8ffd21 100644
--- a/release-tarball-build-dist/Dockerfile
+++ b/release-tarball-build-dist/Dockerfile
@@ -69,6 +69,7 @@
mscgen \
python3-nwdiag \
rsync \
+ wget \
xsltproc \
&& \
apt-get clean
diff --git a/release-tarball-build-dist/jenkins.sh b/release-tarball-build-dist/jenkins.sh
index d59aa15..8ea3c27 100755
--- a/release-tarball-build-dist/jenkins.sh
+++ b/release-tarball-build-dist/jenkins.sh
@@ -10,6 +10,7 @@
-v "$PWD:/build" \
-v "$(readlink -f $SSH_AUTH_SOCK)":/ssh-agent \
-w /osmo-ci \
+ -e EXISTING_TARBALLS_FROM_JENKINS="$EXISTING_TARBALLS_FROM_JENKINS" \
-e KEEP_TEMP="$KEEP_TEMP" \
-e SSH_AUTH_SOCK=/ssh-agent \
"$USER/release-tarball-build-dist" sh -e /build/osmocom-release-tarballs.sh
diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh
index c64b0a2..b66b9ea 100644
--- a/release-tarball-build-dist/osmocom-release-tarballs.sh
+++ b/release-tarball-build-dist/osmocom-release-tarballs.sh
@@ -5,6 +5,8 @@
#
# Environment variables:
# * KEEP_TEMP: do not delete cloned repositories (use for development)
+# * EXISTING_TARBALLS_FROM_JENKINS: set to 1 to get the existing tarballs from
+# the last run of the jenkins job
SSH_COMMAND="ssh -o UserKnownHostsFile=/build/known_hosts -p 48"
OSMO_GIT_URL="https://git.osmocom.org"
OSMO_RELEASE_REPOS="
@@ -207,7 +209,10 @@
}
get_existing_tarballs() {
- if ! $SSH_COMMAND releases(a)ftp.osmocom.org -- \
+ if [ -n "$EXISTING_TARBALLS_FROM_JENKINS" ]; then
+ wget -O "$TEMP"/existing_tarballs \
+ https://jenkins.osmocom.org/jenkins/job/Osmocom-release-tarballs/ws/release…
+ elif ! $SSH_COMMAND releases(a)ftp.osmocom.org -- \
find web-files -name '*.tar.bz2' \
> "$TEMP"/existing_tarballs; then
echo "ERROR: getting existing tarballs from remote failed!"
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31251
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I9af310c24aa65c21cc4bd365d3df7804cba02df7
Gerrit-Change-Number: 31251
Gerrit-PatchSet: 2
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
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31248 )
Change subject: release-tarball: support git submodules
......................................................................
release-tarball: support git submodules
osmo-trx 1.5.0 is now using a git submodule for osmocom-bb, so add
support for it.
Change-Id: I35e9ef6d976ae8cf2bfb4f3c410e6b2cb3ca7841
---
M release-tarball-build-dist/osmocom-release-tarballs.sh
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh
index e49c03b..f2bc599 100644
--- a/release-tarball-build-dist/osmocom-release-tarballs.sh
+++ b/release-tarball-build-dist/osmocom-release-tarballs.sh
@@ -208,13 +208,14 @@
local tag="${2:-master}"
if ! [ -d "$TEMP/repos/$repo" ]; then
- git -C "$TEMP/repos" clone "$OSMO_GIT_URL/$repo"
+ git -C "$TEMP/repos" clone --recursive "$OSMO_GIT_URL/$repo"
fi
cd "$TEMP/repos/$repo"
git clean -qdxf
git reset --hard HEAD # in case the tracked files were modified (e.g. libsmpp34 1.10)
git checkout -q "$tag"
+ git submodule update --recursive
}
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31248
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I35e9ef6d976ae8cf2bfb4f3c410e6b2cb3ca7841
Gerrit-Change-Number: 31248
Gerrit-PatchSet: 2
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