e7dce62cd8
- Sync from git master directly - drop 0001-Add-support-for-kernel-module-compression.patch 0001-Enable-find_provides-and-requires.patch 0001-Initialize-compress-variable.patch 0001-Keep-the-files-in-the-OTHER-directory.patch 0001-Passthrough-license-tag.patch 0001-brp-99-compress-vmlinux-support-xz-compressed-vmlinu.patch 0001-sign-stage3.bin-from-s390-tools-with-sign-files-bsc-.patch pesign-sign-s390x-kernel.patch (upstream) - add parallel-compression.patch OBS-URL: https://build.opensuse.org/request/show/842009 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=94
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
Index: pesign-obs-integration/pesign-gen-repackage-spec
|
|
===================================================================
|
|
--- pesign-obs-integration.orig/pesign-gen-repackage-spec
|
|
+++ pesign-obs-integration/pesign-gen-repackage-spec
|
|
@@ -391,6 +391,7 @@ my %verifyflags = (
|
|
|
|
sub print_files {
|
|
my $files = shift;
|
|
+ my @tocompress;
|
|
|
|
for my $f (@$files) {
|
|
my $path = "$directory/$f->{name}";
|
|
@@ -445,9 +446,9 @@ sub print_files {
|
|
|
|
if ($compress eq "xz" &&
|
|
$f->{name} =~ /\.ko$/ && S_ISREG($f->{mode})) {
|
|
- system("xz", "-f", "-9", $path);
|
|
- chmod($f->{mode}, $path . ".xz");
|
|
- utime($f->{mtime}, $f->{mtime}, $path . ".xz");
|
|
+ chmod($f->{mode}, $path);
|
|
+ utime($f->{mtime}, $f->{mtime}, $path);
|
|
+ push(@tocompress, $path);
|
|
print SPEC "$attrs " . quote($f->{name}) . ".xz\n";
|
|
} else {
|
|
print SPEC "$attrs " . quote($f->{name}) . "\n";
|
|
@@ -457,6 +458,15 @@ sub print_files {
|
|
print SPEC "$attrs " . quote($f->{name}) . ".sig\n";
|
|
}
|
|
}
|
|
+
|
|
+ if ($#tocompress >= 0) {
|
|
+ my $m = "$output/modulelist.txt";
|
|
+ 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");
|
|
+ unlink($m);
|
|
+ }
|
|
}
|
|
|
|
my %packages;
|