folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[main] Add kernel support for Dell devices (#2671) 

* update kernel to support Dell devices

* update signature

Co-authored-by: Henry Li <lihl@microsoft.com>
This commit is contained in:
Henry Li 2022-04-08 16:08:13 -07:00 committed by GitHub
parent 4e3fbabd84
commit b2bf426721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPECS-SIGNED/kernel-signed/kernel-signed.spec
View File

@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.15.26.1
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld
%changelog
* Tue Apr 05 2022 Henry Li <lihl@microsoft.com> - 5.15.26.1-4
- Bump release number to match kernel release
* Mon Mar 28 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.26.1-3
- Bump release number to match kernel release

5
SPECS/kernel-headers/kernel-headers.spec
View File

@ -1,7 +1,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.15.26.1
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -37,6 +37,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/*
%changelog
* Tue Apr 05 2022 Henry Li <lihl@microsoft.com> - 5.15.26.1-4
- Bump release number to match kernel release
* Mon Mar 28 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.26.1-3
- Bump release number to match kernel release

15
SPECS/kernel-rt/config
View File

@ -5721,7 +5721,20 @@ CONFIG_MXM_WMI=m
# CONFIG_ASUS_WMI is not set
# CONFIG_MERAKI_MX100 is not set
# CONFIG_EEEPC_LAPTOP is not set
# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PLATFORM_DRIVERS_DELL=y
# CONFIG_ALIENWARE_WMI is not set
CONFIG_DCDBAS=m
# CONFIG_DELL_LAPTOP is not set
CONFIG_DELL_RBU=m
CONFIG_DELL_SMBIOS=m
CONFIG_DELL_SMBIOS_WMI=y
CONFIG_DELL_SMBIOS_SMM=y
CONFIG_DELL_SMO8800=m
# CONFIG_DELL_WMI is not set
CONFIG_DELL_WMI_AIO=m
CONFIG_DELL_WMI_DESCRIPTOR=m
# CONFIG_DELL_WMI_LED is not set
# CONFIG_DELL_WMI_SYSMAN is not set
# CONFIG_FUJITSU_LAPTOP is not set
# CONFIG_FUJITSU_TABLET is not set
# CONFIG_GPD_POCKET_FAN is not set

2
SPECS/kernel-rt/kernel-rt.signatures.json
View File

@ -1,7 +1,7 @@
{
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "e5702b601436a75c5250a6460ba022b76ea58717ac3166ba278027d3456cdfb6",
"config": "816a4054128ea59fbe2b25f6ebe9902fe9dc600f9027f9f7e2ab169decaefddb",
"kernel-5.15.26.1.tar.gz": "2cbcede7448516beb64a94220bf1b60937956a433cecd7a0ecb244e1bfeeae21",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f"
}

5
SPECS/kernel-rt/kernel-rt.spec
View File

@ -5,7 +5,7 @@
Summary: Realtime Linux Kernel
Name: kernel-rt
Version: 5.15.26.1
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -349,6 +349,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Tue Apr 05 2022 Henry Li <lihl@microsoft.com> - 5.15.26.1-4
- Add Dell devices support
* Mon Mar 28 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.26.1-3
- Remove hardcoded mariner.pem from configs and instead insert during
the build phase

15
SPECS/kernel/config
View File

@ -5738,7 +5738,20 @@ CONFIG_MXM_WMI=m
# CONFIG_ASUS_WMI is not set
# CONFIG_MERAKI_MX100 is not set
# CONFIG_EEEPC_LAPTOP is not set
# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PLATFORM_DRIVERS_DELL=y
# CONFIG_ALIENWARE_WMI is not set
CONFIG_DCDBAS=m
# CONFIG_DELL_LAPTOP is not set
CONFIG_DELL_RBU=m
CONFIG_DELL_SMBIOS=m
CONFIG_DELL_SMBIOS_WMI=y
CONFIG_DELL_SMBIOS_SMM=y
CONFIG_DELL_SMO8800=m
# CONFIG_DELL_WMI is not set
CONFIG_DELL_WMI_AIO=m
CONFIG_DELL_WMI_DESCRIPTOR=m
# CONFIG_DELL_WMI_LED is not set
# CONFIG_DELL_WMI_SYSMAN is not set
# CONFIG_FUJITSU_LAPTOP is not set
# CONFIG_FUJITSU_TABLET is not set
# CONFIG_GPD_POCKET_FAN is not set

2
SPECS/kernel/kernel.signatures.json
View File

@ -1,7 +1,7 @@
{
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "f6791eb451cf5c7a0bb4dce044cd9a3aa40d0520944d1bafd82b360449dc3d22",
"config": "3df3e14c34a95e8d4a1565a0a75cb7bddf4347a0b194bf4bb08807f210850184",
"config_aarch64": "b5bdb8db704121cf546d37bb67ef58b7548c1064c7913116abf8074834f21c83",
"kernel-5.15.26.1.tar.gz": "2cbcede7448516beb64a94220bf1b60937956a433cecd7a0ecb244e1bfeeae21",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f"

5
SPECS/kernel/kernel.spec
View File

@ -7,7 +7,7 @@
Summary: Linux Kernel
Name: kernel
Version: 5.15.26.1
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -407,6 +407,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Tue Apr 05 2022 Henry Li <lihl@microsoft.com> - 5.15.26.1-4
- Add Dell devices support
* Mon Mar 28 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.26.1-3
- Remove hardcoded mariner.pem from configs and instead insert during
the build phase

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.aarch64.rpm
kernel-headers-5.15.26.1-3.cm2.noarch.rpm
kernel-headers-5.15.26.1-4.cm2.noarch.rpm
glibc-2.34-3.cm2.aarch64.rpm
glibc-devel-2.34-3.cm2.aarch64.rpm
glibc-i18n-2.34-3.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.x86_64.rpm
kernel-headers-5.15.26.1-3.cm2.noarch.rpm
kernel-headers-5.15.26.1-4.cm2.noarch.rpm
glibc-2.34-3.cm2.x86_64.rpm
glibc-devel-2.34-3.cm2.x86_64.rpm
glibc-i18n-2.34-3.cm2.x86_64.rpm

2
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -134,7 +134,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.aarch64.rpm
kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
kernel-headers-5.15.26.1-3.cm2.noarch.rpm
kernel-headers-5.15.26.1-4.cm2.noarch.rpm
kmod-29-1.cm2.aarch64.rpm
kmod-debuginfo-29-1.cm2.aarch64.rpm
kmod-devel-29-1.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -134,7 +134,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.x86_64.rpm
kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
kernel-headers-5.15.26.1-3.cm2.noarch.rpm
kernel-headers-5.15.26.1-4.cm2.noarch.rpm
kmod-29-1.cm2.x86_64.rpm
kmod-debuginfo-29-1.cm2.x86_64.rpm
kmod-devel-29-1.cm2.x86_64.rpm