On 13.07.20 16:06, Tom Rini wrote: > On Mon, Jul 13, 2020 at 12:04:52PM +0200, Heinrich Schuchardt wrote: > >> The GRUB binaries are expected in $UBOOT_TRAVIS_BUILD_DIR. >> >> Signed-off-by: Heinrich Schuchardt <[email protected]> >> --- >> .gitlab-ci.yml | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> 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 > > Nice catch. Does azure or travis-ci have the same issue? The azure > file is based heavily on the gitlab one is why I ask. Thanks! >
A similar change is need for Azure. In Travis there seems to be a bug too: https://travis-ci.org/github/xypron2/u-boot/jobs/707245272 cp: cannot create regular file '/home/travis/build/xypron2/qemu_arm64/': Not a directory cp: cannot create regular file '/home/travis/build/xypron2/qemu_arm64/': Not a directory cp: cannot create regular file '/home/travis/build/xypron2/qemu_arm64/': Not a directory I guess we have to add a mkdir or switch the sequence. Best regards Heinrich
