Javier Jardón pushed to branch jjardon/sync_with_docs at BuildStream / buildstream-docker-images
Commits:
-
f49def27
by Javier Jardón at 2018-07-27T20:26:54Z
7 changed files:
- fedora/prepare.sh
- testsuite/debian-9/cleanup.sh
- testsuite/debian-9/prepare.sh
- testsuite/fedora-27/cleanup.sh
- testsuite/fedora-27/prepare.sh
- testsuite/ubuntu-18.04/cleanup.sh
- testsuite/ubuntu-18.04/prepare.sh
Changes:
| ... | ... | @@ -3,20 +3,17 @@ |
| 3 | 3 |
set -eu
|
| 4 | 4 |
|
| 5 | 5 |
# Buildstream base dependencies
|
| 6 |
-dnf install -y fuse ostree bubblewrap \
|
|
| 7 |
- python3 python3-pip python3-gobject python3-psutil \
|
|
| 8 |
- python3-ruamel-yaml
|
|
| 6 |
+dnf install -y \
|
|
| 7 |
+ python3 fuse bubblewrap
|
|
| 9 | 8 |
|
| 10 | 9 |
# Buildstream plugins base dependencies
|
| 11 |
-dnf install -y git bzr tar lzip patch
|
|
| 10 |
+dnf install -y bzr git lzip patch ostree python3-gobject
|
|
| 12 | 11 |
|
| 13 | 12 |
# Buildstream utilities
|
| 14 | 13 |
dnf install -y bash-completion
|
| 15 | 14 |
|
| 16 |
-# grpcio needs to be built from source on architectures where no binary is available
|
|
| 17 |
-if [ "$(uname -m)" != "x86_64" ]; then
|
|
| 18 |
- dnf install -y gcc-c++ python3-devel
|
|
| 19 |
-fi
|
|
| 15 |
+# Packages to build python dependencies
|
|
| 16 |
+dnf install -y python3-pip python3-devel gcc-c++
|
|
| 20 | 17 |
|
| 21 | 18 |
# BuildStream python dependencies
|
| 22 | 19 |
pip3 install blessings Click grpcio jinja2 pluginbase protobuf ruamel.yaml setuptools
|
| ... | ... | @@ -4,9 +4,7 @@ set -eu |
| 4 | 4 |
|
| 5 | 5 |
echo "Removing build dependencies"
|
| 6 | 6 |
|
| 7 |
-if [ "$(uname -m)" != "x86_64" ]; then
|
|
| 8 |
- apt remove -y --purge g++ python3-dev
|
|
| 9 |
-fi
|
|
| 7 |
+apt remove -y --purge g++ python3-dev
|
|
| 10 | 8 |
|
| 11 | 9 |
apt autoremove -y --purge
|
| 12 | 10 |
|
| ... | ... | @@ -6,25 +6,23 @@ apt update |
| 6 | 6 |
|
| 7 | 7 |
# Buildstream base dependencies
|
| 8 | 8 |
apt install -y --no-install-recommends \
|
| 9 |
- fuse \
|
|
| 10 |
- python3 python3-pip python3-gi python3-psutil \
|
|
| 11 |
- python3-ruamel.yaml
|
|
| 12 |
-apt install -y -t stretch-backports \
|
|
| 13 |
- ostree gir1.2-ostree-1.0 bubblewrap
|
|
| 9 |
+ fuse python3
|
|
| 10 |
+apt install -y -t stretch-backports --no-install-recommends \
|
|
| 11 |
+ bubblewrap
|
|
| 14 | 12 |
|
| 15 | 13 |
# Buildstream plugins base dependencies
|
| 16 | 14 |
apt install -y --no-install-recommends \
|
| 17 |
- git bzr tar lzip patch
|
|
| 15 |
+ bzr git lzip patch python3-gi
|
|
| 16 |
+apt install -y -t stretch-backports --no-install-recommends \
|
|
| 17 |
+ gir1.2-ostree-1.0 ostree
|
|
| 18 | 18 |
|
| 19 | 19 |
# Buildstream utilities
|
| 20 | 20 |
apt install -y --no-install-recommends \
|
| 21 | 21 |
bash-completion
|
| 22 | 22 |
|
| 23 |
-# grpcio needs to be built from source on architectures where no binary is available
|
|
| 24 |
-if [ "$(uname -m)" != "x86_64" ]; then
|
|
| 25 |
- apt install -y --no-install-recommends g++ python3-dev
|
|
| 26 |
-fi
|
|
| 27 |
- |
|
| 23 |
+# Packages to install python dependencies
|
|
| 24 |
+apt install -y --no-install-recommends \
|
|
| 25 |
+ python3-pip python3-dev g++
|
|
| 28 | 26 |
# BuildStream python dependencies
|
| 29 | 27 |
pip3 install setuptools
|
| 30 | 28 |
pip3 install blessings click grpcio jinja2 pluginbase protobuf ruamel.yaml
|
| ... | ... | @@ -2,10 +2,8 @@ |
| 2 | 2 |
|
| 3 | 3 |
set -eu
|
| 4 | 4 |
|
| 5 |
-if [ "$(uname -m)" != "x86_64" ]; then
|
|
| 6 |
- echo "Removing gcc and python3-devel"
|
|
| 7 |
- dnf remove -y gcc-c++ python3-devel
|
|
| 8 |
-fi
|
|
| 5 |
+echo "Removing gcc and python3-devel"
|
|
| 6 |
+dnf remove -y gcc-c++ python3-devel
|
|
| 9 | 7 |
|
| 10 | 8 |
echo "Removing DNF cache"
|
| 11 | 9 |
dnf clean all
|
| ... | ... | @@ -3,20 +3,17 @@ |
| 3 | 3 |
set -eu
|
| 4 | 4 |
|
| 5 | 5 |
# Buildstream base dependencies
|
| 6 |
-dnf install -y fuse ostree bubblewrap \
|
|
| 7 |
- python3 python3-pip python3-gobject python3-psutil \
|
|
| 8 |
- python3-ruamel-yaml
|
|
| 6 |
+dnf install -y \
|
|
| 7 |
+ python3 fuse bubblewrap
|
|
| 9 | 8 |
|
| 10 | 9 |
# Buildstream plugins base dependencies
|
| 11 |
-dnf install -y git bzr tar lzip patch
|
|
| 10 |
+dnf install -y bzr git lzip patch ostree python3-gobject
|
|
| 12 | 11 |
|
| 13 | 12 |
# Buildstream utilities
|
| 14 | 13 |
dnf install -y bash-completion
|
| 15 | 14 |
|
| 16 |
-# grpcio needs to be built from source on architectures where no binary is available
|
|
| 17 |
-if [ "$(uname -m)" != "x86_64" ]; then
|
|
| 18 |
- dnf install -y gcc-c++ python3-devel
|
|
| 19 |
-fi
|
|
| 15 |
+# Packages to build python dependencies
|
|
| 16 |
+dnf install -y python3-pip python3-devel gcc-c++
|
|
| 20 | 17 |
|
| 21 | 18 |
# BuildStream python dependencies
|
| 22 | 19 |
pip3 install blessings Click grpcio jinja2 pluginbase protobuf ruamel.yaml setuptools
|
| ... | ... | @@ -4,9 +4,7 @@ set -eu |
| 4 | 4 |
|
| 5 | 5 |
echo "Removing build dependencies"
|
| 6 | 6 |
|
| 7 |
-if [ "$(uname -m)" != "x86_64" ]; then
|
|
| 8 |
- apt remove -y --purge g++ python3-dev
|
|
| 9 |
-fi
|
|
| 7 |
+apt remove -y --purge g++ python3-dev
|
|
| 10 | 8 |
|
| 11 | 9 |
apt autoremove -y --purge
|
| 12 | 10 |
|
| ... | ... | @@ -14,4 +12,4 @@ echo "Removing apt cache" |
| 14 | 12 |
apt-get clean
|
| 15 | 13 |
rm -rf /var/lib/apt/lists
|
| 16 | 14 |
|
| 17 |
-rm -R /root/*
|
|
| \ No newline at end of file | ||
| 15 |
+rm -R /root/*
|
| ... | ... | @@ -4,19 +4,20 @@ set -eu |
| 4 | 4 |
apt update
|
| 5 | 5 |
|
| 6 | 6 |
# Buildstream base dependencies
|
| 7 |
-apt install -y \
|
|
| 8 |
- fuse ostree gir1.2-ostree-1.0 bubblewrap git \
|
|
| 9 |
- python3 python3-pip python3-gi python3-psutil \
|
|
| 10 |
- ostree
|
|
| 7 |
+apt install -y --no-install-recommends \
|
|
| 8 |
+ python3 fuse bubblewrap
|
|
| 11 | 9 |
|
| 12 | 10 |
# Buildstream plugins base dependencies
|
| 13 |
-apt install -y \
|
|
| 14 |
- git bzr tar lzip patch
|
|
| 11 |
+apt install -y --no-install-recommends \
|
|
| 12 |
+ lzip gir1.2-ostree-1.0 git bzr ostree patch python3-arpy python3-gi
|
|
| 15 | 13 |
|
| 16 | 14 |
# Buildstream utilities
|
| 17 |
-apt install -y - \
|
|
| 15 |
+apt install -y --no-install-recommends \
|
|
| 18 | 16 |
bash-completion
|
| 19 | 17 |
|
| 18 |
+# Packages to install python dependencies
|
|
| 19 |
+apt install -y --no-install-recommends \
|
|
| 20 |
+ python3-pip python3-dev g++
|
|
| 20 | 21 |
# BuildStream python dependencies
|
| 21 | 22 |
pip3 install setuptools
|
| 22 | 23 |
pip3 install blessings click grpcio jinja2 pluginbase protobuf ruamel.yaml
|