mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-08-11 12:00:48 +02:00 committed by Andrei Vagin
parent a6214c360d
commit 3957d9533b
9 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/debian/dev-packages.lst
View File

@ -4,18 +4,17 @@ libprotobuf-dev
libprotobuf-c-dev libprotobuf-c-dev
protobuf-c-compiler protobuf-c-compiler
protobuf-compiler protobuf-compiler
python-protobuf python3-protobuf
libnet-dev libnet-dev
# Extra packages, required for testing and building other tools # Extra packages, required for testing and building other tools
pkg-config pkg-config
libnl-3-dev libnl-3-dev
python-ipaddr
libbsd0 libbsd0
libbsd-dev libbsd-dev
iproute2 iproute2
libcap-dev libcap-dev
libaio-dev libaio-dev
python-yaml python3-yaml
libnl-route-3-dev libnl-route-3-dev
python-future python-future

8
criu/Makefile.packages
View File

@ -14,21 +14,19 @@ REQ-DEB-PKG-NAMES += libprotobuf-dev
REQ-DEB-PKG-NAMES += libprotobuf-c-dev REQ-DEB-PKG-NAMES += libprotobuf-c-dev
REQ-DEB-PKG-NAMES += protobuf-c-compiler REQ-DEB-PKG-NAMES += protobuf-c-compiler
REQ-DEB-PKG-NAMES += protobuf-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 += libnl-3-dev
REQ-DEB-PKG-NAMES += libcap-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 REQ-DEB-PKG-TEST-NAMES += libaio-dev
ifeq ($(PYTHON),python3) ifeq ($(PYTHON),python3)
REQ-DEB-PKG-NAMES += $(PYTHON)-future
REQ-DEB-PKG-TEST-NAMES += libaio-dev REQ-DEB-PKG-TEST-NAMES += libaio-dev
REQ-RPM-PKG-TEST-NAMES += $(PYTHON)-PyYAML REQ-RPM-PKG-TEST-NAMES += $(PYTHON)-PyYAML
else else
REQ-DEB-PKG-NAMES += python-future
REQ-RPM-PKG-TEST-NAMES += $(PYTHON)-pyyaml REQ-RPM-PKG-TEST-NAMES += $(PYTHON)-pyyaml
endif endif

2
scripts/build/Dockerfile.aarch64-cross
View File

@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
libssl-dev:arm64 \ libssl-dev:arm64 \
protobuf-c-compiler \ protobuf-c-compiler \
protobuf-compiler \ protobuf-compiler \
python-protobuf \ python3-protobuf \
libnl-3-dev:arm64 \ libnl-3-dev:arm64 \
libprotobuf-dev:arm64 \ libprotobuf-dev:arm64 \
libnet-dev:arm64 \ libnet-dev:arm64 \

2
scripts/build/Dockerfile.armv7-cross
View File

@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
libssl-dev:armhf \ libssl-dev:armhf \
protobuf-c-compiler \ protobuf-c-compiler \
protobuf-compiler \ protobuf-compiler \
python-protobuf \ python3-protobuf \
libnl-3-dev:armhf \ libnl-3-dev:armhf \
libprotobuf-dev:armhf \ libprotobuf-dev:armhf \
libnet-dev:armhf \ libnet-dev:armhf \

4
scripts/build/Dockerfile.linux32.tmpl
View File

@ -21,8 +21,8 @@ RUN apt-get update && apt-get install -y \
pkg-config \ pkg-config \
protobuf-c-compiler \ protobuf-c-compiler \
protobuf-compiler \ protobuf-compiler \
python-minimal \ python3-minimal \
python-future python3-future
COPY . /criu COPY . /criu
WORKDIR /criu WORKDIR /criu

2
scripts/build/Dockerfile.mips64el-cross
View File

@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
libssl-dev:mips64el \ libssl-dev:mips64el \
protobuf-c-compiler \ protobuf-c-compiler \
protobuf-compiler \ protobuf-compiler \
python-protobuf \ python3-protobuf \
libnl-3-dev:mips64el \ libnl-3-dev:mips64el \
libprotobuf-dev:mips64el \ libprotobuf-dev:mips64el \
libnet-dev:mips64el \ libnet-dev:mips64el \

6
scripts/build/Dockerfile.openj9-ubuntu
View File

@ -3,15 +3,15 @@ FROM adoptopenjdk/openjdk8-openj9:latest
RUN apt-get update && apt-get install -y --no-install-recommends protobuf-c-compiler \ RUN apt-get update && apt-get install -y --no-install-recommends protobuf-c-compiler \
libprotobuf-c-dev \ libprotobuf-c-dev \
libaio-dev \ libaio-dev \
python-future \ python3-future \
libprotobuf-dev \ libprotobuf-dev \
protobuf-compiler \ protobuf-compiler \
libcap-dev \ libcap-dev \
libnl-3-dev \ libnl-3-dev \
gdb \ gdb \
bash \ bash \
python-protobuf \ python3-protobuf \
python-yaml \ python3-yaml \
libnet-dev \ libnet-dev \
libnl-route-3-dev \ libnl-route-3-dev \
libbsd-dev \ libbsd-dev \

2
scripts/build/Dockerfile.ppc64-cross
View File

@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
libssl-dev:ppc64el \ libssl-dev:ppc64el \
protobuf-c-compiler \ protobuf-c-compiler \
protobuf-compiler \ protobuf-compiler \
python-protobuf \ python3-protobuf \
libnl-3-dev:ppc64el \ libnl-3-dev:ppc64el \
libprotobuf-dev:ppc64el \ libprotobuf-dev:ppc64el \
libnet-dev:ppc64el \ libnet-dev:ppc64el \

4
scripts/build/Dockerfile.tmpl
View File

@ -21,8 +21,8 @@ RUN apt-get update && apt-get install -y \
pkg-config \ pkg-config \
protobuf-c-compiler \ protobuf-c-compiler \
protobuf-compiler \ protobuf-compiler \
python-minimal \ python3-minimal \
python-future python3-future
COPY . /criu COPY . /criu
WORKDIR /criu WORKDIR /criu