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 <[email protected]>
opencomputeproject · Mar 1, 2024 · 7aecbf2 · 7aecbf2
1 parent d90568e
commit 7aecbf2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/debian/copy_installer.sh b/debian/copy_installer.sh
@@ -1,9 +1,19 @@
 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) -eq 12 ]
+   then
+      echo "Copy python3-saithrift-bookworm.install as python-saithrift.install for 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) -eq 12 ]
+   then
+      echo "Copy python3-saithrift-bookworm.install as python-saithrift.install for Ver.12 releases"
+      cp ./debian/installerFiles/python3-saithrift-bookworm.install ./debian/python-saithrift.install
+   elif [ $(lsb_release -sr) -ge 11 ]
    then
       echo "Copy python3-saithrift.install as python-saithrift.install after Ver.11 releases"
       cp ./debian/installerFiles/python3-saithrift.install ./debian/python-saithrift.install

diff --git a/debian/installerFiles/python3-saithrift-bookworm.install b/debian/installerFiles/python3-saithrift-bookworm.install
@@ -0,0 +1,2 @@
+#compatiable with bookworm python 3.11 environment and saithriftv2 build with python3
+debian/usr/local/local/lib/python3*/dist-packages/* /usr/lib/python3/dist-packages/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#compatiable with bookworm python 3.11 environment and saithriftv2 build with python3
		debian/usr/local/local/lib/python3/dist-packages/ /usr/lib/python3/dist-packages/