[v2,linux-signed] [EOAN UBUNTU: enable secureboot signing on s390x.
diff mbox series

Message ID 20190717121427.23797-1-xnox@ubuntu.com
State New
Headers show
Series
  • [v2,linux-signed] [EOAN UBUNTU: enable secureboot signing on s390x.
Related show

Commit Message

Dimitri John Ledkov July 17, 2019, 12:14 p.m. UTC
Bug-Link: https://bugs.launchpad.net/bugs/1829749

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
---
 changes since v1:
 - fix typpo, missing ';' after done

 Test build completed in
 https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3755
 
 debian/control.stub | 6 +++---
 debian/rules        | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

Comments

Seth Forshee July 17, 2019, 7:11 p.m. UTC | #1
On Wed, Jul 17, 2019 at 01:14:27PM +0100, Dimitri John Ledkov wrote:
> Bug-Link: https://bugs.launchpad.net/bugs/1829749
> 
> Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>

Also looks correct to me, but would like Andy's review as well.

Thanks,
Seth
Andy Whitcroft July 18, 2019, 2:31 p.m. UTC | #2
On Wed, Jul 17, 2019 at 01:14:27PM +0100, Dimitri John Ledkov wrote:
> Bug-Link: https://bugs.launchpad.net/bugs/1829749
> 
> Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
> ---
>  changes since v1:
>  - fix typpo, missing ';' after done
> 
>  Test build completed in
>  https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3755
>  
>  debian/control.stub | 6 +++---
>  debian/rules        | 8 +++++++-
>  2 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/debian/control.stub b/debian/control.stub
> index a4b98d6..b998763 100644
> --- a/debian/control.stub
> +++ b/debian/control.stub
> @@ -13,7 +13,7 @@ Build-Depends-Arch:
>  Standards-Version: 3.9.4
>  
>  Package: linux-image-ABI-generic
> -Architecture: amd64 arm64 ppc64el
> +Architecture: amd64 arm64 ppc64el s390x
>  Depends: ${unsigned:Depends}
>  Recommends: ${unsigned:Recommends}
>  Suggests: ${unsigned:Suggests}
> @@ -41,7 +41,7 @@ Package-Type: udeb
>  Section: debian-installer
>  Priority: extra
>  Provides: kernel-signed-image
> -Architecture: amd64 arm64 ppc64el
> +Architecture: amd64 arm64 ppc64el s390x
>  Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
>  Description: Signed kernel image generic for the Debian installer
>   A kernel image for generic.  This version of it is signed with
> @@ -50,7 +50,7 @@ Description: Signed kernel image generic for the Debian installer
>  
>  Package: linux-image-ABI-generic-dbgsym
>  Section: devel
> -Architecture: amd64 arm64 ppc64el
> +Architecture: amd64 arm64 ppc64el s390x
>  Depends: linux-image-unsigned-ABI-generic-dbgsym
>  Description: Signed kernel image generic
>   A link to the debugging symbols for the generic signed kernel.
> diff --git a/debian/rules b/debian/rules
> index 69f2678..7541a54 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -60,7 +60,13 @@ override_dh_auto_build:
>  			[ ! -f "$$s" ] && continue;				\
>  			chmod 600 "$$s";					\
>  			base=$$(echo "$$s" | sed -e 's/.opal.sig//');		\
> -			cat "$$base.opal" "$$s" >"../SIGNED/$$base";\
> +			cat "$$base.opal" "$$s" >"../SIGNED/$$base";		\
> +		done;								\
> +		for s in *.sipl.sig; do						\
> +			[ ! -f "$$s" ] && continue;				\
> +			chmod 600 "$$s";					\
> +			base=$$(echo "$$s" | sed -e 's/.sipl.sig//');		\
> +			cat "$$base.sipl" "$$s" >"../SIGNED/$$base";		\
>  		done								\
>  	)

Looks about right.

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw
Seth Forshee Aug. 20, 2019, 9:11 p.m. UTC | #3
On Wed, Jul 17, 2019 at 01:14:27PM +0100, Dimitri John Ledkov wrote:
> Bug-Link: https://bugs.launchpad.net/bugs/1829749
> 
> Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>

Applied to eoan and unstable, thanks!

Patch
diff mbox series

diff --git a/debian/control.stub b/debian/control.stub
index a4b98d6..b998763 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -13,7 +13,7 @@  Build-Depends-Arch:
 Standards-Version: 3.9.4
 
 Package: linux-image-ABI-generic
-Architecture: amd64 arm64 ppc64el
+Architecture: amd64 arm64 ppc64el s390x
 Depends: ${unsigned:Depends}
 Recommends: ${unsigned:Recommends}
 Suggests: ${unsigned:Suggests}
@@ -41,7 +41,7 @@  Package-Type: udeb
 Section: debian-installer
 Priority: extra
 Provides: kernel-signed-image
-Architecture: amd64 arm64 ppc64el
+Architecture: amd64 arm64 ppc64el s390x
 Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION)
 Description: Signed kernel image generic for the Debian installer
  A kernel image for generic.  This version of it is signed with
@@ -50,7 +50,7 @@  Description: Signed kernel image generic for the Debian installer
 
 Package: linux-image-ABI-generic-dbgsym
 Section: devel
-Architecture: amd64 arm64 ppc64el
+Architecture: amd64 arm64 ppc64el s390x
 Depends: linux-image-unsigned-ABI-generic-dbgsym
 Description: Signed kernel image generic
  A link to the debugging symbols for the generic signed kernel.
diff --git a/debian/rules b/debian/rules
index 69f2678..7541a54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,13 @@  override_dh_auto_build:
 			[ ! -f "$$s" ] && continue;				\
 			chmod 600 "$$s";					\
 			base=$$(echo "$$s" | sed -e 's/.opal.sig//');		\
-			cat "$$base.opal" "$$s" >"../SIGNED/$$base";\
+			cat "$$base.opal" "$$s" >"../SIGNED/$$base";		\
+		done;								\
+		for s in *.sipl.sig; do						\
+			[ ! -f "$$s" ] && continue;				\
+			chmod 600 "$$s";					\
+			base=$$(echo "$$s" | sed -e 's/.sipl.sig//');		\
+			cat "$$base.sipl" "$$s" >"../SIGNED/$$base";		\
 		done								\
 	)