- Update to version git master (10.2):
* Add support for GZIP and ZSTD module compression * Always pad the EFI image when calculating the hash * Version bump to 10.2 * approach issue#22 false noarch subpackage - drop pesign-obs-integration-bsc1183747-always-pad-efi-images.patch pesign-obs-integration-support-gzip-zstd-compression.patch (merged) OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=105
This commit is contained in:
Git OBS Bridge
parent
c932fb72d2
commit
f7fb3783bc
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/openSUSE/pesign-obs-integration.git</param>
|
||||
<param name="changesrevision">d64b3f6f8d82e6006c9290aecedd412789eda6f9</param></service></servicedata>
|
||||
<param name="changesrevision">b23d9018134eb505961917f165f9e39ff4829576</param></service></servicedata>
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9b994790eccd121c556d44bc68fce7f5e996fe1234a7f39ef53c62c42599dde2
|
||||
size 37206
|
||||
oid sha256:74c1f0a1a9f64083abd698802574c498d18995bc22a9f6f0a3f76b46c222c3b3
|
||||
size 37954
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 8177d2b826f848dd3feb4be28ed3c024d6cb7f43 Mon Sep 17 00:00:00 2001
|
||||
From: Gary Lin <glin@suse.com>
|
||||
Date: Fri, 19 Mar 2021 11:41:49 +0800
|
||||
Subject: [PATCH] Always pad the EFI image when calculating the hash
|
||||
|
||||
Fix bsc#1183747
|
||||
|
||||
Signed-off-by: Gary Lin <glin@suse.com>
|
||||
---
|
||||
pesign-repackage.spec.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pesign-repackage.spec.in b/pesign-repackage.spec.in
|
||||
index 76732b5..ccb35af 100644
|
||||
--- a/pesign-repackage.spec.in
|
||||
+++ b/pesign-repackage.spec.in
|
||||
@@ -139,7 +139,7 @@ for sig in "${sigs[@]}"; do
|
||||
pesign -n "$nss_db" -c cert -i "$f" -o "$f.tmp" -d sha256 -I "${infile}.sattrs" -R "$sig"
|
||||
rm -f "${infile}.sattrs"
|
||||
mv "$f.tmp" "$f"
|
||||
- nhash=$(pesign -n "$nss_db" -h -i "$f")
|
||||
+ nhash=$(pesign -n "$nss_db" -h -P -i "$f")
|
||||
if test "$ohash" != "$nhash" ; then
|
||||
echo "hash mismatch error: $ohash $nhash"
|
||||
exit 1
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
From b23d9018134eb505961917f165f9e39ff4829576 Mon Sep 17 00:00:00 2001
|
||||
From: Callum Farmer <gmbr3@opensuse.org>
|
||||
Date: Fri, 4 Jun 2021 20:31:00 +0100
|
||||
Subject: [PATCH] Add support for GZIP and ZSTD module compression
|
||||
|
||||
Written based on https://github.com/torvalds/linux/blob/master/scripts/Makefile.modinst
|
||||
---
|
||||
README | 2 +-
|
||||
brp-99-pesign | 4 ++++
|
||||
pesign-gen-repackage-spec | 21 +++++++++++++++++----
|
||||
3 files changed, 22 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/README b/README
|
||||
index 32afb8f..aaa5da0 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -38,7 +38,7 @@ in debian/rules to use the fully automated helper.
|
||||
Consult the dh_signobs manpage for more information.
|
||||
|
||||
When BRP_PESIGN_COMPRESS_MODULE is passed, the script tries to compress the
|
||||
-kernel modules at the repackaging phase. Currently only xz format is supported.
|
||||
+kernel modules at the repackaging phase. Currently xz, gzip and zstd format is supported.
|
||||
For enable the compression feature, put the following along with
|
||||
BRP_PESIGN_FILES setup:
|
||||
|
||||
diff --git a/brp-99-pesign b/brp-99-pesign
|
||||
index c2492b3..4408f6d 100644
|
||||
--- a/brp-99-pesign
|
||||
+++ b/brp-99-pesign
|
||||
@@ -60,6 +60,10 @@ fi
|
||||
|
||||
if test "${BRP_PESIGN_COMPRESS_MODULE}" = "xz"; then
|
||||
pesign_repackage_compress="--compress xz"
|
||||
+elif test "${BRP_PESIGN_COMPRESS_MODULE}" = "gzip"; then
|
||||
+ pesign_repackage_compress="--compress gzip"
|
||||
+elif test "${BRP_PESIGN_COMPRESS_MODULE}" = "zstd"; then
|
||||
+ pesign_repackage_compress="--compress zstd"
|
||||
else
|
||||
pesign_repackage_compress=""
|
||||
fi
|
||||
diff --git a/pesign-gen-repackage-spec b/pesign-gen-repackage-spec
|
||||
index 8a1fe39..c01fa2d 100755
|
||||
--- a/pesign-gen-repackage-spec
|
||||
+++ b/pesign-gen-repackage-spec
|
||||
@@ -392,7 +392,20 @@ my %verifyflags = (
|
||||
sub print_files {
|
||||
my $files = shift;
|
||||
my @tocompress;
|
||||
-
|
||||
+ my $compress_ext = "";
|
||||
+ my $compress_cmd = "";
|
||||
+
|
||||
+ if ($compress eq "xz") {
|
||||
+ $compress_ext = ".xz";
|
||||
+ $compress_cmd = "xz --lzma2=dict=2MiB -f";
|
||||
+ } elsif ($compress eq "gzip") {
|
||||
+ $compress_ext = ".gz";
|
||||
+ $compress_cmd = "gzip -n -f";
|
||||
+ } elsif ($compress eq "zstd") {
|
||||
+ $compress_ext = ".zst";
|
||||
+ $compress_cmd = "zstd -T0 --rm -f -q";
|
||||
+ }
|
||||
+
|
||||
for my $f (@$files) {
|
||||
my $path = "$directory/$f->{name}";
|
||||
my $attrs = "";
|
||||
@@ -444,12 +457,12 @@ sub print_files {
|
||||
$attrs .= "%verify(not $verify_attrs) ";
|
||||
}
|
||||
|
||||
- if ($compress eq "xz" &&
|
||||
+ if ($compress ne "" &&
|
||||
$f->{name} =~ /\.ko$/ && S_ISREG($f->{mode})) {
|
||||
chmod($f->{mode}, $path);
|
||||
utime($f->{mtime}, $f->{mtime}, $path);
|
||||
push(@tocompress, $path);
|
||||
- print SPEC "$attrs " . quote($f->{name}) . ".xz\n";
|
||||
+ print SPEC "$attrs " . quote($f->{name}) . "$compress_ext\n";
|
||||
} else {
|
||||
print SPEC "$attrs " . quote($f->{name}) . "\n";
|
||||
}
|
||||
@@ -464,7 +477,7 @@ sub print_files {
|
||||
open(M, '>', $m) or die "$m: $!\n";
|
||||
print M join("\n", @tocompress);
|
||||
close(M);
|
||||
- system("xargs -a $m -t -P 4 -n 1 xz -f");
|
||||
+ system("xargs -a $m -t -P 4 -n 1 $compress_cmd");
|
||||
unlink($m);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 23 09:11:28 UTC 2021 - dmueller@suse.com
|
||||
|
||||
- Update to version git master (10.2):
|
||||
* Add support for GZIP and ZSTD module compression
|
||||
* Always pad the EFI image when calculating the hash
|
||||
* Version bump to 10.2
|
||||
* approach issue#22 false noarch subpackage
|
||||
- drop pesign-obs-integration-bsc1183747-always-pad-efi-images.patch
|
||||
pesign-obs-integration-support-gzip-zstd-compression.patch (merged)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 21 03:23:54 UTC 2021 - Gary Ching-Pang Lin <glin@suse.com>
|
||||
|
||||
|
||||
@ -25,8 +25,6 @@ License: GPL-2.0-only
|
||||
Group: Development/Tools/Other
|
||||
URL: https://en.opensuse.org/openSUSE:UEFI_Image_File_Sign_Tools
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
Patch1: pesign-obs-integration-bsc1183747-always-pad-efi-images.patch
|
||||
Patch2: pesign-obs-integration-support-gzip-zstd-compression.patch
|
||||
Patch3: pesign-kernel-in-lib.diff
|
||||
BuildRequires: openssl
|
||||
Requires: fipscheck
|
||||
|
||||
Loading…
Reference in New Issue
Block a user