Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pesign-obs-integration for
openSUSE:Factory checked in at 2021-06-24 18:22:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pesign-obs-integration (Old)
and /work/SRC/openSUSE:Factory/.pesign-obs-integration.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pesign-obs-integration"
Thu Jun 24 18:22:24 2021 rev:44 rq:901652 version:10.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/pesign-obs-integration/pesign-obs-integration.changes
2021-03-29 18:21:16.798231678 +0200
+++
/work/SRC/openSUSE:Factory/.pesign-obs-integration.new.2625/pesign-obs-integration.changes
2021-06-24 18:22:38.232920411 +0200
@@ -1,0 +2,11 @@
+Mon Jun 21 03:23:54 UTC 2021 - Gary Ching-Pang Lin <[email protected]>
+
+- Add pesign-obs-integration-support-gzip-zstd-compression.patch
+ to support gzip and zstd module compression
+
+-------------------------------------------------------------------
+Fri Apr 23 09:34:17 UTC 2021 - Ludwig Nussel <[email protected]>
+
+- find kernel also in /lib (boo#1184804, pesign-kernel-in-lib.diff)
+
+-------------------------------------------------------------------
New:
----
pesign-kernel-in-lib.diff
pesign-obs-integration-support-gzip-zstd-compression.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pesign-obs-integration.spec ++++++
--- /var/tmp/diff_new_pack.y5a9jt/_old 2021-06-24 18:22:38.748920984 +0200
+++ /var/tmp/diff_new_pack.y5a9jt/_new 2021-06-24 18:22:38.748920984 +0200
@@ -26,6 +26,8 @@
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
Requires: mozilla-nss-tools
++++++ pesign-kernel-in-lib.diff ++++++
Index: pesign-obs-integration-10.2/brp-99-compress-vmlinux
===================================================================
--- pesign-obs-integration-10.2.orig/brp-99-compress-vmlinux
+++ pesign-obs-integration-10.2/brp-99-compress-vmlinux
@@ -11,6 +11,9 @@ kernel-*)
exit 0
esac
for f in $RPM_BUILD_ROOT/boot/vmlinux-*; do
+ if [ -L "$f" ]; then
+ f=`readlink -f "$f"`
+ fi
for compression in gz/gzip xz; do
if test -e "$f" -a -e "$f.${compression%/*}"; then
echo "${compression#*/} $f"
Index: pesign-obs-integration-10.2/pesign-repackage.spec.in
===================================================================
--- pesign-obs-integration-10.2.orig/pesign-repackage.spec.in
+++ pesign-obs-integration-10.2/pesign-repackage.spec.in
@@ -129,7 +129,7 @@ for sig in "${sigs[@]}"; do
*.ko.sig)
/usr/lib/rpm/pesign/kernel-sign-file -i pkcs7 -s "$sig" sha256
"$cert" "$f"
;;
- /boot/* | *.efi.sig)
+ /boot/* | *.efi.sig | */lib/modules/*/vmlinu[xz].sig |
*/lib/modules/*/[Ii]mage.sig | */lib/modules/*/z[Ii]mage.sig)
%ifarch %ix86 x86_64 aarch64 %arm
# PE style signature injection
infile=${sig%.sig}
Index: pesign-obs-integration-10.2/pesign-gen-repackage-spec
===================================================================
--- pesign-obs-integration-10.2.orig/pesign-gen-repackage-spec
+++ pesign-obs-integration-10.2/pesign-gen-repackage-spec
@@ -25,6 +25,8 @@ my $USAGE = "Usage: $0 --directory <payl
use Getopt::Long;
use Fcntl qw(:mode :seek);
+use File::Basename qw(dirname);
+use File::Path qw(make_path);
my $directory;
my $output = ".";
@@ -418,6 +420,7 @@ sub print_files {
if ($f->{flags} & $filetypes{ghost}) {
$attrs .= "%ghost ";
if (S_ISREG($f->{mode})) {
+ make_path(dirname($path));
open(my $fh, '>', $path) or die "$path: $!\n";
if ($f->{size} > 0) {
sysseek($fh, $f->{size} - 1, SEEK_SET);
@@ -425,7 +428,10 @@ sub print_files {
}
close($fh);
utime($f->{mtime}, $f->{mtime}, $path);
+ } elsif (S_ISDIR($f->{mode})) {
+ make_path($path);
} elsif (S_ISLNK($f->{mode})) {
+ make_path(dirname($path));
symlink($f->{target}, $path);
}
}
++++++ pesign-obs-integration-support-gzip-zstd-compression.patch ++++++
>From b23d9018134eb505961917f165f9e39ff4829576 Mon Sep 17 00:00:00 2001
From: Callum Farmer <[email protected]>
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
