March 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: gsm_04_08: add more enum gsm48_chan_mode data values
by fixeria 23 Mar '23

23 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32025 ) Change subject: gsm_04_08: add more enum gsm48_chan_mode data values ...................................................................... gsm_04_08: add more enum gsm48_chan_mode data values From 3GPP TS 44.018 (version 15.4.0), table 10.5.2.6.1. Change-Id: Ia6b428e5b6aaecf151cbfa980b89eff6d0fe6006 Related: OS#1572 --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/32025/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 5b8dd51..e6dc73b 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -763,6 +763,25 @@ /*! Speech: OHR AMR (O-TCH/AHS) */ GSM48_CMODE_SPEECH_V6 = 0x83, + /* ECSD: 43.5 kbit/s (DL) + 14.5 kbit/s (UL) */ + GSM48_CMODE_DATA_43k5_14k5 = 0x61, + /* ECSD: 29.0 kbit/s (DL) + 14.5 kbit/s (UL) */ + GSM48_CMODE_DATA_29k0_14k5 = 0x62, + /* ECSD: 43.5 kbit/s (DL) + 29.0 kbit/s (UL) */ + GSM48_CMODE_DATA_43k5_29k0 = 0x64, + /* ECSD: 14.5 kbit/s (DL) + 43.5 kbit/s (UL) */ + GSM48_CMODE_DATA_14k5_43k5 = 0x67, + /* ECSD: 14.5 kbit/s (DL) + 29.0 kbit/s (UL) */ + GSM48_CMODE_DATA_14k5_29k0 = 0x65, + /* ECSD: 29.0 kbit/s (DL) + 43.5 kbit/s (UL) */ + GSM48_CMODE_DATA_29k0_43k5 = 0x66, + + /*! ECSD: 43.5 kbit/s radio interface rate, 43.2 kbit/s services (E-TCH/F43.2) */ + GSM48_CMODE_DATA_43k5 = 0x27, + /*! ECSD: 32.0 kbit/s radio interface rate, 32.0 kbit/s services (E-TCH/F32.0) */ + GSM48_CMODE_DATA_32k0 = 0x63, + /*! ECSD: 29.0 kbit/s radio interface rate, 28.8 kbit/s services (E-TCH/F28.8) */ + GSM48_CMODE_DATA_29k0 = 0x43, /*! CSD: 14.5 kbit/s radio interface rate, 14.4 kbit/s services (TCH/F14.4) */ GSM48_CMODE_DATA_14k5 = 0x0f, /*! CSD: 12.0 kbit/s radio interface rate, 9.6 kbit/s services (TCH/F9.6) */ diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 59393d1..dee6813 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -452,6 +452,16 @@ { GSM48_CMODE_SPEECH_V5, "SPEECH_V5" }, { GSM48_CMODE_SPEECH_V6, "SPEECH_V6" }, + { GSM48_CMODE_DATA_43k5_14k5, "DATA_43k5_14k5" }, + { GSM48_CMODE_DATA_29k0_14k5, "DATA_29k0_14k5" }, + { GSM48_CMODE_DATA_43k5_29k0, "DATA_43k5_29k0" }, + { GSM48_CMODE_DATA_14k5_43k5, "DATA_14k5_43k5" }, + { GSM48_CMODE_DATA_14k5_29k0, "DATA_14k5_29k0" }, + { GSM48_CMODE_DATA_29k0_43k5, "DATA_29k0_43k5" }, + + { GSM48_CMODE_DATA_43k5, "DATA_43k5" }, + { GSM48_CMODE_DATA_32k0, "DATA_32k0" }, + { GSM48_CMODE_DATA_29k0, "DATA_29k0" }, { GSM48_CMODE_DATA_14k5, "DATA_14k5" }, { GSM48_CMODE_DATA_12k0, "DATA_12k0" }, { GSM48_CMODE_DATA_6k0, "DATA_6k0" }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6b428e5b6aaecf151cbfa980b89eff6d0fe6006 Gerrit-Change-Number: 32025 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: gsm0808: handle new enum gsm48_chan_mode speech/data values
by fixeria 23 Mar '23

23 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32026 ) Change subject: gsm0808: handle new enum gsm48_chan_mode speech/data values ...................................................................... gsm0808: handle new enum gsm48_chan_mode speech/data values Change-Id: I87d977228b1e039c2876941d1c6df1f69d1a54d4 Related: OS#1572 --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 66 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/32026/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 18f3ebe..85244a5 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -188,37 +188,34 @@ static inline enum gsm0808_permitted_speech gsm0808_permitted_speech(enum gsm_chan_t type, enum gsm48_chan_mode mode) { - switch (mode) { - case GSM48_CMODE_SPEECH_V1: - switch (type) { - case GSM_LCHAN_TCH_F: - return GSM0808_PERM_FR1; - case GSM_LCHAN_TCH_H: - return GSM0808_PERM_HR1; - default: - return 0; - } - case GSM48_CMODE_SPEECH_EFR: - switch (type) { - case GSM_LCHAN_TCH_F: - return GSM0808_PERM_FR2; - case GSM_LCHAN_TCH_H: - return GSM0808_PERM_HR2; - default: - return 0; - } - case GSM48_CMODE_SPEECH_AMR: - switch (type) { - case GSM_LCHAN_TCH_F: - return GSM0808_PERM_FR3; - case GSM_LCHAN_TCH_H: - return GSM0808_PERM_HR3; - default: - return 0; - } +#define MODE_TYPE(mode, type) ((mode << 16) | type) + + switch (MODE_TYPE(mode, type)) { + case MODE_TYPE(GSM48_CMODE_SPEECH_V1, GSM_LCHAN_TCH_F): + return GSM0808_PERM_FR1; + case MODE_TYPE(GSM48_CMODE_SPEECH_V1, GSM_LCHAN_TCH_H): + return GSM0808_PERM_HR1; + case MODE_TYPE(GSM48_CMODE_SPEECH_EFR, GSM_LCHAN_TCH_F): + return GSM0808_PERM_FR2; + case MODE_TYPE(GSM48_CMODE_SPEECH_EFR, GSM_LCHAN_TCH_H): + return GSM0808_PERM_HR2; /* (deprecated) */ + case MODE_TYPE(GSM48_CMODE_SPEECH_AMR, GSM_LCHAN_TCH_F): + return GSM0808_PERM_FR3; + case MODE_TYPE(GSM48_CMODE_SPEECH_AMR, GSM_LCHAN_TCH_H): + return GSM0808_PERM_HR3; + case MODE_TYPE(GSM48_CMODE_SPEECH_V4, GSM_LCHAN_TCH_F): + return GSM0808_PERM_FR4; + case MODE_TYPE(GSM48_CMODE_SPEECH_V4, GSM_LCHAN_TCH_H): + return GSM0808_PERM_HR4; + case MODE_TYPE(GSM48_CMODE_SPEECH_V5, GSM_LCHAN_TCH_F): + return GSM0808_PERM_FR5; /* FR only */ + case MODE_TYPE(GSM48_CMODE_SPEECH_V6, GSM_LCHAN_TCH_H): + return GSM0808_PERM_HR6; /* HR only */ default: return 0; } + +#undef MODE_TYPE } /*! Return 3GPP TS 48.008 3.2.2.33 Chosen Channel. */ @@ -230,6 +227,9 @@ case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: case GSM48_CMODE_SPEECH_AMR: + case GSM48_CMODE_SPEECH_V4: + case GSM48_CMODE_SPEECH_V5: + case GSM48_CMODE_SPEECH_V6: channel_mode = 0x9; break; case GSM48_CMODE_SIGN: @@ -247,6 +247,33 @@ case GSM48_CMODE_DATA_3k6: channel_mode = 0xd; break; + case GSM48_CMODE_DATA_29k0: + channel_mode = 0x1; + break; + case GSM48_CMODE_DATA_32k0: + channel_mode = 0x2; + break; + case GSM48_CMODE_DATA_43k5: + channel_mode = 0x3; + break; + case GSM48_CMODE_DATA_43k5_14k5: + channel_mode = 0x4; + break; + case GSM48_CMODE_DATA_29k0_14k5: + channel_mode = 0x5; + break; + case GSM48_CMODE_DATA_43k5_29k0: + channel_mode = 0x6; + break; + case GSM48_CMODE_DATA_14k5_43k5: + channel_mode = 0x7; + break; + case GSM48_CMODE_DATA_14k5_29k0: + channel_mode = 0xa; + break; + case GSM48_CMODE_DATA_29k0_43k5: + channel_mode = 0xf; + break; default: return 0; } @@ -264,6 +291,7 @@ case GSM_LCHAN_TCH_H: channel = 0x9; break; + /* TODO: more than 1 TCHs? */ default: return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I87d977228b1e039c2876941d1c6df1f69d1a54d4 Gerrit-Change-Number: 32026 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[XL] Change in libosmo-gprs[master]: gmm: Initial implementation of GPRS Attach
by pespin 23 Mar '23

23 Mar '23

Attention is currently required from: Hoernchen, laforge, pespin, fixeria. Hello Jenkins Builder, Hoernchen, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32021 to look at the new patch set (#5). Change subject: gmm: Initial implementation of GPRS Attach ...................................................................... gmm: Initial implementation of GPRS Attach This patch contains further work on several areas for the GMM layer, like fixes and improvements in existing primitives, initial FSM implementation, initial Tx and Rx of some GMM messages, etc. Related: OS#5501 Change-Id: I212053b3a3f27ef7d63503c3d5ef08453b2d2056 --- M include/osmocom/gprs/gmm/Makefile.am M include/osmocom/gprs/gmm/gmm.h A include/osmocom/gprs/gmm/gmm_ms_fsm.h A include/osmocom/gprs/gmm/gmm_pdu.h M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h M include/osmocom/gprs/rlcmac/rlcmac_prim.h M libosmo-gprs-gmm.pc.in M src/gmm/Makefile.am M src/gmm/gmm.c A src/gmm/gmm_ms_fsm.c A src/gmm/gmm_pdu.c M src/gmm/gmm_prim.c M src/gmm/misc.c M tests/gmm/Makefile.am M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.err M tests/gmm/gmm_prim_test.ok 18 files changed, 1,875 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/21/32021/5 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I212053b3a3f27ef7d63503c3d5ef08453b2d2056 Gerrit-Change-Number: 32021 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[XL] Change in libosmo-gprs[master]: gmm: Initial implementation of GPRS Attach
by pespin 23 Mar '23

23 Mar '23

Attention is currently required from: Hoernchen, laforge, pespin, fixeria. Hello Jenkins Builder, Hoernchen, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32021 to look at the new patch set (#4). Change subject: gmm: Initial implementation of GPRS Attach ...................................................................... gmm: Initial implementation of GPRS Attach This patch contains further work on several areas for the GMM layer, like fixes and improvements in existing primitives, initial FSM implementation, initial Tx and Rx of some GMM messages, etc. Related: OS#5501 Change-Id: I212053b3a3f27ef7d63503c3d5ef08453b2d2056 --- M include/osmocom/gprs/gmm/Makefile.am M include/osmocom/gprs/gmm/gmm.h A include/osmocom/gprs/gmm/gmm_ms_fsm.h A include/osmocom/gprs/gmm/gmm_pdu.h M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h M include/osmocom/gprs/rlcmac/rlcmac_prim.h M libosmo-gprs-gmm.pc.in M src/gmm/Makefile.am M src/gmm/gmm.c A src/gmm/gmm_ms_fsm.c A src/gmm/gmm_pdu.c M src/gmm/gmm_prim.c M src/gmm/misc.c M tests/gmm/Makefile.am M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.err M tests/gmm/gmm_prim_test.ok 18 files changed, 1,860 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/21/32021/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I212053b3a3f27ef7d63503c3d5ef08453b2d2056 Gerrit-Change-Number: 32021 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[XL] Change in libosmo-gprs[master]: gmm: Initial implementation of GPRS Attach
by pespin 23 Mar '23

23 Mar '23

Attention is currently required from: Hoernchen, laforge, fixeria. Hello Jenkins Builder, Hoernchen, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32021 to look at the new patch set (#3). Change subject: gmm: Initial implementation of GPRS Attach ...................................................................... gmm: Initial implementation of GPRS Attach This patch contains further work on several areas for the GMM layer, like fixes and improvements in existing primitives, initial FSM implementation, initial Tx and Rx of some GMM messages, etc. Related: OS#5501 Change-Id: I212053b3a3f27ef7d63503c3d5ef08453b2d2056 --- M include/osmocom/gprs/gmm/Makefile.am M include/osmocom/gprs/gmm/gmm.h A include/osmocom/gprs/gmm/gmm_ms_fsm.h A include/osmocom/gprs/gmm/gmm_pdu.h M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h M include/osmocom/gprs/rlcmac/rlcmac_prim.h M libosmo-gprs-gmm.pc.in M src/gmm/Makefile.am M src/gmm/gmm.c A src/gmm/gmm_ms_fsm.c A src/gmm/gmm_pdu.c M src/gmm/gmm_prim.c M src/gmm/misc.c M tests/gmm/Makefile.am M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.err M tests/gmm/gmm_prim_test.ok 18 files changed, 1,856 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/21/32021/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I212053b3a3f27ef7d63503c3d5ef08453b2d2056 Gerrit-Change-Number: 32021 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[XL] Change in libosmo-gprs[master]: gmm: Initial implementation of GPRS Attach
by pespin 23 Mar '23

23 Mar '23

Attention is currently required from: Hoernchen, laforge, fixeria. Hello Jenkins Builder, Hoernchen, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32021 to look at the new patch set (#2). Change subject: gmm: Initial implementation of GPRS Attach ...................................................................... gmm: Initial implementation of GPRS Attach This patch contains further work on several areas for the GMM layer, like fixes and improvements in existing primitives, initial FSM implementation, initial Tx and Rx of some GMM messages, etc. Related: OS#5501 Change-Id: I212053b3a3f27ef7d63503c3d5ef08453b2d2056 --- M include/osmocom/gprs/gmm/Makefile.am M include/osmocom/gprs/gmm/gmm.h A include/osmocom/gprs/gmm/gmm_ms_fsm.h A include/osmocom/gprs/gmm/gmm_pdu.h M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h M include/osmocom/gprs/rlcmac/rlcmac_prim.h M libosmo-gprs-gmm.pc.in M src/gmm/Makefile.am M src/gmm/gmm.c A src/gmm/gmm_ms_fsm.c A src/gmm/gmm_pdu.c M src/gmm/gmm_prim.c M src/gmm/misc.c M tests/gmm/Makefile.am M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.err M tests/gmm/gmm_prim_test.ok 18 files changed, 1,856 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/21/32021/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I212053b3a3f27ef7d63503c3d5ef08453b2d2056 Gerrit-Change-Number: 32021 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in osmo-ci[master]: jobs/osmocom-release-manuals: add new job
by osmith 23 Mar '23

23 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/32016 ) Change subject: jobs/osmocom-release-manuals: add new job ...................................................................... jobs/osmocom-release-manuals: add new job Add a jenkins job that automatically builds manuals for release tags, if they don't exist on the server already. Closes: OS#5902 Related: https://downloads.osmocom.org/docs/ Change-Id: I0ecb238660553c3c857e1b310873eca8a8d09dab --- M .gitignore A jobs/osmocom-release-manuals.yml A scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch A scripts/manuals/publish-manuals-for-tags.sh 4 files changed, 513 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index fa28062..3fcbe85 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ _release_tarballs/ _docker_playground _repo_install_test_data/ +_temp_manuals/ scripts/repo-install-test/run-inside-env.sh diff --git a/jobs/osmocom-release-manuals.yml b/jobs/osmocom-release-manuals.yml new file mode 100644 index 0000000..19a8765 --- /dev/null +++ b/jobs/osmocom-release-manuals.yml @@ -0,0 +1,40 @@ +--- +- project: + name: Osmocom-release-manuals + jobs: + - Osmocom-release-manuals + +- job: + name: 'Osmocom-release-manuals' + project-type: freestyle + defaults: global + description: | + Build manuals for all new Osmocom releases + (<a href="https://osmocom.org/issues/5902">OS#5902</a>). + parameters: + - string: + name: BRANCH_CI + description: | + osmo-ci.git branch + default: 'master' + builders: + - shell: | + scripts/manuals/publish-manuals-for-tags.sh + scm: + - git: + branches: + - '$BRANCH_CI' + url: https://gerrit.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + wipe-workspace: true + triggers: + - timed: "@midnight" + publishers: + - email: + notify-every-unstable-build: true + recipients: 'jenkins-notifications(a)lists.osmocom.org' + wrappers: + - ssh-agent-credentials: + users: + - docs_ftp.osmocom.org diff --git a/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch b/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch new file mode 100644 index 0000000..65a4e89 --- /dev/null +++ b/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch @@ -0,0 +1,48 @@ +From ed812f2bd79e7e01c833d90ee279ae4750f82f2f Mon Sep 17 00:00:00 2001 +From: Oliver Smith <osmith(a)sysmocom.de> +Date: Wed, 8 Mar 2023 17:48:17 +0100 +Subject: [PATCH] build/custom-dblatex.sty: remove DRAFT + +This patch will be used when generating manuals for the tagged +releases, so they don't have the draft watermark. + +Related: OS#5902 +Change-Id: Id9a27b01412b0e615638f20fa5e36f5b114a15d8 +--- + build/Makefile.asciidoc.inc | 4 ---- + build/custom-dblatex.sty | 4 ---- + 2 files changed, 8 deletions(-) + +diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc +index 1b7375e..9a9e829 100644 +--- a/build/Makefile.asciidoc.inc ++++ b/build/Makefile.asciidoc.inc +@@ -69,10 +69,6 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ + + # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} + # in $(OSMO_GSM_MANUALS_DIR). +- @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ +- NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ +- and remove three lines starting with '% \"DRAFT\" on first page'\n" \ +- || true + TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ + a2x -vv $(A2X_OPTS) $(notdir $<) + +diff --git a/build/custom-dblatex.sty b/build/custom-dblatex.sty +index 16931ad..0d53bb1 100644 +--- a/build/custom-dblatex.sty ++++ b/build/custom-dblatex.sty +@@ -20,10 +20,6 @@ + \usepackage{alltt} + \usepackage{upquote} + +-% "DRAFT" on first page +-\definecolor{LtGrey}{rgb}{0.875,0.875,0.875} +-\AddToShipoutPicture*{ \AtTextCenter{ \makebox(0,0)[c]{\resizebox{\textwidth}{!}{ \rotatebox{45}{\textsf{\textbf{\color{LtGrey}DRAFT}}}}} } } +- + \def\Company{sysmocom - s.f.m.c. GmbH} + + \def\DBKcover{ +-- +2.34.1 + diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh new file mode 100755 index 0000000..9d453b8 --- /dev/null +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -0,0 +1,410 @@ +#!/bin/sh -e +. "$(dirname "$0")/../common.sh" +OSMO_CI_DIR="$(realpath $(dirname "$0")/../..)" +TEMP="$OSMO_CI_DIR/_temp_manuals" +WEB_PATH="/downloads/home/docs/web-files" +SSH_COMMAND="ssh -o UserKnownHostsFile=$TEMP/src/osmo-gsm-manuals/build/known_hosts -p 48" +DOCKER_IMAGE="$USER/debian-bullseye-jenkins" +LOG_PREFIX="::" + +# Releases that were made before shared osmo-gsm-manuals, or where build fails +# for other reasons. +TAGS_IGNORE=" + openbsc:0.9.0, + openbsc:0.9.1, + openbsc:0.9.2, + openbsc:0.9.3, + openbsc:0.9.4, + openbsc:0.9.5, + openbsc:0.9.6, + openbsc:0.9.8, + openbsc:0.9.9, + openbsc:0.9.10, + openbsc:0.9.11, + openbsc:0.9.12, + openbsc:0.9.13, + openbsc:0.9.14, + openbsc:0.9.15, + openbsc:0.9.16, + openbsc:0.10.0, + openbsc:0.10.1, + openbsc:0.11.0, + openbsc:0.12.0, + openbsc:0.13.0, + openbsc:0.14.0, + openbsc:0.15.0, + openbsc:1.0.0, + openbsc:1.1.0, + + osmo-bsc:1.0.1, + osmo-bsc:1.1.0, + osmo-bsc:1.1.1, + osmo-bsc:1.1.2, + osmo-bsc:1.2.0, + osmo-bsc:1.2.1, + osmo-bsc:1.2.2, + osmo-bsc:1.3.0, + osmo-bsc:1.4.0, + osmo-bsc:1.4.1, + osmo-bsc:1.5.0, + osmo-bsc:1.6.0, + + osmo-bts:0.0.1, + osmo-bts:0.1.0, + osmo-bts:0.2.0, + osmo-bts:0.3.0, + osmo-bts:0.4.0, + osmo-bts:0.6.0, + osmo-bts:0.7.0, + osmo-bts:0.8.0, + osmo-bts:0.8.1, + osmo-bts:1.0.0, + osmo-bts:1.0.1, + osmo-bts:1.1.0, + osmo-bts:1.2.0, + + osmo-e1d:0.0.1, + osmo-e1d:0.1.0, + osmo-e1d:0.1.1, + osmo-e1d:0.2.0, + osmo-e1d:0.2.1, + osmo-e1d:0.2.2, + osmo-e1d:0.3.0, + osmo-e1d:0.4.0, + + osmo-ggsn:1.0.0, + osmo-ggsn:1.1.0, + osmo-ggsn:1.2.0, + osmo-ggsn:1.2.1, + osmo-ggsn:1.2.2, + + osmo-gsm-tester:0.1, + + osmo-hlr:0.0.1, + osmo-hlr:0.1.0, + osmo-hlr:0.2.0, + osmo-hlr:0.2.1, + + osmo-mgw:1.0.1, + osmo-mgw:1.0.2, + osmo-mgw:1.1.0, + osmo-mgw:1.2.0, + osmo-mgw:1.2.1, + osmo-mgw:1.3.0, + osmo-mgw:1.4.0, + + osmo-msc:1.0.1, + osmo-msc:1.1.0, + osmo-msc:1.1.1, + osmo-msc:1.1.2, + osmo-msc:1.2.0, + osmo-msc:1.3.0, + osmo-msc:1.3.1, + osmo-msc:1.4.0, + osmo-msc:1.5.0, + osmo-msc:1.6.0, + osmo-msc:1.6.1, + osmo-msc:1.6.2, + osmo-msc:1.6.3, + + osmo-pcap:0.0.1, + osmo-pcap:0.0.2, + osmo-pcap:0.0.3, + osmo-pcap:0.0.4, + osmo-pcap:0.0.5, + osmo-pcap:0.0.6, + osmo-pcap:0.0.7, + osmo-pcap:0.0.8, + osmo-pcap:0.0.9, + osmo-pcap:0.0.10, + osmo-pcap:0.0.11, + osmo-pcap:0.1.0, + osmo-pcap:0.1.1, + osmo-pcap:0.1.2, + osmo-pcap:0.1.3, + + osmo-pcu:0.1, + osmo-pcu:0.1.0, + osmo-pcu:0.2, + osmo-pcu:0.2.0, + osmo-pcu:0.4.0, + osmo-pcu:0.5.0, + osmo-pcu:0.5.1, + + osmo-remsim:0.0, + osmo-remsim:0.1.0, + osmo-remsim:0.2.0, + osmo-remsim:0.2.1, + + osmo-sgsn:0.10.0, + osmo-sgsn:0.10.1, + osmo-sgsn:0.11.0, + osmo-sgsn:0.12.0, + osmo-sgsn:0.13.0, + osmo-sgsn:0.14.0, + osmo-sgsn:0.15.0, + osmo-sgsn:0.9.0, + osmo-sgsn:0.9.1, + osmo-sgsn:0.9.10, + osmo-sgsn:0.9.11, + osmo-sgsn:0.9.12, + osmo-sgsn:0.9.13, + osmo-sgsn:0.9.13+deb1, + osmo-sgsn:0.9.14, + osmo-sgsn:0.9.14-onwaves1, + osmo-sgsn:0.9.15, + osmo-sgsn:0.9.16, + osmo-sgsn:0.9.2, + osmo-sgsn:0.9.3, + osmo-sgsn:0.9.4, + osmo-sgsn:0.9.5, + osmo-sgsn:0.9.6, + osmo-sgsn:0.9.8, + osmo-sgsn:0.9.9, + osmo-sgsn:1.0.1, + osmo-sgsn:1.1.0, + osmo-sgsn:1.10.0, + osmo-sgsn:1.2.0, + osmo-sgsn:1.3.0, + osmo-sgsn:1.4.0, + osmo-sgsn:1.4.1, + osmo-sgsn:1.5.0, + osmo-sgsn:1.6.0, + osmo-sgsn:1.6.1, + + osmo-sip-connector:0.0.1, + osmo-sip-connector:1.1.0, + osmo-sip-connector:1.1.1, + + libosmo-sccp:0.0.1, + libosmo-sccp:0.0.2, + libosmo-sccp:0.0.3, + libosmo-sccp:0.0.4, + libosmo-sccp:0.0.5, + libosmo-sccp:0.0.5.1, + libosmo-sccp:0.0.6, + libosmo-sccp:0.0.6.1, + libosmo-sccp:0.0.6.2, + libosmo-sccp:0.0.6.3, + libosmo-sccp:0.10.0, + libosmo-sccp:0.7.0, + libosmo-sccp:0.8.0, + libosmo-sccp:0.8.1, + libosmo-sccp:0.9.0, + libosmo-sccp:1.0.0, + libosmo-sccp:1.1.0, + libosmo-sccp:1.2.0, + + osmo-trx:0.2.0, + osmo-trx:0.3.0, + osmo-trx:0.4.0, + + pysim:1.0, +" + +mkdir -p \ + "$TEMP" \ + "$TEMP/src" + +check_ssh_auth_sock() { + if [ -z "$SSH_AUTH_SOCK" ]; then + echo "ERROR: SSH_AUTH_SOCK is not set" + exit 1 + fi +} + +# $1: docs dir +get_repo_name_from_docs_dir() { + case "$1" in + osmo-stp) + echo "libosmo-sccp" + ;; + *) + echo "$1" + ;; + esac +} + +# $1: repo name +get_docs_dir_from_repo_name() { + case "$1" in + libosmo-sccp) + echo "osmo-stp" + ;; + *) + echo "$1" + ;; + esac +} + + +# $1: path on server, e.g. "/docs/osmo-bsc" +get_server_ls() { + local dir="$1" + local out="$TEMP/ls$(echo "$dir" | tr / _)" + + echo "$LOG_PREFIX Listing files on server: $dir" + + if [ -e "$out" ]; then + echo "Skipped, file exists: $out" + return + fi + + dir="$(echo "$dir" | sed "s.^/docs.$WEB_PATH.")" + $SSH_COMMAND docs(a)ftp.osmocom.org "ls -1 $dir" >"$out" +} + +# $1: repository +get_git_tags() { + local repo="$1" + local out="$TEMP/git_tags_$repo" + + echo "$LOG_PREFIX Getting git tags" + + if [ -e "$out" ]; then + echo "Skipped, file exists: $out" + return + fi + + osmo_git_last_tags "$repo" "all" >"$out" +} + +# $1: docs dir +# $2: tag +manuals_exist() { + local docs_dir="$1" + local tag="$2" + + grep -q "^$tag$" "$TEMP"/ls_docs_"$docs_dir" +} + +# $1: repository +# $2: tag +is_tag_ignored() { + local repo="$1" + local tag="$2" + + case "$TAGS_IGNORE" in + *"$repo:$tag,"*) + return 0 + ;; + esac + + return 1 +} + +# $1: repository +# $2: tag +clone_repo() { + local repo="$1" + local tag="$2" + local gitdir="$TEMP/src/$repo" + + if ! [ -d "$gitdir" ]; then + local url="$(osmo_git_clone_url "$repo")" + echo "$LOG_PREFIX Cloning $url" + git -C "$TEMP/src" clone "$url" "$repo" + fi + + echo "$LOG_PREFIX Checkout $tag" + cd "$gitdir" + git reset --hard HEAD + git checkout "$tag" + git submodule update --init + git clean -dxf + + # Fix depends on packages that don't exist anymore + sed -i 's/dh-systemd $.*$,//g' debian/control + sed -i 's/python-minimal,//g' debian/control +} + +# $1: repository +# $2: tag +build_publish_manuals() { + local repo="$1" + local tag="$2" + echo "$LOG_PREFIX Building manuals" + + if ! docker run \ + --rm \ + -e "BUILD_RELEASE=1" \ + -e "DEBIAN_FRONTEND=noninteractive" \ + -e "OSMO_GSM_MANUALS_DIR=/opt/osmo-gsm-manuals" \ + -e "OSMO_REPOSITORY=$(get_docs_dir_from_repo_name "$repo")" \ + -e "PUBLISH_REF=$tag" \ + -e "SSH_AUTH_SOCK=/ssh-agent" \ + -v "$OSMO_CI_DIR/scripts/manuals:/manuals" \ + -v "$TEMP/src/$repo/:/build" \ + -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ + "$DOCKER_IMAGE" \ + sh -ex -c " + apt-get update + + # Install dependencies + case $repo in + *) + apt-get -y build-dep /build + ;; + esac + + # Remove DRAFT in osmo-gsm-manuals + cd /opt/osmo-gsm-manuals/ + patch -p1 < /manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch + + # Build manuals + cd /build + case $repo in + openbsc) + for dir in manuals/*/; do + su build -c \"make -C \$dir\" + done + ;; + *) + su build -c \"autoreconf -fi\" + su build -c \"./configure --enable-manuals\" + su build -c \"make -j$(nproc)\" + ;; + esac + + + # Publish manuals + case $repo in + openbsc) + for dir in manuals/*/; do + su build -c \"make -C \$dir publish\" + done + ;; + *) + su build -c \"make -C doc/manuals publish\" + ;; + esac + "; then + echo "$LOG_PREFIX Building manuals failed!" + exit 1 + fi +} + +check_ssh_auth_sock +get_server_ls "/docs" + +for docs_dir in $(cat "$TEMP"/ls_docs); do + repo="$(get_repo_name_from_docs_dir "$docs_dir")" + LOG_PREFIX=":: ($repo)" + get_server_ls "/docs/$docs_dir" + get_git_tags "$repo" + + echo "$LOG_PREFIX Building missing manuals" + for tag in $(cat "$TEMP"/git_tags_"$repo"); do + LOG_PREFIX=":: ($repo, $tag)" + if manuals_exist "$docs_dir" "$tag"; then + echo "$LOG_PREFIX: skipping, manuals exist" + continue + elif is_tag_ignored "$repo" "$tag"; then + echo "$LOG_PREFIX: skipping, tag is ignored" + continue + fi + + clone_repo "$repo" "$tag" + build_publish_manuals "$repo" "$tag" + done +done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0ecb238660553c3c857e1b310873eca8a8d09dab Gerrit-Change-Number: 32016 Gerrit-PatchSet: 3 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

1 0

[L] Change in osmo-ci[master]: jobs/osmocom-release-manuals: add new job
by osmith 23 Mar '23

23 Mar '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/32016 ) Change subject: jobs/osmocom-release-manuals: add new job ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0ecb238660553c3c857e1b310873eca8a8d09dab Gerrit-Change-Number: 32016 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-Comment-Date: Thu, 23 Mar 2023 10:48:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: layer23: modem: Test GMM layer through VTY
by pespin 23 Mar '23

23 Mar '23

Attention is currently required from: Hoernchen, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32022 ) Change subject: layer23: modem: Test GMM layer through VTY ...................................................................... Patch Set 1: (4 comments) File src/host/layer23/src/modem/gmm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/32022/comment/3079976d_7a585119 PS1, Line 92: rc = 1; > Just do `return 1` straight away, `rc` is not really needed? It's still handy to check returned value while debugging. I see no real problem with this. File src/host/layer23/src/modem/llc.c: https://gerrit.osmocom.org/c/osmocom-bb/+/32022/comment/2f199d27_3409bbe9 PS1, Line 62: rc = osmo_gprs_gmm_prim_llc_lower_up(llc_prim); > Same here, you're assigning `rc` but then unconditionally overwriting it? Good for debugging, so you can print rc here. File src/host/layer23/src/modem/vty.c: https://gerrit.osmocom.org/c/osmocom-bb/+/32022/comment/10eb59d5_42a4360e PS1, Line 159: LLC_CMDG_DESC > copy-paste, you should add `GMM_CMDG_DESC`. Ack https://gerrit.osmocom.org/c/osmocom-bb/+/32022/comment/04d91535_effa0781 PS1, Line 161: "Hard-coded GMM Attach Request (SAPI=GMM, TLLI=0xe1c5d364)\n") > Something is wrong here, what part of the command this docstring corresponds to? Ack -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iba0663075468670a29aceafe5196cae3cab050eb Gerrit-Change-Number: 32022 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Mar 2023 10:37:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in osmo-ci[master]: jobs/osmocom-release-manuals: add new job
by pespin 23 Mar '23

23 Mar '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/32016 ) Change subject: jobs/osmocom-release-manuals: add new job ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0ecb238660553c3c857e1b310873eca8a8d09dab Gerrit-Change-Number: 32016 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Mar 2023 10:35:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0