Fix kernel aarch64 package build break due to missing CONFIG_IMA_KEXEC (

#171)
microsoft · Oct 3, 2020 · 6e9a239 · 6e9a239
1 parent 563639e
commit 6e9a239
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec b/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec
@@ -2,7 +2,7 @@
 Summary:        Signed Linux Kernel for aarch64 systems
 Name:           kernel-signed-aarch64
 Version:        5.4.51
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPLv2
 URL:            https://github.com/microsoft/WSL2-Linux-Kernel
 Group:          System Environment/Kernel
@@ -85,6 +85,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
 
 %changelog
+*   Fri Oct 02 2020 Chris Co <[email protected]> 5.4.51-9
+-   Update release number
 *   Wed Sep 30 2020 Emre Girgin <[email protected]> 5.4.51-8
 -   Update postun script to deal with removal in case of another installed kernel.
 *   Fri Sep 25 2020 Suresh Babu Chalamalasetty <[email protected]> 5.4.51-7

diff --git a/SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec b/SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec
@@ -2,7 +2,7 @@
 Summary:        Signed Linux Kernel for x86_64 systems
 Name:           kernel-signed-x64
 Version:        5.4.51
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPLv2
 URL:            https://github.com/microsoft/WSL2-Linux-Kernel
 Group:          System Environment/Kernel
@@ -85,6 +85,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
 
 %changelog
+*   Fri Oct 02 2020 Chris Co <[email protected]> 5.4.51-9
+-   Update release number
 *   Wed Sep 30 2020 Emre Girgin <[email protected]> 5.4.51-8
 -   Update postun script to deal with removal in case of another installed kernel.
 *   Fri Sep 25 2020 Suresh Babu Chalamalasetty <[email protected]> 5.4.51-7

diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64
@@ -6291,6 +6291,7 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
 CONFIG_INTEGRITY_AUDIT=y
 CONFIG_IMA=y
+# CONFIG_IMA_KEXEC is not set
 CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_LSM_RULES=y
 # CONFIG_IMA_TEMPLATE is not set

diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json
@@ -1,7 +1,7 @@
 {
  "Signatures": {
   "config": "f01b1c109f869c92acd3ecb693420891f3480ec0f91663e6168bb19ebf7d4a83",
-  "config_aarch64": "5405f228f0da37ad2460047c83930f89d76f7697fd3835848ef2092587d78104",
+  "config_aarch64": "3057cf5c5f04b57c4d69f9783d4809de217fb46a4278694c19f6c3ffd81249c5",
   "linux-msft-5.4.51.tar.gz": "3bcd6b09e952fac4f708614658b508ce80c8e25c04780b6b44a481b1479a08e7"
  }
 }
diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec
@@ -2,7 +2,7 @@
 Summary:        Linux Kernel
 Name:           kernel
 Version:        5.4.51
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPLv2
 URL:            https://github.com/microsoft/WSL2-Linux-Kernel
 Group:          System Environment/Kernel
@@ -333,6 +333,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %{_libdir}/perf/include/bpf/*
 
 %changelog
+*   Fri Oct 02 2020 Chris Co <[email protected]> 5.4.51-9
+-   Fix aarch64 build error
 *   Wed Sep 30 2020 Emre Girgin <[email protected]> 5.4.51-8
 -   Update postun script to deal with removal in case of another installed kernel.
 *   Fri Sep 25 2020 Suresh Babu Chalamalasetty <[email protected]> 5.4.51-7