From 982888ecdc9f6b153d1f992ae4cae76a1e12c1fc Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Wed, 22 Nov 2023 12:07:33 -0800 Subject: [PATCH] Patch calico-felix libpcap soname for Openstack This changeset patches calico-felix binary libpcap soname for Debian and its derived OSes. We switched to RHEL/UBI based go-build system which links to a different libpcap soname. The actual libpcap ships with Debian is at 1.x but the soname is still at 0.8. calico-felix binary is patched during packaging to the older soname. This change also bumps compat version to v10 that is recommended in [1] for new packages. [1] https://www.debian.org/doc/manuals/maint-guide/dother.en.html#compat --- felix/debian/compat | 2 +- hack/release/packaging/utils/create-update-packages.sh | 4 ++++ networking-calico/debian/compat | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/felix/debian/compat b/felix/debian/compat index 45a4fb75db8..f599e28b8ab 100644 --- a/felix/debian/compat +++ b/felix/debian/compat @@ -1 +1 @@ -8 +10 diff --git a/hack/release/packaging/utils/create-update-packages.sh b/hack/release/packaging/utils/create-update-packages.sh index a8cdaa9e9d6..cfb4e667551 100755 --- a/hack/release/packaging/utils/create-update-packages.sh +++ b/hack/release/packaging/utils/create-update-packages.sh @@ -198,6 +198,10 @@ function do_felix { # RPM golang build dependencies that is exactly equivalent to our # containerized builds. make bin/calico-felix + # Felix is built with RHEL/UBI and links against libpcap.so.1. We need this patchelf + # until Debian changes the soname from .0.8 to .1. + # FIXME remove the following patchelf command once Debian dependency is updated. + patchelf --replace-needed libpcap.so.1 libpcap.so.0.8 bin/calico-felix # Remove all the files that were added by that build, except for the # bin/calico-felix binary. rm -f bin/calico-felix-amd64 diff --git a/networking-calico/debian/compat b/networking-calico/debian/compat index ec635144f60..f599e28b8ab 100644 --- a/networking-calico/debian/compat +++ b/networking-calico/debian/compat @@ -1 +1 @@ -9 +10