July 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-gsm-manuals[master]: Bump version: 1.5.0.13-b3b2 → 1.6.0

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/37559?usp=email ) Change subject: Bump version: 1.5.0.13-b3b2 → 1.6.0 ...................................................................... Bump version: 1.5.0.13-b3b2 → 1.6.0 Change-Id: Ic9f5065885d7d607380a60932dac59b38c54e800 --- M debian/changelog 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index bcd956b..5692469 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +osmo-gsm-manuals-dev (1.6.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * sigtran: Document SCTP INIT VTY parameters + * Update spec reference s/TS 04.08/TS 24.008/ + * gsup.adoc: Update spec reference s/TS 09.60/TS 29.060/ + * gsup: Convert PDP-Type IE to PDP-Address IE + * gsup.adoc: Fix typo + * gsup.adoc: Fix Authentication Info message naming in table + * gsup.adoc: Add links to section of each message type in table + * gsup.adoc: Add conditional 'PDP Info' IE to Auth Info Req + * gsup: Introduce a new PCO IE + * gsup: Document ePDG Tunnel Req/Res/Err + + [ Oliver Smith ] + * build/Makefile.asciidoc: fix GIT_DATE + * Cosmetic: build/Makefile.asciidoc: remove comments + + [ Neels Hofmeyr ] + * add static SS7 routing example to cs7-config.adoc + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 24 Jul 2024 10:32:07 +0200 + osmo-gsm-manuals-dev (1.5.0) unstable; urgency=medium [ Max ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/37559?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic9f5065885d7d607380a60932dac59b38c54e800 Gerrit-Change-Number: 37559 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in libosmo-pfcp[master]: Bump version: 0.3.0.5-1ffb-dirty → 0.4.0

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/37570?usp=email ) Change subject: Bump version: 0.3.0.5-1ffb-dirty → 0.4.0 ...................................................................... Patch Set 2: (1 comment) File src/libosmo-pfcp/Makefile.am: https://gerrit.osmocom.org/c/libosmo-pfcp/+/37570/comment/fbf4c18f_7e625ed3 PS1, Line 37: LIBVERSION=3:0:2 > I don't see any change in ABI, why not 3:0:3? yes, should be 3:0:3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/37570?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Idfb94c78b71497602102bfd13e139b090bda65ae Gerrit-Change-Number: 37570 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jul 2024 10:59:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[S] Change in libosmo-pfcp[master]: Bump version: 0.3.0.5-1ffb-dirty → 0.4.0

by osmith

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/37570?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified-1 by Jenkins Builder Change subject: Bump version: 0.3.0.5-1ffb-dirty → 0.4.0 ...................................................................... Bump version: 0.3.0.5-1ffb-dirty → 0.4.0 Change-Id: Idfb94c78b71497602102bfd13e139b090bda65ae --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmo-pfcp1.install M src/libosmo-pfcp/Makefile.am 5 files changed, 33 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/70/37570/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/37570?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Idfb94c78b71497602102bfd13e139b090bda65ae Gerrit-Change-Number: 37570 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months, 1 week

1
0
0 0

[M] Change in libosmo-abis[master]: Bump version: 1.5.1.29-54db → 1.6.0

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37568?usp=email ) Change subject: Bump version: 1.5.1.29-54db → 1.6.0 ...................................................................... Patch Set 3: (1 comment) File src/Makefile.am: https://gerrit.osmocom.org/c/libosmo-abis/+/37568/comment/783fba4a_b8670c73 PS2, Line 4: ABIS_LIBVERSION=13:1:0 > $ git diff 1.5.1..master -- include/osmocom/abis/ […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1a47ddac444eb731440bf7a796e9570933859873 Gerrit-Change-Number: 37568 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jul 2024 10:56:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[M] Change in libosmo-abis[master]: Bump version: 1.5.1.29-54db → 1.6.0

by osmith

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/37568?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified-1 by Jenkins Builder Change subject: Bump version: 1.5.1.29-54db → 1.6.0 ...................................................................... Bump version: 1.5.1.29-54db → 1.6.0 Change-Id: I1a47ddac444eb731440bf7a796e9570933859873 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmotrau10.install M src/Makefile.am 6 files changed, 67 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/68/37568/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1a47ddac444eb731440bf7a796e9570933859873 Gerrit-Change-Number: 37568 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months, 1 week

1
0
0 0

[L] Change in libosmocore[master]: Bump version: 1.9.0.210-14405 → 1.10.0

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/37565?usp=email ) Change subject: Bump version: 1.9.0.210-14405 → 1.10.0 ...................................................................... Patch Set 2: (1 comment) File src/vty/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/37565/comment/dea68a16_442b8cc2 PS2, Line 4: LIBVERSION=14:0:1 > $ git diff 1.9.0..master -- include/osmocom/vty/ […] Right! (I changed it to 14:0:1 because `DEFUN(show_fsm_state_graph, show_fsm_state_graph_cmd,` got added but now I realize this is not an interface) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37565?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id64650ce17aa8ae5fbd6653c98c1dc3639939da5 Gerrit-Change-Number: 37565 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jul 2024 10:50:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[L] Change in libosmocore[master]: Bump version: 1.9.0.210-14405 → 1.10.0

by osmith

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/37565?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: Bump version: 1.9.0.210-14405 → 1.10.0 ...................................................................... Bump version: 1.9.0.210-14405 → 1.10.0 Change-Id: Id64650ce17aa8ae5fbd6653c98c1dc3639939da5 --- M TODO-RELEASE M contrib/libosmocore.spec.in M debian/changelog M debian/control R debian/libosmocore22.install M src/codec/Makefile.am M src/coding/Makefile.am M src/core/Makefile.am M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/isdn/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 14 files changed, 279 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/37565/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37565?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id64650ce17aa8ae5fbd6653c98c1dc3639939da5 Gerrit-Change-Number: 37565 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: osmo-release: don't default to REL=patch

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/37560?usp=email ) Change subject: osmo-release: don't default to REL=patch ...................................................................... osmo-release: don't default to REL=patch Make this script easier to use by showing the user the possible values for REL and other environment variables when REL is missing instead of assuming that they want REL=patch. Change-Id: I3041cbace651cd477e0aa8abe56ce6b9bf1b011c --- M osmo-release.mk M osmo-release.sh 2 files changed, 24 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmo-release.mk b/osmo-release.mk index 01285b1..cd83397 100644 --- a/osmo-release.mk +++ b/osmo-release.mk @@ -1,9 +1,2 @@ -ifndef REL - REL := patch -endif - release: -ifeq ($(origin REL), file) - @echo "No REL value specified, defaulting to 'patch' release" -endif @osmo-release.sh $(VERSION) $(REL) diff --git a/osmo-release.sh b/osmo-release.sh index e947fe4..8b3bbd1 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -3,8 +3,17 @@ REL=$2 if [ "z$REL" = "z" ]; then - echo "No REL value specified, defaulting to 'patch' release" - REL="patch" + echo "usage: make REL=patch|minor|major release" + echo + echo "optional environment variables:" + echo " DRY_RUN=1 run checks but make no modifications" + echo " ALLOW_NO_LIBVERSION_CHANGE=1 skip LIBVERSION in Makefile.am fchecks" + echo " ALLOW_NO_LIBVERSION_DEB_MATCH=1 skip LIBVERSION in debian packaging checks" + echo " ALLOW_NO_LIBVERSION_RPM_MATCH=1 skip LIBVERSION in rpm packaging checks" + echo + echo "See also:" + echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release" + exit 1 fi ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37560?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3041cbace651cd477e0aa8abe56ce6b9bf1b011c Gerrit-Change-Number: 37560 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

[M] Change in libosmocore[master]: osmo-release: use colored output

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/37562?usp=email ) Change subject: osmo-release: use colored output ...................................................................... osmo-release: use colored output Make it easier to see OK, ERROR and (especially since these are non-fatal) the WARN lines. Change-Id: If31b1185a9b138c07ebf14a3d2928f3376b7cb9e --- M osmo-release.sh 1 file changed, 57 insertions(+), 28 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-release.sh b/osmo-release.sh index 8b3bbd1..9edfccd 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -22,6 +22,23 @@ # Test stuff but don't modify stuff: DRY_RUN="${DRY_RUN:-0}" +RESET="\033[1;0m" +RED="\033[1;31m" +GREEN="\033[1;32m" +YELLOW="\033[1;33m" + +ok() { + echo "${GREEN}OK:${RESET} $@" +} + +warn() { + echo "${YELLOW}WARN:${RESET} $@" +} + +error() { + echo "${RED}ERROR:${RESET} $@" +} + libversion_to_lib_major() { libversion="$1" current="$(echo "$libversion" | cut -d ":" -f 1)" @@ -52,16 +69,16 @@ if [ "z$debctrl_match_count" != "z0" ]; then #echo "Dependency <$dep, $ver> from configure.ac matched in debian/control! ($debctrl_match_count)" if [ "z$debctrl_match_count" != "z1" ]; then - echo "WARN: configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!" + warn "configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!" else # 1 match: parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | tr -d "\t" | sed "s/>=/ /g") debctrl_dep=$(echo "$parsed_match" | cut -d " " -f 1 | sed "s/-dev//g") debctrl_ver=$(echo "$parsed_match" | cut -d " " -f 2) if [ "z$dep" != "z$debctrl_dep" ] || [ "z$ver" != "z$debctrl_ver" ]; then - echo "ERROR: configure.ac <$dep, $ver> does NOT match debian/control <$debctrl_dep, $debctrl_ver>!" + error "configure.ac <$dep, $ver> does NOT match debian/control <$debctrl_dep, $debctrl_ver>!" return_error=1 #else - # echo "OK: configure.ac <$dep, $ver> matches debian/control <$debctrl_dep, $debctrl_ver>" + # ok "configure.ac <$dep, $ver> matches debian/control <$debctrl_dep, $debctrl_ver>" fi fi fi @@ -73,10 +90,10 @@ # catch and forward exit from pipe subshell "while read": if [ $? -ne 0 ]; then - echo "ERROR: exiting due to previous errors" + error "exiting due to previous errors" exit 1 fi - echo "OK: dependency specific versions in configure.ac and debian/control match" + ok "dependency specific versions in configure.ac and debian/control match" } # Make sure that depedency requirement versions match in configure.ac vs contrib/*.spec.in. @@ -97,16 +114,16 @@ if [ "z$rpmspecin_match_count" != "z0" ]; then #echo "Dependency <$dep, $ver> from configure.ac matched in contrib/*.spec.in! ($rpmspecin_match_count)" if [ "z$rpmspecin_match_count" != "z1" ]; then - echo "WARN: configure.ac <$dep, $ver> matches contrib/*.spec.in $rpmspecin_match_count times, manual check required!" + warn "configure.ac <$dep, $ver> matches contrib/*.spec.in $rpmspecin_match_count times, manual check required!" else # 1 match: parsed_match=$(echo "$rpmspecin_match" | tr -d "(" | tr -d ")" | tr -d ":" | tr -d " " | tr -d "\t" | sed "s/BuildRequires//g" | sed "s/pkgconfig//g" |sed "s/>=/ /g") rpmspecin_dep=$(echo "$parsed_match" | cut -d " " -f 1) rpmspecin_ver=$(echo "$parsed_match" | cut -d " " -f 2) if [ "z$dep" != "z$rpmspecin_dep" ] || [ "z$ver" != "z$rpmspecin_ver" ]; then - echo "ERROR: configure.ac <$dep, $ver> does NOT match contrib/*.spec.in <$rpmspecin_dep, $rpmspecin_ver>!" + error "configure.ac <$dep, $ver> does NOT match contrib/*.spec.in <$rpmspecin_dep, $rpmspecin_ver>!" return_error=1 #else - # echo "OK: configure.ac <$dep, $ver> matches contrib/*.spec.in <$debctrl_dep, $debctrl_ver>" + # ok "configure.ac <$dep, $ver> matches contrib/*.spec.in <$debctrl_dep, $debctrl_ver>" fi fi fi @@ -118,10 +135,10 @@ # catch and forward exit from pipe subshell "while read": if [ $? -ne 0 ]; then - echo "ERROR: exiting due to previous errors" + error "exiting due to previous errors" exit 1 fi - echo "OK: dependency specific versions in configure.ac and contrib/*.spec.in match" + ok "dependency specific versions in configure.ac and contrib/*.spec.in match" } # Make sure that patches under debian/patches/ apply: @@ -132,10 +149,10 @@ for patch in ${GIT_TOPDIR}/debian/patches/*.patch; do git apply --check $patch if [ $? -ne 0 ]; then - echo "ERROR: patch no longer applies! $patch" + error "patch no longer applies! $patch" exit 1 else - echo "OK: patch applies: $patch" + ok "patch applies: $patch" fi done } @@ -146,34 +163,34 @@ major="$(libversion_to_lib_major "$libversion")" file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" if [ "z$file_matches" = "z0" ]; then - echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" + error "Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" exit 1 elif [ "z$file_matches" = "z1" ]; then - echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion" + ok "Found matching debian/lib*$major.install for LIBVERSION=$libversion" else - echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" + warn "Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" fi control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" if [ "z$control_matches" = "z0" ]; then - echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" + error "Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" exit 1 elif [ "z$control_matches" = "z1" ]; then - echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" + ok "Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" else - echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" + warn "Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" fi dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)" dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)" if [ "z$dhstrip_lib_total" != "z0" ]; then if [ "z$dhstrip_lib_matches" = "z0" ] ; then - echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion" + error "Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion" exit 1 elif [ "z$dhstrip_lib_total" = "z1" ]; then - echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion" + ok "Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion" else - echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!" + warn "Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!" fi fi done @@ -196,22 +213,22 @@ control_matches="$(grep -e "%files" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "lib" | grep "$major$" | wc -l)" if [ "z$control_matches" = "z0" ]; then - echo "ERROR: Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion" + error "Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion" exit 1 elif [ "z$control_matches" = "z1" ]; then - echo "OK: Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion" + ok "Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion" else - echo "WARN: Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!" + warn "Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!" fi control_matches="$(grep -e "_libdir" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "/lib" | grep "so.$major" | wc -l)" if [ "z$control_matches" = "z0" ]; then - echo "ERROR: Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion" + error "Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion" exit 1 elif [ "z$control_matches" = "z1" ]; then - echo "OK: Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion" + ok "Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion" else - echo "WARN: Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!" + warn "Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!" fi done # catch and forward exit from pipe subshell "while read": @@ -244,7 +261,7 @@ if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then - echo "ERROR: Before releasing, please modify some of the libversions:" + error "Before releasing, please modify some of the libversions:" for l in $LIBVERS; do echo " $l"; done echo "After making changes, add modified file(s) to the index using git-add." echo "You should NOT be doing this unless you've read and understood following article:" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37562?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If31b1185a9b138c07ebf14a3d2928f3376b7cb9e Gerrit-Change-Number: 37562 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: osmo-release: use script from PWD if available

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/37561?usp=email ) Change subject: osmo-release: use script from PWD if available ...................................................................... osmo-release: use script from PWD if available When running "make release" inside a libosmocore git tree, use the osmo-release.sh from the current tree instead of the version that has been previously installed into PATH. Change-Id: I2c3ccc12771c8bbdd0769389cceb608ed92e1525 --- M osmo-release.mk 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmo-release.mk b/osmo-release.mk index cd83397..a28372c 100644 --- a/osmo-release.mk +++ b/osmo-release.mk @@ -1,2 +1,2 @@ release: - @osmo-release.sh $(VERSION) $(REL) + @PATH="$$PWD:$$PATH" osmo-release.sh $(VERSION) $(REL) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37561?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c3ccc12771c8bbdd0769389cceb608ed92e1525 Gerrit-Change-Number: 37561 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024