more changes after tests

opencv/4-build.sh

@@ -32,7 +32,8 @@ cmake \
 	-DENABLE_VFPV3=$arm \
 	-DENABLE_PRECOMPILED_HEADERS=OFF \
 	-DBUILD_opencv_java=OFF \
-	-DBUILD_opencv_python=$pyth \
+	-DBUILD_opencv_python2=ON \
+	-DBUILD_opencv_python3=$pyth \
 	-DCMAKE_INSTALL_PREFIX=/usr/local/opencv-$version \
 	-DOPENCV_ENABLE_NONFREE=ON \
 	-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules \
@@ -44,15 +45,13 @@ echo "############################################################"
 
 make -k -j2
 
-if [ "$pyth" = "ON" ]; then
-	echo "############################################################"
-	echo "# Building opencv-$version on $release - second pass"
-	echo "############################################################"
+echo "############################################################"
+echo "# Building opencv-$version on $release - second pass"
+echo "############################################################"
 
-	# building cv2.cpp.o for python modules probably failed above - let's
-	# try once again in single process (so all memory will be available to it)
-	make
-fi
+# building cv2.cpp.o for python modules probably failed above - let's
+# try once again in single process (so all memory will be available to it)
+make
 
 dt2=`date +%Y%m%d-%H%M`
 echo "############################################################"

opencv/5-install.sh

@@ -7,10 +7,22 @@ else
 fi
 
 cd /usr/local/src/opencv-$version/build
-make install
 
+# base OpenCV
+make install
 echo "/usr/local/opencv-$version/lib" >/etc/ld.so.conf.d/opencv-$version.conf
 ldconfig
 
-sed -i -e "/PYTHONPATH=\/usr\/local\/opencv-/d" /root/.bashrc
-echo "export PYTHONPATH=/usr/local/opencv-$version/lib/python3.5/dist-packages" >>/root/.bashrc
+
+# Python 2.x support
+mkdir -p /usr/local/lib/python2.7/dist-packages
+ln -s /usr/local/opencv-$version/lib/python2.7/dist-packages/cv2.so /usr/local/lib/python2.7/dist-packages
+
+
+# Python 3.x support
+if [ "`lsb_release -cs`" = "buster" ] && [[ $version == "3.4."* ]]; then
+	:
+else
+	sed -i -e "/PYTHONPATH=\/usr\/local\/opencv-/d" /root/.bashrc
+	echo "export PYTHONPATH=/usr/local/opencv-$version/lib/python3.5/dist-packages" >>/root/.bashrc
+fi

opencv/6-pack.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ "$1" != "" ]; then
+	version=$1
+else
+	version='4.2.0'
+fi
+
+release=`lsb_release -cs`
+
+if [ -d /usr/local/opencv-$version ] && [ ! -f /usr/local/opencv-$version-$release.tar.gz ]; then
+	cd /usr/local
+	tar czvf opencv-$version-$release.tar.gz opencv-$version
+fi