diff --git a/efi-lockdown.patch b/efi-lockdown.patch index a12721802..09b89db58 100644 --- a/efi-lockdown.patch +++ b/efi-lockdown.patch @@ -669,7 +669,7 @@ index a6e43a5806a1..9c1709a05037 100644 - } - /* Not having a signature is only an error if we're strict. */ -- if (err == -ENOKEY && !sig_enforce) +- if (err == -ENOKEY && !is_module_sig_enforced()) - err = 0; + /* We don't permit modules to be loaded into trusted kernels + * without a valid signature on them, but if we're not diff --git a/kernel.spec b/kernel.spec index f7a791b8d..8be2ee0ff 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ 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 0 +%global rcrev 1 # The git snapshot level -%define gitrev 10 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1839,6 +1839,9 @@ fi # # %changelog +* Mon Jun 18 2018 Laura Abbott - 4.18.0-0.rc1.git0.1 +- Linux v4.18-rc1 + * Mon Jun 18 2018 Laura Abbott - Disable debugging options. diff --git a/sources b/sources index aa7b1887c..96cfa17da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db -SHA512 (patch-4.17-git10.xz) = fc298834d6d7c256e24533108c05346f4334f8b42aa5c26229c5313678679516d8948c80458552a93651e943b31f6d4022dfad205578ca14cfb061b648c0a060 +SHA512 (patch-4.18-rc1.xz) = ead128244b67261c538b6e183eae2c8a33de3a335f6d3fee677e3c30c2345df13732140335060038537320c39716dca0ce2a7e379b30db827c8d7ea6c2fff6e3