From a7760b40a266f7dcd1bc7a8eb13d903b2f2c9f0b Mon Sep 17 00:00:00 2001 From: "M. Vefa Bicakci" Date: Mon, 18 Oct 2021 21:39:50 -0400 Subject: [PATCH] iproute: Update from 4.11.0-14 to 5.9.0-4 This commit updates the iproute package from 4.11.0-14 shipped with CentOS 7.6.1810 (i.e., StarlingX baseline) to 5.9.0-4 shipped with CentOS 8.4.2105, because the former version does not support the "seg6" and "seg6local" encapsulation types (used for segment-based routing via the "ip route" command). Segment-based routing capability was requested by a user, and the shortcomings of the pre-existing version of iproute package were noticed when attempting to test the seg6 encapsulation type with a v5.10-based kernel. Note that it was not possible to re-use CentOS 8.4.2105's binary RPM package on StarlingX, due to the fact that StarlingX's CentOS 7.6.1810 baseline ships with glibc-2.17, whereas the CentOS 8.4.2105 iproute package depends on glibc-2.27. This requires StarlingX to rebuild the RPM package. Verification: - Installation and bootstrap of an All-in-One simplex system has been carried out with this commit as an overall regression test. - The iproute package's git repository was also browsed for potentially non-backwards-compatible changes by searching for keywords "backward" and "compat" in the git commit history between versions 4.11.0 and 5.9.0 using "git log -i --grep". Story: 2008921 Task: 43663 Depends-On: I5e272dc59b8b69611474706c165644a8dd5d7f52 Signed-off-by: M. Vefa Bicakci Change-Id: I6de9659dfec830f954661a0b0f82e69dc9637a5d --- centos_pkg_dirs | 1 + centos_srpms_3rdparties.lst | 1 + networking/iproute/centos/build_srpm.data | 1 + .../iproute/centos/meta_patches/PATCH_ORDER | 1 + ...c-Modify-Release-field-for-StarlingX.patch | 27 +++++++++++++++++++ networking/iproute/centos/srpm_path | 1 + 6 files changed, 32 insertions(+) create mode 100644 networking/iproute/centos/build_srpm.data create mode 100644 networking/iproute/centos/meta_patches/PATCH_ORDER create mode 100644 networking/iproute/centos/meta_patches/iproute.spec-Modify-Release-field-for-StarlingX.patch create mode 100644 networking/iproute/centos/srpm_path diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 2f5377aba..53369f28d 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -95,3 +95,4 @@ base/inih base/pf-bb-config gpu/gpu-operator tools/kexec-tools +networking/iproute diff --git a/centos_srpms_3rdparties.lst b/centos_srpms_3rdparties.lst index 00afdc8e0..a23f2b1ff 100644 --- a/centos_srpms_3rdparties.lst +++ b/centos_srpms_3rdparties.lst @@ -1,3 +1,4 @@ +iproute-5.9.0-4.el8.src.rpm#https://vault.centos.org/centos/8.4.2105/BaseOS/Source/SPackages/iproute-5.9.0-4.el8.src.rpm libvirt-python-4.7.0-1.fc28.src.rpm#https://libvirt.org/sources/python/libvirt-python-4.7.0-1.fc28.src.rpm linuxptp-3.1.1-1.el8.src.rpm#http://vault.centos.org/8-stream/AppStream/Source/SPackages/linuxptp-3.1.1-1.el8.src.rpm python-daemon-2.2.3-7.el8.src.rpm#http://vault.centos.org/8.0.1905/virt/Source/ovirt-44/python-daemon-2.2.3-7.el8.src.rpm diff --git a/networking/iproute/centos/build_srpm.data b/networking/iproute/centos/build_srpm.data new file mode 100644 index 000000000..69abd61b8 --- /dev/null +++ b/networking/iproute/centos/build_srpm.data @@ -0,0 +1 @@ +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/networking/iproute/centos/meta_patches/PATCH_ORDER b/networking/iproute/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..032f84b55 --- /dev/null +++ b/networking/iproute/centos/meta_patches/PATCH_ORDER @@ -0,0 +1 @@ +iproute.spec-Modify-Release-field-for-StarlingX.patch diff --git a/networking/iproute/centos/meta_patches/iproute.spec-Modify-Release-field-for-StarlingX.patch b/networking/iproute/centos/meta_patches/iproute.spec-Modify-Release-field-for-StarlingX.patch new file mode 100644 index 000000000..960e876e6 --- /dev/null +++ b/networking/iproute/centos/meta_patches/iproute.spec-Modify-Release-field-for-StarlingX.patch @@ -0,0 +1,27 @@ +From 36bc0ef90f0b05a91728c5f8633988131af8a0af Mon Sep 17 00:00:00 2001 +From: "M. Vefa Bicakci" +Date: Fri, 22 Oct 2021 16:37:34 -0400 +Subject: [PATCH] iproute.spec: Modify Release field for StarlingX + +This commit modifies the Release field of the iproute package's spec +file for StarlingX. + +Signed-off-by: M. Vefa Bicakci +--- + SPECS/iproute.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SPECS/iproute.spec b/SPECS/iproute.spec +index 6ef0b529e0ce..b8f7ad1833df 100644 +--- a/SPECS/iproute.spec ++++ b/SPECS/iproute.spec +@@ -1,5 +1,5 @@ + %define rpmversion 5.9.0 +-%define specrelease 4%{?dist} ++%define specrelease 4%{?_tis_dist}.%{tis_patch_ver} + %define pkg_release %{specrelease}%{?buildid} + + Summary: Advanced IP routing and network device configuration tools +-- +2.29.2 + diff --git a/networking/iproute/centos/srpm_path b/networking/iproute/centos/srpm_path new file mode 100644 index 000000000..6b59d1f73 --- /dev/null +++ b/networking/iproute/centos/srpm_path @@ -0,0 +1 @@ +mirror:Source/iproute-5.9.0-4.el8.src.rpm