- gerrit-log - lists.osmocom.org

[M] Change in osmo-e1d[master]: contrib: remove rpm spec file
by osmith 08 May '24

08 May '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/36734?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: contrib: remove rpm spec file ...................................................................... contrib: remove rpm spec file Related: https://osmocom.org/news/255 Related: OS#6446 Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30 --- M configure.ac M contrib/Makefile.am D contrib/osmo-e1d.spec.in 3 files changed, 11 insertions(+), 142 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/34/36734/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30 Gerrit-Change-Number: 36734 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-e1-recorder[master]: contrib: remove rpm spec file
by osmith 08 May '24

08 May '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/36735?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: contrib: remove rpm spec file ...................................................................... contrib: remove rpm spec file Related: https://osmocom.org/news/255 Related: OS#6446 Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30 --- M Makefile.am M configure.ac D contrib/osmo-e1-recorder.spec.in 3 files changed, 12 insertions(+), 70 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/35/36735/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/36735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I7cfe55fa2fda43da4eaa1e1b8d40b31d1c8aaf30 Gerrit-Change-Number: 36735 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libusrp[master]: contrib: remove rpm spec file
by osmith 08 May '24

08 May '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libusrp/+/36729?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: contrib: remove rpm spec file ...................................................................... contrib: remove rpm spec file Related: https://osmocom.org/news/255 Related: OS#6446 Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9 --- M Makefile.am M configure.ac D contrib/libusrp.spec.in 3 files changed, 12 insertions(+), 121 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/29/36729/2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/36729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9 Gerrit-Change-Number: 36729 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libsmpp34[master]: contrib: remove rpm spec file
by osmith 08 May '24

08 May '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libsmpp34/+/36728?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: contrib: remove rpm spec file ...................................................................... contrib: remove rpm spec file Related: https://osmocom.org/news/255 Related: OS#6446 Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9 --- M Makefile.am M configure.ac D contrib/libsmpp34.spec.in 3 files changed, 12 insertions(+), 89 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/28/36728/2 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/36728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ia10ffce57cf0c067d370f0f381435cdd439e3dd9 Gerrit-Change-Number: 36728 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-netif[master]: contrib: remove rpm spec file
by osmith 08 May '24

08 May '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: contrib: remove rpm spec file ...................................................................... contrib: remove rpm spec file Related: https://osmocom.org/news/255 Related: OS#6446 Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc --- M Makefile.am M configure.ac D contrib/libosmo-netif.spec.in 3 files changed, 12 insertions(+), 87 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/25/36725/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36725 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-gprs[master]: contrib: remove rpm spec file
by osmith 08 May '24

08 May '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/36724?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: contrib: remove rpm spec file ...................................................................... contrib: remove rpm spec file Related: https://osmocom.org/news/255 Related: OS#6446 Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc --- M Makefile.am M configure.ac D contrib/libosmo-gprs.spec.in 3 files changed, 12 insertions(+), 232 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/24/36724/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/36724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36724 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-uecups[master]: contrib: remove rpm spec file
by osmith 08 May '24

08 May '24

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/36750?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: contrib: remove rpm spec file ...................................................................... contrib: remove rpm spec file Related: https://osmocom.org/news/255 Related: OS#6446 Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547 --- M Makefile.am M configure.ac D contrib/osmo-uecups.spec.in 3 files changed, 12 insertions(+), 85 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/50/36750/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/36750?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547 Gerrit-Change-Number: 36750 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ci[master]: jobs: gerrit: build osmo-pcap + dep for centos7
by osmith 08 May '24

08 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36718?usp=email ) Change subject: jobs: gerrit: build osmo-pcap + dep for centos7 ...................................................................... jobs: gerrit: build osmo-pcap + dep for centos7 We are about to remove the rpm spec files for almost all Osmocom git repositories. The only two git repositories where we still need them, because we have a customer using them on centos 7, are libosmocore and osmo-pcap (SYS#6760). Add CI to ensure that these still build fine, and that we don't remove these by mistake. Related: OS#6446 Change-Id: I4d4a67c053ed29811c504158d1ef49430880ad4f --- M jobs/gerrit-verifications.yml M scripts/obs/build_binpkg.py M scripts/obs/data/build_binpkg.Dockerfile M scripts/obs/data/build_rpm.sh M scripts/obs/lib/config.py 5 files changed, 57 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 607e909..1a5d656 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -121,6 +121,7 @@ a1: !!python/tuple [arm-none-eabi, amd64] combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins_arch.sh "$arch"' + pipeline_binpkgs: "centos:7 debian:10 debian:12" # centos7: SYS#6760 - libsmpp34 @@ -258,7 +259,8 @@ -e WITH_MANUALS="$WITH_MANUALS" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - - osmo-pcap + - osmo-pcap: + pipeline_binpkgs: "centos:7 debian:10 debian:12" # centos7: SYS#6760 - osmo-pcu: slave_axis: !!python/tuple [osmocom-gerrit, rpi4-raspbian11] diff --git a/scripts/obs/build_binpkg.py b/scripts/obs/build_binpkg.py index ae2fe53..5c8cd01 100755 --- a/scripts/obs/build_binpkg.py +++ b/scripts/obs/build_binpkg.py @@ -69,6 +69,7 @@ env = {"JOBS": str(args.jobs), "PACKAGE": args.package, "BUILDUSER": os.environ["USER"], + "DISTRO": args.docker, "PACKAGEFORMAT": "deb"} docker_args = [] diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index 55bfe0c..b29d8f9 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -51,6 +51,24 @@ yum config-manager --set-enabled powertools && \ su user -c rpmdev-setuptree \ ;; \ + centos:7) \ + yum -y install \ + autoconf \ + automake \ + binutils \ + dnf-utils \ + gcc \ + gcc-c++ \ + glibc-devel \ + iproute \ + libtool \ + make \ + redhat-rpm-config \ + rpm-build \ + rpmdevtools \ + wget && \ + su user -c rpmdev-setuptree \ + ;; \ esac # Add master repository, where packages immediately get updated after merging @@ -71,7 +89,7 @@ echo "deb https://downloads.osmocom.org/packages/osmocom:/$FEED/xUbuntu_$VERSION/ ./" \ > /etc/apt/sources.list.d/osmocom-$FEED.list \ ;; \ - almalinux:*) \ + almalinux:*|centos:*) \ { echo "[network_osmocom_$FEED]"; \ echo "name=osmocom:$FEED"; \ echo "type=rpm-md"; \ diff --git a/scripts/obs/data/build_rpm.sh b/scripts/obs/data/build_rpm.sh index a73d164..7247999 100755 --- a/scripts/obs/data/build_rpm.sh +++ b/scripts/obs/data/build_rpm.sh @@ -22,7 +22,23 @@ su "$BUILDUSER" -c "cp /obs/data/rpmmacros ~/.rpmmacros" # Force refresh of package index data (OS#6038) -dnf makecache --refresh +if command -v dnf; then + dnf makecache --refresh +else + yum clean expire-cache +fi + +case "$DISTRO" in + centos:7) + # HACK: remove pkg-config as centos7 has pkgconfig instead + # (which will get pulled in automatically). This could be + # solved more elegantly, but we only build very few centos7 + # packages, so let's not spend too much time on this. In OBS + # this is handled in the centos7 prjconf: + # https://build.opensuse.org/projects/CentOS:CentOS-7/prjconf + sed -i '/^BuildRequires:.*pkg-config/d' "/home/$BUILDUSER/rpmbuild/SPECS/$spec" + ;; +esac $yum_builddep "/home/$BUILDUSER/rpmbuild/SPECS/$spec" diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index b4e23a0..82bf188 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -122,6 +122,7 @@ docker_distro_default = "debian:12" docker_distro_other = [ "almalinux:*", # instead of centos (SYS#5818) + "centos:7", # SYS#6760 "debian:*", "ubuntu:*", ] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4d4a67c053ed29811c504158d1ef49430880ad4f Gerrit-Change-Number: 36718 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ci[master]: jobs: gerrit: build osmo-pcap + dep for centos7
by fixeria 08 May '24

08 May '24

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36718?usp=email ) Change subject: jobs: gerrit: build osmo-pcap + dep for centos7 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4d4a67c053ed29811c504158d1ef49430880ad4f Gerrit-Change-Number: 36718 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 May 2024 12:59:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-upf[master]: contrib: remove rpm spec file
by osmith 08 May '24

08 May '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/36751?usp=email ) Change subject: contrib: remove rpm spec file ...................................................................... contrib: remove rpm spec file Related: https://osmocom.org/news/255 Related: OS#6446 Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547 --- M Makefile.am D contrib/osmo-upf.spec.in 2 files changed, 11 insertions(+), 108 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/51/36751/1 diff --git a/Makefile.am b/Makefile.am index 4452f04..2168ff0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = \ .version \ - contrib/osmo-upf.spec.in \ debian \ git-version-gen \ osmoappdesc.py \ diff --git a/contrib/osmo-upf.spec.in b/contrib/osmo-upf.spec.in deleted file mode 100644 index bc6c5ed..0000000 --- a/contrib/osmo-upf.spec.in +++ /dev/null @@ -1,107 +0,0 @@ -# -# spec file for package osmo-upf -# -# Copyright (c) 2017, Martin Hauke <mardnh(a)gmx.de> -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -## Disable LTO for now since it breaks compilation of the tests -## https://osmocom.org/issues/4113 -%define _lto_cflags %{nil} - -Name: osmo-upf -Version: @VERSION@ -Release: 0 -Summary: OsmoUPF: Osmocom User Plane Function -License: AGPL-3.0-or-later AND GPL-2.0-or-later -Group: Hardware/Mobile -URL: https://osmocom.org/projects/osmo-upf -Source: %{name}-%{version}.tar.xz -BuildRequires: autoconf-archive -BuildRequires: automake >= 1.9 -BuildRequires: libtool >= 2 -BuildRequires: lksctp-tools-devel -BuildRequires: pkgconfig >= 0.20 -%if 0%{?suse_version} -BuildRequires: systemd-rpm-macros -%endif -BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 -BuildRequires: pkgconfig(libnftables) >= 1.0.2 -BuildRequires: pkgconfig(libosmocore) >= 1.6.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.6.0 -BuildRequires: pkgconfig(libosmovty) >= 1.6.0 -BuildRequires: pkgconfig(libosmo-pfcp) >= 0.1.0 -BuildRequires: pkgconfig(talloc) -%{?systemd_requires} - -%description -OsmoUPF: Osmocom User Plane Function - -%prep -%setup -q - -%build -echo "%{version}" >.tarball-version -autoreconf -fi -%configure \ - --docdir=%{_docdir}/%{name} \ - --with-systemdsystemunitdir=%{_unitdir} -make %{?_smp_mflags} - -%install -%make_install - -%preun -%if 0%{?suse_version} -%service_del_preun %{name}.service -%endif - -%postun -%if 0%{?suse_version} -%service_del_postun %{name}.service -%endif - -%pre -getent group osmocom >/dev/null || groupadd --system osmocom -getent passwd osmocom >/dev/null || useradd --system --gid osmocom --home-dir /var/lib/osmocom \ - --shell /sbin/nologin --comment "Open Source Mobile Communications" osmocom -%if 0%{?suse_version} -%service_add_pre %{name}.service -%endif - -%post -%if 0%{?suse_version} -%service_add_post %{name}.service -%endif -chown osmocom:osmocom /etc/osmocom/osmo-upf.cfg -chmod 0660 /etc/osmocom/osmo-upf.cfg -chown root:osmocom /etc/osmocom -chmod 2775 /etc/osmocom -mkdir -p /var/lib/osmocom -chown -R osmocom:osmocom /var/lib/osmocom - -%check -make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) - -%files -%license COPYING -%doc AUTHORS README.md -%{_bindir}/osmo-upf -%{_bindir}/osmo-pfcp-tool -%dir %{_docdir}/%{name}/examples -%dir %{_docdir}/%{name}/examples/osmo-upf -%{_docdir}/%{name}/examples/osmo-upf/osmo-upf.cfg -%{_docdir}/%{name}/examples/osmo-upf/osmo-upf-create-dev.cfg -%{_docdir}/%{name}/examples/osmo-upf/osmo-upf-mockup.cfg -%dir %{_sysconfdir}/osmocom -%config(noreplace) %{_sysconfdir}/osmocom/osmo-upf.cfg -%{_unitdir}/%{name}.service - -%changelog -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I0cc8d753b26648efa7c9fb5798f7c4227c328547 Gerrit-Change-Number: 36751 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log