[v5,16/16] travis: add packages for UEFI secure boot test
diff mbox series

Message ID 20200128082532.15943-17-takahiro.akashi@linaro.org
State New
Delegated to: Heinrich Schuchardt
Headers show
Series
  • efi_loader: add secure boot support
Related show

Commit Message

AKASHI Takahiro Jan. 28, 2020, 8:25 a.m. UTC
Pytest for UEFI secure boot will use several host commands.
In particular, Test setup relies on efitools, whose version must be v1.5.2
or later. So fetch a new version of deb package directly.
Please note it has a dependency on mtools, which must also be installed
along wih efitools.

In addition, the path, '/sbin', is added to PATH for use of sgdisk and
mkfs.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 .travis.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Comments

Heinrich Schuchardt Feb. 23, 2020, 11:46 a.m. UTC | #1
On 1/28/20 9:25 AM, AKASHI Takahiro wrote:
> Pytest for UEFI secure boot will use several host commands.
> In particular, Test setup relies on efitools, whose version must be v1.5.2
> or later. So fetch a new version of deb package directly.
> Please note it has a dependency on mtools, which must also be installed
> along wih efitools.
>
> In addition, the path, '/sbin', is added to PATH for use of sgdisk and
> mkfs.
>
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

You are adding some packages here. Don't you need the same packages in
the Docker image used by Gitlab CI and Azure CI?

Cf. https://gitlab.denx.de/u-boot/gitlab-ci-runner

Best regards

Heinrich

> ---
>   .travis.yml | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 3991eb7716fb..f0fed6d4b790 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -38,6 +38,14 @@ addons:
>       - libisl15
>       - clang-7
>       - srecord
> +    - coreutils
> +    - util-linux
> +    - dosfstools
> +    - gdisk
> +    - mount
> +    - mtools
> +    - openssl
> +    - sbsigntool
>
>   install:
>    # Clone uboot-test-hooks
> @@ -58,10 +66,11 @@ install:
>    - mkdir ~/grub2-arm64
>    - ( cd ~/grub2-arm64; wget -O - http://download.opensuse.org/ports/aarch64/distribution/leap/42.2/repo/oss/suse/aarch64/grub2-arm64-efi-2.02~beta2-87.1.aarch64.rpm | rpm2cpio | cpio -di )
>    - wget http://mirrors.kernel.org/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.4-1_amd64.deb && sudo dpkg -i libmpfr4_3.1.4-1_amd64.deb && rm libmpfr4_3.1.4-1_amd64.deb
> + - wget http://mirrors.kernel.org/ubuntu/pool/universe/e/efitools/efitools_1.8.1-0ubuntu2_amd64.deb && sudo dpkg -i efitools_1.8.1-0ubuntu2_amd64.deb && rm efitools_1.8.1-0ubuntu2_amd64.deb
>
>   env:
>     global:
> -    - PATH=/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin:/usr/local/bin
> +    - PATH=/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:/sbin:/usr/bin:/bin:/usr/local/bin
>       - PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci
>       - BUILD_DIR=build
>       - HOSTCC="cc"
>
AKASHI Takahiro Feb. 25, 2020, 5:16 a.m. UTC | #2
On Sun, Feb 23, 2020 at 12:46:22PM +0100, Heinrich Schuchardt wrote:
> On 1/28/20 9:25 AM, AKASHI Takahiro wrote:
> > Pytest for UEFI secure boot will use several host commands.
> > In particular, Test setup relies on efitools, whose version must be v1.5.2
> > or later. So fetch a new version of deb package directly.
> > Please note it has a dependency on mtools, which must also be installed
> > along wih efitools.
> > 
> > In addition, the path, '/sbin', is added to PATH for use of sgdisk and
> > mkfs.
> > 
> > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> 
> You are adding some packages here. Don't you need the same packages in
> the Docker image used by Gitlab CI and Azure CI?

You're right, but I expect that Tom will take care of this
as far as he remembers that he has said so.

Thanks,
-Takahiro Akashi

> Cf. https://gitlab.denx.de/u-boot/gitlab-ci-runner
> 
> Best regards
> 
> Heinrich
> 
> > ---
> >   .travis.yml | 11 ++++++++++-
> >   1 file changed, 10 insertions(+), 1 deletion(-)
> > 
> > diff --git a/.travis.yml b/.travis.yml
> > index 3991eb7716fb..f0fed6d4b790 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -38,6 +38,14 @@ addons:
> >       - libisl15
> >       - clang-7
> >       - srecord
> > +    - coreutils
> > +    - util-linux
> > +    - dosfstools
> > +    - gdisk
> > +    - mount
> > +    - mtools
> > +    - openssl
> > +    - sbsigntool
> > 
> >   install:
> >    # Clone uboot-test-hooks
> > @@ -58,10 +66,11 @@ install:
> >    - mkdir ~/grub2-arm64
> >    - ( cd ~/grub2-arm64; wget -O - http://download.opensuse.org/ports/aarch64/distribution/leap/42.2/repo/oss/suse/aarch64/grub2-arm64-efi-2.02~beta2-87.1.aarch64.rpm | rpm2cpio | cpio -di )
> >    - wget http://mirrors.kernel.org/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.4-1_amd64.deb && sudo dpkg -i libmpfr4_3.1.4-1_amd64.deb && rm libmpfr4_3.1.4-1_amd64.deb
> > + - wget http://mirrors.kernel.org/ubuntu/pool/universe/e/efitools/efitools_1.8.1-0ubuntu2_amd64.deb && sudo dpkg -i efitools_1.8.1-0ubuntu2_amd64.deb && rm efitools_1.8.1-0ubuntu2_amd64.deb
> > 
> >   env:
> >     global:
> > -    - PATH=/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin:/usr/local/bin
> > +    - PATH=/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:/sbin:/usr/bin:/bin:/usr/local/bin
> >       - PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci
> >       - BUILD_DIR=build
> >       - HOSTCC="cc"
> > 
>

Patch
diff mbox series

diff --git a/.travis.yml b/.travis.yml
index 3991eb7716fb..f0fed6d4b790 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,14 @@  addons:
     - libisl15
     - clang-7
     - srecord
+    - coreutils
+    - util-linux
+    - dosfstools
+    - gdisk
+    - mount
+    - mtools
+    - openssl
+    - sbsigntool
 
 install:
  # Clone uboot-test-hooks
@@ -58,10 +66,11 @@  install:
  - mkdir ~/grub2-arm64
  - ( cd ~/grub2-arm64; wget -O - http://download.opensuse.org/ports/aarch64/distribution/leap/42.2/repo/oss/suse/aarch64/grub2-arm64-efi-2.02~beta2-87.1.aarch64.rpm | rpm2cpio | cpio -di )
  - wget http://mirrors.kernel.org/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.4-1_amd64.deb && sudo dpkg -i libmpfr4_3.1.4-1_amd64.deb && rm libmpfr4_3.1.4-1_amd64.deb
+ - wget http://mirrors.kernel.org/ubuntu/pool/universe/e/efitools/efitools_1.8.1-0ubuntu2_amd64.deb && sudo dpkg -i efitools_1.8.1-0ubuntu2_amd64.deb && rm efitools_1.8.1-0ubuntu2_amd64.deb
 
 env:
   global:
-    - PATH=/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin:/usr/local/bin
+    - PATH=/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:/sbin:/usr/bin:/bin:/usr/local/bin
     - PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci
     - BUILD_DIR=build
     - HOSTCC="cc"