From 3b59f3ebcb87249539a0ba9f75e3aa0ab292348f Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 22 Oct 2020 16:04:01 +0300 Subject: [PATCH] docker/cerbero: remove bootstrap invocation `bootstrap --build-tools=no --toolchains=no` now do nothing, and just repeat what the bootstrap line above does which is to only run the system bootstraper Part-of: --- docker/cerbero/Dockerfile-fedora | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/cerbero/Dockerfile-fedora b/docker/cerbero/Dockerfile-fedora index b11f6282b6..6009c421ca 100644 --- a/docker/cerbero/Dockerfile-fedora +++ b/docker/cerbero/Dockerfile-fedora @@ -20,18 +20,15 @@ RUN git clone -b ${DEFAULT_BRANCH} https://gitlab.freedesktop.org/gstreamer/cerb cd cerbero && \ echo "local_sources=\"/cerbero/cerbero-sources\"" >> localconf.cbc && \ echo "home_dir=\"/cerbero/cerbero-build\"" >> localconf.cbc && \ - ./cerbero-uninstalled -t -c localconf.cbc bootstrap -y --build-tools=no --toolchains=no && \ ./cerbero-uninstalled -t -c localconf.cbc fetch-bootstrap && \ ./cerbero-uninstalled -t -c localconf.cbc fetch-package gstreamer-1.0 && \ + ./cerbero-uninstalled -t -c localconf.cbc bootstrap -y --build-tools=no --toolchains=no && \ ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win32.cbc fetch-bootstrap && \ ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win32.cbc fetch-package gstreamer-1.0 && \ - ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win32.cbc bootstrap -y --build-tools=no --toolchains=no && \ ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win64.cbc fetch-bootstrap && \ ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win64.cbc fetch-package gstreamer-1.0 && \ - ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win64.cbc bootstrap -y --build-tools=no --toolchains=no && \ ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-android-universal.cbc fetch-bootstrap && \ ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-android-universal.cbc fetch-package gstreamer-1.0 && \ - ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-android-universal.cbc bootstrap -y --build-tools=no --toolchains=no && \ cd .. && \ rm -rf /cerbero/cerbero-build/{dist,logs,sources} && \ rm -f /cerbero/cerbero-build/{linux,windows,android}*.cache && \