[PATCH 1/1] gitlab: use our own GRUB
Up to now we have been relying on openSUSE repositories for GRUB on arm and arm64 though we have included GRUB in our Docker image.
Use the GRUB included in our Docker image.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f5271dcd3..7b3b7117f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,13 +20,12 @@ 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 - - mkdir ~/grub2-arm - - ( cd ~/grub2-arm; wget -O - http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/s... | rpm2cpio | cpio -di ) - - mkdir ~/grub2-arm64 - - ( cd ~/grub2-arm64; wget -O - http://download.opensuse.org/ports/aarch64/distribution/leap/42.2/repo/oss/s... | rpm2cpio | cpio -di ) + - cp /opt/grub/grubriscv64.efi ~/grub_riscv64.efi + - cp /opt/grub/grubaa64.efi ~/grub_arm64.efi + - cp /opt/grub/grubarm.efi ~/grub_arm.efi
after_script: - - rm -rf ~/grub2* /tmp/uboot-test-hooks /tmp/venv + - rm -rf /tmp/uboot-test-hooks /tmp/venv script: # From buildman, exit code 129 means warnings only. If we've been asked to # use clang only do one configuration. -- 2.24.0
Use the same logic from 24df1b14f3ab to use our own GRUB binaries in Azure pipelines as well.
Signed-off-by: Tom Rini trini@konsulko.com --- .azure-pipelines.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index a0713dd66c0a..d235aecf1e75 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -252,10 +252,9 @@ jobs: 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 - mkdir ~/grub2-arm - cd ~/grub2-arm; wget -O - http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/s... | rpm2cpio | cpio -di - mkdir ~/grub2-arm64 - cd ~/grub2-arm64; wget -O - http://download.opensuse.org/ports/aarch64/distribution/leap/42.2/repo/oss/s... | rpm2cpio | cpio -di + cp /opt/grub/grubriscv64.efi ~/grub_riscv64.efi + cp /opt/grub/grubaa64.efi ~/grub_arm64.efi + cp /opt/grub/grubarm.efi ~/grub_arm.efi # the below corresponds to .gitlab-ci.yml "script" cd ${WORK_DIR} if [[ "${BUILDMAN}" != "" ]]; then @@ -280,7 +279,7 @@ jobs: fi; fi # the below corresponds to .gitlab-ci.yml "after_script" - rm -rf ~/grub2* /tmp/uboot-test-hooks /tmp/venv + rm -rf /tmp/uboot-test-hooks /tmp/venv EOF cat test.sh # make current directory writeable to uboot user inside the container
On Fri, Feb 07, 2020 at 11:46:59AM -0500, Tom Rini wrote:
Use the same logic from 24df1b14f3ab to use our own GRUB binaries in Azure pipelines as well.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
On Thu, Dec 19, 2019 at 01:30:32PM +0100, Heinrich Schuchardt wrote:
Up to now we have been relying on openSUSE repositories for GRUB on arm and arm64 though we have included GRUB in our Docker image.
Use the GRUB included in our Docker image.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
Applied to u-boot/master, thanks!
participants (2)
-
Heinrich Schuchardt -
Tom Rini