diff --git a/docker/cerbero/Dockerfile-fedora b/docker/cerbero/Dockerfile-fedora index 6009c421ca..c903b9562b 100644 --- a/docker/cerbero/Dockerfile-fedora +++ b/docker/cerbero/Dockerfile-fedora @@ -20,15 +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 fetch-bootstrap && \ - ./cerbero-uninstalled -t -c localconf.cbc fetch-package gstreamer-1.0 && \ + ./cerbero-uninstalled -t -c localconf.cbc fetch-bootstrap --jobs=4 && \ + ./cerbero-uninstalled -t -c localconf.cbc fetch-package --jobs=4 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-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-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-win32.cbc fetch-bootstrap --jobs=4 && \ + ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win32.cbc fetch-package --jobs=4 gstreamer-1.0 && \ + ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win64.cbc fetch-bootstrap --jobs=4 && \ + ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-win64.cbc fetch-package --jobs=4 gstreamer-1.0 && \ + ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-android-universal.cbc fetch-bootstrap --jobs=4 && \ + ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-android-universal.cbc fetch-package --jobs=4 gstreamer-1.0 && \ cd .. && \ rm -rf /cerbero/cerbero-build/{dist,logs,sources} && \ rm -f /cerbero/cerbero-build/{linux,windows,android}*.cache && \ diff --git a/docker/windows/prepare_cerbero_env.sh b/docker/windows/prepare_cerbero_env.sh index 7eafd2eb71..da94acabb3 100644 --- a/docker/windows/prepare_cerbero_env.sh +++ b/docker/windows/prepare_cerbero_env.sh @@ -12,11 +12,11 @@ echo 'vs_install_path = "C:/BuildTools"' >> localconf.cbc echo 'vs_install_version = "vs15"' >> localconf.cbc # Fetch all bootstrap requirements -./cerbero-uninstalled -t -c localconf.cbc -c config/win64.cbc fetch-bootstrap +./cerbero-uninstalled -t -c localconf.cbc -c config/win64.cbc fetch-bootstrap --jobs=4 # Fetch all package requirements for a mingw gstreamer build -./cerbero-uninstalled -t -c localconf.cbc -c config/win64.cbc fetch-package gstreamer-1.0 +./cerbero-uninstalled -t -c localconf.cbc -c config/win64.cbc fetch-package --jobs=4 gstreamer-1.0 # Fetch all package requirements for a visualstudio gstreamer build -./cerbero-uninstalled -t -v visualstudio -c localconf.cbc -c config/win64.cbc fetch-package gstreamer-1.0 +./cerbero-uninstalled -t -v visualstudio -c localconf.cbc -c config/win64.cbc fetch-package --jobs=4 gstreamer-1.0 # Fixup the MSYS installation ./cerbero-uninstalled -t -c localconf.cbc -c config/win64.cbc bootstrap -y --build-tools=no --toolchains=no --offline diff --git a/gitlab/cerbero_setup.sh b/gitlab/cerbero_setup.sh index fbf164faa7..96fc7390df 100644 --- a/gitlab/cerbero_setup.sh +++ b/gitlab/cerbero_setup.sh @@ -120,8 +120,8 @@ cerbero_script() { show_ccache_sum $CERBERO $CERBERO_ARGS show-config - $CERBERO $CERBERO_ARGS fetch-bootstrap - $CERBERO $CERBERO_ARGS fetch-package --deps gstreamer-1.0 + $CERBERO $CERBERO_ARGS fetch-bootstrap --jobs=4 + $CERBERO $CERBERO_ARGS fetch-package --jobs=4 --deps gstreamer-1.0 du -sch "${CERBERO_SOURCES}" || true $CERBERO $CERBERO_ARGS fetch-cache --branch "${GST_UPSTREAM_BRANCH}" @@ -141,8 +141,8 @@ cerbero_deps_script() { show_ccache_sum $CERBERO $CERBERO_ARGS show-config - $CERBERO $CERBERO_ARGS fetch-bootstrap - $CERBERO $CERBERO_ARGS fetch-package --deps gstreamer-1.0 + $CERBERO $CERBERO_ARGS fetch-bootstrap --jobs=4 + $CERBERO $CERBERO_ARGS fetch-package --jobs=4 --deps gstreamer-1.0 $CERBERO $CERBERO_ARGS bootstrap --offline --system=no $CERBERO $CERBERO_ARGS build-deps --offline \ gstreamer-1.0 gst-plugins-base-1.0 gst-plugins-good-1.0 \