Switch to python 3 variants of dependencies on debian-based builds

thaJeztah · avagin · commit 3957d9533b49 · 2020-10-20T00:18:24.000-07:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/contrib/debian/dev-packages.lst b/contrib/debian/dev-packages.lst
@@ -4,18 +4,17 @@ libprotobuf-dev
 libprotobuf-c-dev
 protobuf-c-compiler
 protobuf-compiler
-python-protobuf
+python3-protobuf
 libnet-dev
 
 # Extra packages, required for testing and building other tools
 pkg-config
 libnl-3-dev
-python-ipaddr
 libbsd0
 libbsd-dev
 iproute2
 libcap-dev
 libaio-dev
-python-yaml
+python3-yaml
 libnl-route-3-dev
 python-future
diff --git a/criu/Makefile.packages b/criu/Makefile.packages
@@ -14,21 +14,19 @@ REQ-DEB-PKG-NAMES	+= libprotobuf-dev
 REQ-DEB-PKG-NAMES	+= libprotobuf-c-dev
 REQ-DEB-PKG-NAMES	+= protobuf-c-compiler
 REQ-DEB-PKG-NAMES	+= protobuf-compiler
-REQ-DEB-PKG-NAMES	+= python-protobuf
+REQ-DEB-PKG-NAMES	+= $(PYTHON)-protobuf
+REQ-DEB-PKG-NAMES	+= $(PYTHON)-future
 REQ-DEB-PKG-NAMES	+= libnl-3-dev
 REQ-DEB-PKG-NAMES	+= libcap-dev
 
-REQ-DEB-PKG-TEST-NAMES	+= python-yaml
+REQ-DEB-PKG-TEST-NAMES	+= $(PYTHON)-yaml
 REQ-DEB-PKG-TEST-NAMES	+= libaio-dev
 
 ifeq ($(PYTHON),python3)
-REQ-DEB-PKG-NAMES	+= $(PYTHON)-future
 REQ-DEB-PKG-TEST-NAMES	+= libaio-dev
 
 REQ-RPM-PKG-TEST-NAMES	+= $(PYTHON)-PyYAML
 else
-REQ-DEB-PKG-NAMES	+= python-future
-
 REQ-RPM-PKG-TEST-NAMES	+= $(PYTHON)-pyyaml
 endif
 
diff --git a/scripts/build/Dockerfile.aarch64-cross b/scripts/build/Dockerfile.aarch64-cross
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
 	libssl-dev:arm64		\
 	protobuf-c-compiler		\
 	protobuf-compiler		\
-	python-protobuf			\
+	python3-protobuf			\
 	libnl-3-dev:arm64		\
 	libprotobuf-dev:arm64		\
 	libnet-dev:arm64		\
diff --git a/scripts/build/Dockerfile.armv7-cross b/scripts/build/Dockerfile.armv7-cross
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
 	libssl-dev:armhf		\
 	protobuf-c-compiler		\
 	protobuf-compiler		\
-	python-protobuf			\
+	python3-protobuf			\
 	libnl-3-dev:armhf		\
 	libprotobuf-dev:armhf		\
 	libnet-dev:armhf		\
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get install -y \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
-	python-minimal \
-	python-future
+	python3-minimal \
+	python3-future
 
 COPY . /criu
 WORKDIR /criu
diff --git a/scripts/build/Dockerfile.mips64el-cross b/scripts/build/Dockerfile.mips64el-cross
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
 	libssl-dev:mips64el		\
 	protobuf-c-compiler		\
 	protobuf-compiler		\
-	python-protobuf			\
+	python3-protobuf			\
 	libnl-3-dev:mips64el		\
 	libprotobuf-dev:mips64el		\
 	libnet-dev:mips64el		\
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
@@ -3,15 +3,15 @@ FROM adoptopenjdk/openjdk8-openj9:latest
 RUN apt-get update && apt-get install -y --no-install-recommends protobuf-c-compiler \
 	libprotobuf-c-dev \
 	libaio-dev \
-	python-future \
+	python3-future \
 	libprotobuf-dev \
 	protobuf-compiler \
 	libcap-dev \
 	libnl-3-dev \
 	gdb \
 	bash \
-	python-protobuf \
-	python-yaml \
+	python3-protobuf \
+	python3-yaml \
 	libnet-dev \
 	libnl-route-3-dev \
 	libbsd-dev \
diff --git a/scripts/build/Dockerfile.ppc64-cross b/scripts/build/Dockerfile.ppc64-cross
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
 	libssl-dev:ppc64el		\
 	protobuf-c-compiler		\
 	protobuf-compiler		\
-	python-protobuf			\
+	python3-protobuf			\
 	libnl-3-dev:ppc64el		\
 	libprotobuf-dev:ppc64el		\
 	libnet-dev:ppc64el		\
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get install -y \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
-	python-minimal \
-	python-future
+	python3-minimal \
+	python3-future
 
 COPY . /criu
 WORKDIR /criu
