From patchwork Mon Jul 13 10:04:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 241402 List-Id: U-Boot discussion From: xypron.glpk at gmx.de (Heinrich Schuchardt) Date: Mon, 13 Jul 2020 12:04:52 +0200 Subject: [PATCH 1/1] .gitlab-ci.yml: copy GRUB to correct build path Message-ID: <20200713100452.17371-1-xypron.glpk@gmx.de> The GRUB binaries are expected in $UBOOT_TRAVIS_BUILD_DIR. Signed-off-by: Heinrich Schuchardt --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.27.0 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0746955b4..e7e9dc96b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,6 @@ stages: - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` - grub-mkimage --prefix="" -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - grub-mkimage --prefix="" -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - - cp /opt/grub/grubriscv64.efi ~/grub_riscv64.efi - - cp /opt/grub/grubriscv32.efi ~/grub_riscv32.efi - - cp /opt/grub/grubaa64.efi ~/grub_arm64.efi - - cp /opt/grub/grubarm.efi ~/grub_arm.efi - if [[ "${TEST_PY_BD}" == "qemu-riscv32_spl" ]]; then wget -O - https://github.com/riscv/opensbi/releases/download/v0.6/opensbi-0.6-rv32-bin.tar.xz | tar -C /tmp -xJ; export OPENSBI=/tmp/opensbi-0.6-rv32-bin/platform/qemu/virt/firmware/fw_dynamic.bin; @@ -38,6 +34,12 @@ stages: script: # If we've been asked to use clang only do one configuration. - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD} + - cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/; + - cp ~/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/; + - cp /opt/grub/grubriscv64.efi $UBOOT_TRAVIS_BUILD_DIR/grub_riscv64.efi + - cp /opt/grub/grubriscv32.efi $UBOOT_TRAVIS_BUILD_DIR/grub_riscv32.efi + - cp /opt/grub/grubaa64.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm64.efi + - cp /opt/grub/grubarm.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm.efi - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board ${TEST_PY_BD} ${OVERRIDE} - virtualenv -p /usr/bin/python3 /tmp/venv