From 8fe2d5630b434ee6dbe54fc64282b9424c3bc322 Mon Sep 17 00:00:00 2001 From: Keshav Gupta Date: Fri, 1 Mar 2024 01:27:27 -0800 Subject: [PATCH] Fix saithrift build issue for Bookworm SONiC saithrift package is getting installed at different location for bookworm. Taking care it using copy_installer.sh script. This change fixes build issue for both saithriftv1 and saithriftv2 Signed-off-by: Keshav Gupta --- debian/copy_installer.sh | 18 ++++++++++++++---- .../python3-saithrift-bookworm.install | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 debian/installerFiles/python3-saithrift-bookworm.install diff --git a/debian/copy_installer.sh b/debian/copy_installer.sh index 556899e9a..51764c5bc 100755 --- a/debian/copy_installer.sh +++ b/debian/copy_installer.sh @@ -1,11 +1,21 @@ if [[ x"$1" =~ x"v2" ]] then - echo "Copy python3-saithrift.install as python-saithrift.install" - cp ./debian/installerFiles/python3-saithrift.install ./debian/python-saithrift.install + if [ $(lsb_release -sr) -ge 12 ] + then + echo "Copy python3-saithrift-bookworm.install as python-saithrift.install after Ver.12 releases" + cp ./debian/installerFiles/python3-saithrift-bookworm.install ./debian/python-saithrift.install + else + echo "Copy python3-saithrift.install as python-saithrift.install" + cp ./debian/installerFiles/python3-saithrift.install ./debian/python-saithrift.install + fi else - if [ $(lsb_release -sr) -ge 11 ] + if [ $(lsb_release -sr) -ge 12 ] + then + echo "Copy python3-saithrift-bookworm.install as python-saithrift.install after Ver.12 releases" + cp ./debian/installerFiles/python3-saithrift-bookworm.install ./debian/python-saithrift.install + elif [ $(lsb_release -sr) -eq 11 ] then - echo "Copy python3-saithrift.install as python-saithrift.install after Ver.11 releases" + echo "Copy python3-saithrift.install as python-saithrift.install for Ver.11 releases" cp ./debian/installerFiles/python3-saithrift.install ./debian/python-saithrift.install else echo "Copy python2.7-saithrift.install as python-saithrift.install" diff --git a/debian/installerFiles/python3-saithrift-bookworm.install b/debian/installerFiles/python3-saithrift-bookworm.install new file mode 100644 index 000000000..2823a1da2 --- /dev/null +++ b/debian/installerFiles/python3-saithrift-bookworm.install @@ -0,0 +1,2 @@ +#compatiable with bookworm python 3.11 environment and build with python3 +debian/usr/local/local/lib/python3*/dist-packages/* /usr/lib/python3/dist-packages/