From 43ca0c2f735d4433bb95ffb5b6465046920f0144 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Mon, 25 Nov 2019 11:46:51 +0100 Subject: Linux 5.4 - Disable cert for ppc adn s390 (let upstream fix it for us) --- kernel.spec | 10 +++++----- sources | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kernel.spec b/kernel.spec index 0c7db62d3..7222eea3a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -24,7 +24,7 @@ Summary: The Linux kernel # For rawhide and/or a kernel built from an rc or git snapshot, # released_kernel should be 0. # For a stable, released kernel, released_kernel should be 1. -%global released_kernel 0 +%global released_kernel 1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -85,7 +85,7 @@ Summary: The Linux kernel # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%define base_sublevel 3 +%define base_sublevel 4 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -110,7 +110,7 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 8 +%global rcrev 1 # The git snapshot level %define gitrev 1 # Set rpm version accordingly @@ -609,8 +609,8 @@ Source11: x509.genkey.fedora Source12: securebootca.cer Source13: secureboot.cer -Source14: secureboot_s390.cer -Source15: secureboot_ppc.cer +#Source14: secureboot_s390.cer +#Source15: secureboot_ppc.cer %define secureboot_ca %{SOURCE12} %ifarch x86_64 aarch64 diff --git a/sources b/sources index 4de411495..302ffe6b7 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d -SHA512 (patch-5.4-rc8.xz) = 41766518ed994c6d39571015f48345c3f6fff1f83c8b54d78fe2288f6b8475d30a060ac5d96e16b7fdcba95854d37195ac137c21c71ae2b4d0b4dd5f46758e8b -SHA512 (patch-5.4-rc8-git1.xz) = 3fe22d1d7addea529fc71904aec0bb9e30e6d57bef83bb209a7775e2ea849e7c642f7cb62a314c396af8880a8532cf8a0144850f43c13a3c6a4852b8741294e1 +SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -- cgit