diff mbox series

Dockerfile: update sbsigntools to v0.9.4

Message ID 20200721094558.1942-1-takahiro.akashi@linaro.org
State Accepted
Delegated to: Tom Rini
Headers show
Series Dockerfile: update sbsigntools to v0.9.4 | expand

Commit Message

AKASHI Takahiro July 21, 2020, 9:45 a.m. UTC 
This version of sbsigntools is a prerequisite in testing "intermediate
certificates" support as part of UEFI secure boot as I added '--addcert'
option to 'sbsign' command:

  ===
  commit 7d6210e4b1fd
  Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
  Date:   Thu Jun 4 16:50:22 2020 +0900

    sbsign: allow for adding intermediate certificates
  ===

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 Dockerfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Comments

Tom Rini July 22, 2020, 3:04 a.m. UTC | #1 
On Tue, Jul 21, 2020 at 06:45:58PM +0900, AKASHI Takahiro wrote:

> This version of sbsigntools is a prerequisite in testing "intermediate
> certificates" support as part of UEFI secure boot as I added '--addcert'
> option to 'sbsign' command:
> 
>   ===
>   commit 7d6210e4b1fd
>   Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
>   Date:   Thu Jun 4 16:50:22 2020 +0900
> 
>     sbsign: allow for adding intermediate certificates
>   ===
> 
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini Aug. 6, 2020, 1:57 p.m. UTC | #2 
On Tue, Jul 21, 2020 at 06:45:58PM +0900, AKASHI Takahiro wrote:

> This version of sbsigntools is a prerequisite in testing "intermediate
> certificates" support as part of UEFI secure boot as I added '--addcert'
> option to 'sbsign' command:
> 
>   ===
>   commit 7d6210e4b1fd
>   Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
>   Date:   Thu Jun 4 16:50:22 2020 +0900
> 
>     sbsign: allow for adding intermediate certificates
>   ===
> 
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to gitlab-ci-runner/master, thanks!
diff mbox series

Patch

diff --git a/Dockerfile b/Dockerfile
index 209e008b74b2..dfb61c6c705b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,6 +37,7 @@  RUN apt-get update && apt-get install -y \
 	automake \
 	autopoint \
 	bc \
+	binutils-dev \
 	bison \
 	build-essential \
 	clang-10 \
@@ -52,9 +53,11 @@  RUN apt-get update && apt-get install -y \
 	flex \
 	gdisk \
 	git \
+	gnu-efi \
 	graphviz \
 	grub-efi-amd64-bin \
 	grub-efi-ia32-bin \
+	help2man \
 	iasl \
 	imagemagick \
 	iputils-ping \
@@ -76,6 +79,7 @@  RUN apt-get update && apt-get install -y \
 	openssl \
 	picocom \
 	parted \
+	pkg-config \
 	python \
 	python-dev \
 	python-pip \
@@ -90,6 +94,7 @@  RUN apt-get update && apt-get install -y \
 	sudo \
 	swig \
 	util-linux \
+	uuid-dev \
 	virtualenv \
 	zip \
 	&& rm -rf /var/lib/apt/lists/*
@@ -100,6 +105,16 @@  RUN wget http://mirrors.kernel.org/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.4-1_amd
 # Manually install a new enough version of efitools (must be v1.5.2 or later)
 RUN 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
 
+# Manually install a new enough version of sbsigntools (must be v0.9.4 or later)
+RUN git clone https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git /tmp/sbsigntools && \
+	cd /tmp/sbsigntools && \
+	git checkout -b latest v0.9.4 && \
+	./autogen.sh && \
+	./configure && \
+	make && \
+	make install && \
+	rm -rf /tmp/sbsigntools
+
 # Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit
 RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
 	cd /tmp/grub && \