change the release name to version number and reuse existing files

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
opencomputeproject · Jul 25, 2022 · 0295e9b · 0295e9b
1 parent 9978f19
commit 0295e9b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/debian/copy_installer.sh b/debian/copy_installer.sh
@@ -1,14 +1,14 @@
 if [[ x"$1" =~ x"v2" ]]
 then
-   echo "Copy python-saithriftv2.install as python-saithrift.install"
-   cp ./debian/installerFiles/python-saithriftv2.install ./debian/python-saithrift.install
+   echo "Copy python3-saithrift.install as python-saithrift.install"
+   cp ./debian/installerFiles/python3-saithrift.install ./debian/python-saithrift.install
 else
-   if test -n "lsb_release -a | grep bullseye"
+   if [ $(lsb_release -sr) -ge 11 ]
    then
-      echo "Copy python-saithriftv1-bullseye.install as python-saithrift.install"
-      cp ./debian/installerFiles/python-saithriftv1-bullseye.install ./debian/python-saithrift.install
+      echo "Copy python3-saithrift.install as python-saithrift.install after Ver.11 releases"
+      cp ./debian/installerFiles/python3-saithrift.install ./debian/python-saithrift.install
    else
-      echo "Copy python-saithriftv1.install as python-saithrift.install"
-      cp ./debian/installerFiles/python-saithriftv1.install ./debian/python-saithrift.install
+      echo "Copy python2.7-saithrift.install as python-saithrift.install"
+      cp ./debian/installerFiles/python2.7-saithrift.install ./debian/python-saithrift.install
    fi   
 fi
diff --git a/debian/installerFiles/python-saithriftv2.install b/debian/installerFiles/python-saithriftv2.install
diff --git a/...installerFiles/python-saithriftv1.install → ...nstallerFiles/python2.7-saithrift.install b/...installerFiles/python-saithriftv1.install → ...nstallerFiles/python2.7-saithrift.install
diff --git a/debian/installerFiles/python3-saithrift.install b/debian/installerFiles/python3-saithrift.install
@@ -0,0 +1,2 @@
+#compatiable with bullseye python 3.9 environment and saithriftv2 build with python3
+debian/usr/local/lib/python3*/site-packages/* /usr/lib/python3/dist-packages/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#compatiable with bullseye python 3.9 environment and saithriftv2 build with python3
		debian/usr/local/lib/python3/site-packages/ /usr/lib/python3/dist-packages/