forked from pool/pesign-obs-integration
Accepting request 909397 from home:lnussel:usrmove
- Update to version 10.2+git20210730.0cb100c: * Sign kernel also in module dir (boo#1184804) - switch package to obs_scm to avoid recompression OBS-URL: https://build.opensuse.org/request/show/909397 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=107
This commit is contained in:
Joey Lee
Git OBS Bridge
parent
fc03531124
commit
2546eb045b
14
_service
14
_service
@ -1,17 +1,17 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<service name="obs_scm" mode="manual">
|
||||
<param name="url">https://github.com/openSUSE/pesign-obs-integration.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="revision">master</param>
|
||||
<param name="versionformat">10.2</param>
|
||||
<param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="extract">pesign-obs-integration.spec</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">pesign-obs-integration-*.tar</param>
|
||||
<service name="set_version" mode="manual"/>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="compression">gz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled">
|
||||
<param name="basename">pesign-obs-integration</param>
|
||||
<param name="file">*.tar</param>
|
||||
</service>
|
||||
</services>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/openSUSE/pesign-obs-integration.git</param>
|
||||
<param name="changesrevision">b23d9018134eb505961917f165f9e39ff4829576</param></service></servicedata>
|
||||
<param name="changesrevision">911a77299edc572c6dddab71769b580630f48452</param></service></servicedata>
|
||||
@ -1,72 +0,0 @@
|
||||
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 = ".";
|
||||
@@ -431,6 +433,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);
|
||||
@@ -438,7 +441,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);
|
||||
}
|
||||
}
|
||||
Index: pesign-obs-integration-10.2/brp-99-pesign
|
||||
===================================================================
|
||||
--- pesign-obs-integration-10.2.orig/brp-99-pesign
|
||||
+++ pesign-obs-integration-10.2/brp-99-pesign
|
||||
@@ -120,7 +120,7 @@ for f in "${files[@]}"; do
|
||||
dest="$archive_dir/$f"
|
||||
mkdir -p "${dest%/*}"
|
||||
case "$f" in
|
||||
- ./boot/* | *.efi)
|
||||
+ ./boot/* | *.efi.sig | */lib/modules/*/vmlinu[xz] | */lib/modules/*/[Ii]mage | */lib/modules/*/z[Ii]mage)
|
||||
if [ -f /usr/bin/pesign ]; then
|
||||
pesign --certdir="$nss_db" -i "$f" -E $dest
|
||||
else
|
||||
3
pesign-obs-integration-10.2+git20210730.0cb100c.obscpio
Normal file
3
pesign-obs-integration-10.2+git20210730.0cb100c.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:70bdd08c0800f599fdfd3ba58de4715d932e7fdd616751d566b219461dda0649
|
||||
size 130059
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:74c1f0a1a9f64083abd698802574c498d18995bc22a9f6f0a3f76b46c222c3b3
|
||||
size 37954
|
||||
@ -1,7 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 28 07:39:14 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
Fri Jul 30 11:56:23 UTC 2021 - lnussel@suse.de
|
||||
|
||||
- Fix signing of kernel in {,/usr}/lib/modules
|
||||
- Update to version 10.2+git20210730.0cb100c:
|
||||
* Sign kernel also in module dir (boo#1184804)
|
||||
- switch package to obs_scm to avoid recompression
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 23 09:11:28 UTC 2021 - dmueller@suse.com
|
||||
|
||||
5
pesign-obs-integration.obsinfo
Normal file
5
pesign-obs-integration.obsinfo
Normal file
@ -0,0 +1,5 @@
|
||||
name: pesign-obs-integration
|
||||
version: 10.2+git20210730.0cb100c
|
||||
mtime: 1627645859
|
||||
commit: 0cb100cd2fbd0ed7759526f41cd57a28e9223113
|
||||
|
||||
@ -18,14 +18,13 @@
|
||||
|
||||
|
||||
Name: pesign-obs-integration
|
||||
Version: 10.2
|
||||
Version: 10.2+git20210730.0cb100c
|
||||
Release: 0
|
||||
Summary: Macros and scripts to sign the kernel and bootloader
|
||||
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
|
||||
Patch: pesign-kernel-in-lib.diff
|
||||
BuildRequires: openssl
|
||||
Requires: fipscheck
|
||||
Requires: mozilla-nss-tools
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user