osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/34206 )
Change subject: libosmocore: use --disable-uring
......................................................................
libosmocore: use --disable-uring
Disable it as the library is not available in OE packaging, and kernels
are probably too old to make use of this feature.
Related: OS#5751
Change-Id: I92335090e49de82384ac3ff837cbad48fcc5c3f5
---
M recipes-osmocom/libosmocore/libosmocore_git.bb
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/06/34206/1
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb
index 292596f..8bd37de 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -24,7 +24,7 @@
RREPLACES_libosmogsm = "DONOTREPLACElibosmocore"
RREPLACES_libosmovty = "DONOTREPLACElibosmocore"
-EXTRA_OECONF += "--disable-pcsc"
+EXTRA_OECONF += "--disable-pcsc --disable-uring"
# OS#4062: Some gcc version (< 7.3.0) on ARM generate wrong code for __thread
# variables that crash at runtime. It seems, due to some unknown reason, that we
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/34206
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Change-Id: I92335090e49de82384ac3ff837cbad48fcc5c3f5
Gerrit-Change-Number: 34206
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34202 )
Change subject: jobs/osmocom-api: run inside docker
......................................................................
jobs/osmocom-api: run inside docker
Run the osmocom-api job inside docker, so all depends are available
(fixes that it currently fails because liburing isn't available for
libosmocore).
Use the contrib/known_hosts file, instead of writing an own copy during
the job.
Change-Id: I6e831c71c4c88772c3e4232fcb1a9e2c1c73d997
---
M jobs/osmocom-api.yml
A scripts/osmocom-api-doxygen.sh
2 files changed, 76 insertions(+), 56 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/02/34202/1
diff --git a/jobs/osmocom-api.yml b/jobs/osmocom-api.yml
index 238340c..294ccaa 100644
--- a/jobs/osmocom-api.yml
+++ b/jobs/osmocom-api.yml
@@ -35,59 +35,12 @@
wipe-workspace: true
builders:
- shell: |
- # Repositories for which doxygen documentation will be generated and
- # uploaded, also dependencies which need to be built
- repos_api="
- libosmocore
- libosmo-abis
- libosmo-dsp
- libosmo-netif
- libosmo-sccp
- osmo-gmr"
-
- # Source common.sh from osmo-ci.git for osmo_git_clone_url()
- . scripts/common.sh
-
- # Put git repos and install data in a subdir, so it isn't in the root
- # of the cloned osmo-ci.git repository
- mkdir _osmocom_api
- cd _osmocom_api
-
- # Prepare pkgconfig path
- export PKG_CONFIG_PATH=$PWD/install/lib/pkgconfig
- mkdir -p "$PKG_CONFIG_PATH"
-
- # Prepare known_hosts
- cat > known_hosts <<EOF
- [ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
- [ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
- [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
- EOF
-
- # Clone and build the repositories
- for i in $repos_api; do
- git clone "$(osmo_git_clone_url "$i")"
- cd "$i"
- autoreconf -fi
- ./configure \
- --prefix=$PWD/../install \
- --with-systemdsystemunitdir=no
- make $PARALLEL_MAKE install
- cd ..
- done
-
- # Upload all docs
- for i in $repos_api; do
- if ! [ -d "$i"/doc ]; then
- # e.g. libosmo-abis is built as dependency for others but doesn't
- # have its own doxygen documentation as of writing
- continue
- fi
-
- rsync \
- -avz \
- --delete \
- -e "ssh -o 'UserKnownHostsFile=known_hosts' -p 48" \
- ./"$i"/doc/ \
- api@ftp.osmocom.org:web-files/latest/"$i"/
- done
+ docker run \
+ --rm=true \
+ -e SSH_AUTH_SOCK=/ssh-agent \
+ -u build \
+ -v "$PWD:/build" \
+ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \
+ -w /build \
+ "$USER/debian-bookworm-build" \
+ scripts/osmocom-api-doxygen.sh
diff --git a/scripts/osmocom-api-doxygen.sh b/scripts/osmocom-api-doxygen.sh
new file mode 100755
index 0000000..765b7fb
--- /dev/null
+++ b/scripts/osmocom-api-doxygen.sh
@@ -0,0 +1,51 @@
+#!/bin/sh -ex
+# Repositories for which doxygen documentation will be generated and
+# uploaded, also dependencies which need to be built
+repos_api="
+ libosmocore
+ libosmo-abis
+ libosmo-dsp
+ libosmo-netif
+ libosmo-sccp
+ osmo-gmr
+"
+
+# Source common.sh from osmo-ci.git for osmo_git_clone_url()
+. scripts/common.sh
+
+# Put git repos and install data in a subdir, so it isn't in the root
+# of the cloned osmo-ci.git repository
+mkdir _osmocom_api
+cd _osmocom_api
+
+# Prepare pkgconfig path
+export PKG_CONFIG_PATH=$PWD/install/lib/pkgconfig
+mkdir -p "$PKG_CONFIG_PATH"
+
+# Clone and build the repositories
+for i in $repos_api; do
+ git clone "$(osmo_git_clone_url "$i")"
+ cd "$i"
+ autoreconf -fi
+ ./configure \
+ --prefix=$PWD/../install \
+ --with-systemdsystemunitdir=no
+ make $PARALLEL_MAKE install
+ cd ..
+done
+
+# Upload all docs
+for i in $repos_api; do
+ if ! [ -d "$i"/doc ]; then
+ # e.g. libosmo-abis is built as dependency for others but doesn't
+ # have its own doxygen documentation as of writing
+ continue
+ fi
+
+ rsync \
+ -avz \
+ --delete \
+ -e "ssh -o UserKnownHostsFile=/build/contrib/known_hosts -p 48" \
+ ./"$i"/doc/ \
+ api@ftp.osmocom.org:web-files/latest/"$i"/
+done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34202
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6e831c71c4c88772c3e4232fcb1a9e2c1c73d997
Gerrit-Change-Number: 34202
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34203 )
Change subject: scripts/osmocom-api-doxygen: check ssh early
......................................................................
scripts/osmocom-api-doxygen: check ssh early
Check for working SSH right at the start of the job, so we don't need to
wait 2 minutes until it has built everything to find it out.
Change-Id: Id93c15d38a49859dc63d39f70f051a7df871c398
---
M scripts/osmocom-api-doxygen.sh
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/03/34203/1
diff --git a/scripts/osmocom-api-doxygen.sh b/scripts/osmocom-api-doxygen.sh
index 765b7fb..cfa5e61 100755
--- a/scripts/osmocom-api-doxygen.sh
+++ b/scripts/osmocom-api-doxygen.sh
@@ -1,4 +1,6 @@
#!/bin/sh -ex
+SSH_CMD="ssh -o UserKnownHostsFile=/build/contrib/known_hosts -p 48"
+
# Repositories for which doxygen documentation will be generated and
# uploaded, also dependencies which need to be built
repos_api="
@@ -13,6 +15,9 @@
# Source common.sh from osmo-ci.git for osmo_git_clone_url()
. scripts/common.sh
+# Check early that SSH works
+$SSH_CMD api(a)ftp.osmocom.org -T -- true
+
# Put git repos and install data in a subdir, so it isn't in the root
# of the cloned osmo-ci.git repository
mkdir _osmocom_api
@@ -45,7 +50,7 @@
rsync \
-avz \
--delete \
- -e "ssh -o UserKnownHostsFile=/build/contrib/known_hosts -p 48" \
+ -e "$SSH_CMD" \
./"$i"/doc/ \
api@ftp.osmocom.org:web-files/latest/"$i"/
done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34203
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id93c15d38a49859dc63d39f70f051a7df871c398
Gerrit-Change-Number: 34203
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 )
Change subject: PCUIF: use confirm flag in struct gsm_pcu_if_pch
......................................................................
Patch Set 2:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194/comment/6a09d79c_c2a1…
PS1, Line 9: see Depends
> no depends in the commit msg
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194
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: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac
Gerrit-Change-Number: 34194
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 25 Aug 2023 10:32:52 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
Hello osmith, Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194
to look at the new patch set (#2).
Change subject: PCUIF: use confirm flag in struct gsm_pcu_if_pch
......................................................................
PCUIF: use confirm flag in struct gsm_pcu_if_pch
In the recent PCUIF change of osmo-pcu (see Depends) a confirm flag
is added to struct gsm_pcu_if_pch. This flag tells the receiving end
(OsmoBSC or OsmoBTS) that the sending of the received MAC block has
to be confirmed towards the PCU. OsmoBTS and OsmoPCU now rely on the
conformation flag.
Let's update the BTS_and PCU testsuites accordingly.
Related: OS#5927
Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04
Change-Id: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac
---
M bts/BTS_Tests.ttcn
M library/PCUIF_CodecPort.ttcn
M library/PCUIF_Types.ttcn
M pcu/PCUIF_Components.ttcn
4 files changed, 30 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/34194/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194
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: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac
Gerrit-Change-Number: 34194
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34191 )
Change subject: pcuif_proto: use confirm flag in struct gsm_pcu_if_pch
......................................................................
Patch Set 2:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bts/+/34191/comment/8e53835b_2bc18649
PS1, Line 11:
> I'd mention here that the flag gets added in osmo-pcu. […]
Done
File include/osmo-bts/pcuif_proto.h:
https://gerrit.osmocom.org/c/osmo-bts/+/34191/comment/d4f4e26f_70ae8bf0
PS1, Line 235: bool confirmed_imm_ass;
> Wwhat happens if using a newer osmo-bts with an older osmo-pcu which does not send the field? […]
The version flag in pcuif_proto.h should catch that.
Otherwise: DL TBFs would not work since the confirm flag would be always zero.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34191
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I3364d2268bdef9c4d2feeb8e3d51a64e34bca68c
Gerrit-Change-Number: 34191
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 25 Aug 2023 10:32:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
Hello osmith, Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/34191
to look at the new patch set (#2).
Change subject: pcuif_proto: use confirm flag in struct gsm_pcu_if_pch
......................................................................
pcuif_proto: use confirm flag in struct gsm_pcu_if_pch
The PCU now sets a confirm flag in struct gsm_pcu_if_pch in case the MAC
block (data) requires a confirmation when sent. Use this confirm flag
instead of making the decision locally based on the MAC block contents.
Related: OS#5927
Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04
Change-Id: I3364d2268bdef9c4d2feeb8e3d51a64e34bca68c
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 19 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/34191/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34191
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I3364d2268bdef9c4d2feeb8e3d51a64e34bca68c
Gerrit-Change-Number: 34191
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset