Skip to content

Commit

Permalink
Fix saithrift build issue for Bookworm SONiC (#1974)
Browse files Browse the repository at this point in the history
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 <keshavg@marvell.com>
  • Loading branch information
Keshavg-marvell authored Mar 6, 2024
1 parent f7389ba commit bc1d6ec
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
18 changes: 14 additions & 4 deletions debian/copy_installer.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 2 additions & 0 deletions debian/installerFiles/python3-saithrift-bookworm.install
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit bc1d6ec

Please sign in to comment.