Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-05-09 12:01:52 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-05-09 12:01:52 +0200
commit7dfd54ca3914e445c3dd803dfa7c2ed607981251 (patch)
tree386f26b9a5c782e6dc6ccf00635a874624eb6c4d
parentdf167b02fcc591a94c1e028d6b266eb594277518 (diff)
parentbac621c6704610562ebd9e74ae5ad85ca8025681 (diff)
Merge branch 'packaging' into linux-next
-rw-r--r--rpm/kernel-binary.spec.in30
1 files changed, 15 insertions, 15 deletions
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index 002662f174..9387f4aed4 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -474,21 +474,6 @@ done
%install
-# sign the modules, firmware and possibly the kernel in the buildservice
-BRP_PESIGN_FILES=""
-%if %CONFIG_EFI_STUB == "y"
-BRP_PESIGN_FILES="/boot/vmlinuz-%kernelrelease-%build_flavor"
-%endif
-%if %CONFIG_MODULE_SIG == "y"
-BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
-%endif
-%ifarch %ix86
-# XXX: do not sign on x86, as the repackaging changes kernel-pae
-# from i686 to i586
-BRP_PESIGN_FILES=""
-%endif
-export BRP_PESIGN_FILES
-
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
@@ -569,6 +554,21 @@ add_vmlinux()
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
%endif
+# sign the modules, firmware and possibly the kernel in the buildservice
+BRP_PESIGN_FILES=""
+%if %CONFIG_EFI_STUB == "y"
+BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
+%endif
+%if %CONFIG_MODULE_SIG == "y"
+BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
+%endif
+%ifarch %ix86
+# XXX: do not sign on x86, as the repackaging changes kernel-pae
+# from i686 to i586
+BRP_PESIGN_FILES=""
+%endif
+export BRP_PESIGN_FILES
+
if test -x /usr/lib/rpm/pesign/gen-hmac; then
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
fi