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

Update kernel source to 5.10.13.1 (#601) 

Move to the new CBL-Mariner kernel source location and use the latest
5.10.13.1 version.

As part of the upgrade to 5.10.13.1, we can remove some out-of-tree
patches since these patches have been merged into upstream.

Additionally, we need to account for the new location of module.lds
for aarch64 builds. The aarch64 module.lds is no longer checked in
as part of the source tree. See this upstream commit for more details:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=596b0474d3d9b1242eab713f84d8873f9887d980

Turn off CONFIG_GCC_PLUGIN_RANDSTRUCT protection. This struct
randomization is causing difficulty in parsing vmcore files.

Enable upstream smartpqi driver by default

Signed-off-by: Chris Co <chrco@microsoft.com>
This commit is contained in:
Christopher Co 2021-02-19 17:48:41 -08:00 committed by GitHub
parent 489118276a
commit aae537bbbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 2485 additions and 1097 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec
View File

@ -1,14 +1,14 @@
%global debug_package %{nil} %global debug_package %{nil}
%define uname_r %{version}-%{release} %define uname_r %{version}-rolling-lts-mariner-%{release}
Summary: Signed Linux Kernel for aarch64 systems Summary: Signed Linux Kernel for aarch64 systems
Name: kernel-signed-aarch64 Name: kernel-signed-aarch64
Version: 5.4.91 Version: 5.10.13.1
Release: 5%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
Group: System Environment/Kernel Group: System Environment/Kernel
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel
# This package's "version" and "release" must reflect the unsigned version that # This package's "version" and "release" must reflect the unsigned version that
# was signed. # was signed.
# An important consequence is that when making a change to this package, the # An important consequence is that when making a change to this package, the
@ -82,6 +82,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r} %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
%changelog %changelog
* Thu Feb 18 2021 Chris Co <chrco@microsoft.com> - 5.10.13.1-1
- Update source to 5.10.13.1
* Tue Feb 16 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-5 * Tue Feb 16 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-5
- Update to kernel release 5.4.91-5. - Update to kernel release 5.4.91-5.

11
SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec
View File

@ -1,14 +1,14 @@
%global debug_package %{nil} %global debug_package %{nil}
%define uname_r %{version}-%{release} %define uname_r %{version}-rolling-lts-mariner-%{release}
Summary: Signed Linux Kernel for x86_64 systems Summary: Signed Linux Kernel for x86_64 systems
Name: kernel-signed-x64 Name: kernel-signed-x64
Version: 5.4.91 Version: 5.10.13.1
Release: 5%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
Group: System Environment/Kernel Group: System Environment/Kernel
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel
# This package's "version" and "release" must reflect the unsigned version that # This package's "version" and "release" must reflect the unsigned version that
# was signed. # was signed.
# An important consequence is that when making a change to this package, the # An important consequence is that when making a change to this package, the
@ -82,6 +82,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r} %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
%changelog %changelog
* Thu Feb 18 2021 Chris Co <chrco@microsoft.com> - 5.10.13.1-1
- Update source to 5.10.13.1
* Tue Feb 16 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-5 * Tue Feb 16 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-5
- Update to kernel release 5.4.91-5. - Update to kernel release 5.4.91-5.

4
SPECS/hyperv-daemons/hyperv-daemons.signatures.json
View File

@ -1,12 +1,12 @@
{ {
"Signatures": { "Signatures": {
"hv_set_ifconfig": "0865f76b18f8f04cb54b7779c2d5d400dab68b132210e17db98117012d177c90",
"hypervfcopy.rules": "37ce6f0bba26f665e6a4d914b725d3c04126a090076e9ec7fbc7ef16d3075890", "hypervfcopy.rules": "37ce6f0bba26f665e6a4d914b725d3c04126a090076e9ec7fbc7ef16d3075890",
"hypervfcopyd.service": "287420b759d1d5837f1a7243b3957f5badc02a1e44c8f932e36a2a62131bf2a7", "hypervfcopyd.service": "287420b759d1d5837f1a7243b3957f5badc02a1e44c8f932e36a2a62131bf2a7",
"hypervkvp.rules": "f8cfa8acf73b8cc16b8c35bd53bc0df73e77a594499fbe22ded73d0e5c377f79", "hypervkvp.rules": "f8cfa8acf73b8cc16b8c35bd53bc0df73e77a594499fbe22ded73d0e5c377f79",
"hypervkvpd.service": "25339871302f7a47e1aecfa9fc2586c78bc37edb98773752f0a5dec30f0ed3a1", "hypervkvpd.service": "25339871302f7a47e1aecfa9fc2586c78bc37edb98773752f0a5dec30f0ed3a1",
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1", "hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d", "hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
"hv_set_ifconfig": "0865f76b18f8f04cb54b7779c2d5d400dab68b132210e17db98117012d177c90", "kernel-5.10.13.1.tar.gz": "b1060b9efcf838f6cea448482ddb60b503e925d049067d6216eaeb88721adb5b"
"linux-msft-5.4.91.tar.gz": "5f36254d8e78d0a17b7103df4a37d706b6f24a7cc343c938a8b6453e4137c97c"
} }
} }

12
SPECS/hyperv-daemons/hyperv-daemons.spec
View File

@ -8,14 +8,15 @@
%global udev_prefix 70 %global udev_prefix 70
Summary: Hyper-V daemons suite Summary: Hyper-V daemons suite
Name: hyperv-daemons Name: hyperv-daemons
Version: 5.4.91 Version: 5.10.13.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
Group: System/Kernel Group: System/Kernel
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel
Source0: https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-%{version}.tar.gz #Source0: https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/%{version}.tar.gz
Source0: kernel-%{version}.tar.gz
# HYPERV KVP DAEMON # HYPERV KVP DAEMON
Source1: hypervkvpd.service Source1: hypervkvpd.service
Source2: hypervkvp.rules Source2: hypervkvp.rules
@ -102,7 +103,7 @@ BuildArch: noarch
Contains tools and scripts useful for Hyper-V guests. Contains tools and scripts useful for Hyper-V guests.
%prep %prep
%setup -q -n WSL2-Linux-Kernel-linux-msft-%{version} %setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
%build %build
pushd tools/hv pushd tools/hv
@ -218,6 +219,9 @@ fi
%{_sbindir}/lsvmbus %{_sbindir}/lsvmbus
%changelog %changelog
* Thu Feb 18 2021 Chris Co <chrco@microsoft.com> - 5.10.13.1-1
- Update source to 5.10.13.1
* Wed Jan 20 2021 Chris Co <chrco@microsoft.com> - 5.4.91-1 * Wed Jan 20 2021 Chris Co <chrco@microsoft.com> - 5.4.91-1
- Update source to 5.4.91 - Update source to 5.4.91

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

@ -1,5 +1,5 @@
{ {
"Signatures": { "Signatures": {
"linux-msft-5.4.91.tar.gz": "5f36254d8e78d0a17b7103df4a37d706b6f24a7cc343c938a8b6453e4137c97c" "kernel-5.10.13.1.tar.gz": "b1060b9efcf838f6cea448482ddb60b503e925d049067d6216eaeb88721adb5b"
} }
} }

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

@ -1,27 +1,28 @@
Summary: Linux API header files Summary: Linux API header files
Name: kernel-headers Name: kernel-headers
Version: 5.4.91 Version: 5.10.13.1
Release: 5%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
Group: System Environment/Kernel Group: System Environment/Kernel
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel
Source0: https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-%{version}.tar.gz #Source0: https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/%{version}.tar.gz
Source0: kernel-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
%description %description
The Linux API Headers expose the kernel's API for use by Glibc. The Linux API Headers expose the kernel's API for use by Glibc.
%prep %prep
%setup -q -n WSL2-Linux-Kernel-linux-msft-%{version} %setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
%build %build
make mrproper make mrproper
make headers_check make headers_check
%install %install
cd %{_builddir}/WSL2-Linux-Kernel-linux-msft-%{version} cd %{_builddir}/CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
make headers make headers
find usr/include -name '.*' -delete find usr/include -name '.*' -delete
rm usr/include/Makefile rm usr/include/Makefile
@ -34,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/* %{_includedir}/*
%changelog %changelog
* Thu Feb 18 2021 Chris Co <chrco@microsoft.com> - 5.10.13.1-1
- Update source to 5.10.13.1
* Tue Feb 16 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-5 * Tue Feb 16 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-5
- Update to kernel release 5.4.91-5 - Update to kernel release 5.4.91-5

564
SPECS/kernel-hyperv/config
View File

File diff suppressed because it is too large Load Diff

4
SPECS/kernel-hyperv/kernel-hyperv.signatures.json
View File

@ -1,7 +1,7 @@
{ {
"Signatures": { "Signatures": {
"config": "fd91efcaa152b1e29cf3d73d04e6f1532543802612cef443b3ab1bc58b3731be", "config": "4df050310cb2c7f7f1c1da1cf793cabf20d65d72fc5d050bb97c801e3a1ce0a3",
"linux-msft-5.4.91.tar.gz": "5f36254d8e78d0a17b7103df4a37d706b6f24a7cc343c938a8b6453e4137c97c", "kernel-5.10.13.1.tar.gz": "b1060b9efcf838f6cea448482ddb60b503e925d049067d6216eaeb88721adb5b",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f"
} }
} }

18
SPECS/kernel-hyperv/kernel-hyperv.spec
View File

@ -1,16 +1,17 @@
%global security_hardening none %global security_hardening none
%global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh %global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh
%define uname_r %{version}-%{release} %define uname_r %{version}-rolling-lts-mariner-%{release}
Summary: Linux Kernel optimized for Hyper-V Summary: Linux Kernel optimized for Hyper-V
Name: kernel-hyperv Name: kernel-hyperv
Version: 5.4.91 Version: 5.10.13.1
Release: 4%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
Group: System Environment/Kernel Group: System Environment/Kernel
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel
Source0: https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-%{version}.tar.gz #Source0: https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/%{version}.tar.gz
Source0: kernel-%{version}.tar.gz
Source1: config Source1: config
Source2: sha512hmac-openssl.sh Source2: sha512hmac-openssl.sh
BuildRequires: audit-devel BuildRequires: audit-devel
@ -26,6 +27,7 @@ BuildRequires: openssl
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: procps-ng-devel BuildRequires: procps-ng-devel
BuildRequires: python3
BuildRequires: xerces-c-devel BuildRequires: xerces-c-devel
Requires: filesystem Requires: filesystem
Requires: kmod Requires: kmod
@ -85,7 +87,7 @@ Requires: audit
This package contains the 'perf' performance analysis tools for Linux kernel. This package contains the 'perf' performance analysis tools for Linux kernel.
%prep %prep
%setup -q -n WSL2-Linux-Kernel-linux-msft-%{version} %setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
%build %build
make mrproper make mrproper
@ -272,6 +274,10 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_libdir}/perf/include/bpf/* %{_libdir}/perf/include/bpf/*
%changelog %changelog
* Thu Feb 18 2021 Chris Co <chrco@microsoft.com> - 5.10.13.1-1
- Update source to 5.10.13.1
- Remove CONFIG_GCC_PLUGIN_RANDSTRUCT
* Thu Feb 11 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-4 * Thu Feb 11 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-4
- Add configs to enable tcrypt in FIPS mode - Add configs to enable tcrypt in FIPS mode

1220
SPECS/kernel/config
View File

File diff suppressed because it is too large Load Diff

1564
SPECS/kernel/config_aarch64
View File

File diff suppressed because it is too large Load Diff

33
SPECS/kernel/efi-libstub-tpm-enable-tpm-eventlog-function-for-ARM.patch
View File

@ -1,33 +0,0 @@
From d99c1ba6a73b9e93e2884b7893fe19e3c082ba03 Mon Sep 17 00:00:00 2001
From: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Date: Thu, 7 Nov 2019 16:24:21 +0800
Subject: [PATCH] efi: libstub/tpm: enable tpm eventlog function for ARM
platforms
Wire up the existing code for ARM that loads the TPM event log into
OS accessible buffers while running the EFI stub so that the kernel
proper can access it at runtime.
Tested-by: Zou Cao <zoucao@linux.alibaba.com>
Signed-off-by: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
drivers/firmware/efi/libstub/arm-stub.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index c382a48c6678..817237ce2420 100644
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -189,6 +189,8 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table,
goto fail_free_cmdline;
}
+ efi_retrieve_tpm2_eventlog(sys_table);
+
/* Ask the firmware to clear memory on unclean shutdown */
efi_enable_reset_attack_mitigation(sys_table);
--
2.17.1

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

@ -1,8 +1,8 @@
{ {
"Signatures": { "Signatures": {
"config": "0617508be96d515187cb63f65f073dc3d391fab22e3ba619f0510be6dbd6e5bf", "config": "fb6144e276ea46411a821a7096e7c729d3e6952ca61d51b4526b4959dca097eb",
"config_aarch64": "189730a7759833ce6815e867986473b183dfbe339d42025fa6ca2c776370c38e", "config_aarch64": "a9718ea50f4d8fadedd39a22a8233850bb18c0afc198e651fc9b98a08a5f1693",
"linux-msft-5.4.91.tar.gz": "5f36254d8e78d0a17b7103df4a37d706b6f24a7cc343c938a8b6453e4137c97c", "kernel-5.10.13.1.tar.gz": "b1060b9efcf838f6cea448482ddb60b503e925d049067d6216eaeb88721adb5b",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f" "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f"
} }
} }

33
SPECS/kernel/kernel.spec
View File

@ -1,22 +1,20 @@
%global security_hardening none %global security_hardening none
%global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh %global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh
%define uname_r %{version}-%{release} %define uname_r %{version}-rolling-lts-mariner-%{release}
Summary: Linux Kernel Summary: Linux Kernel
Name: kernel Name: kernel
Version: 5.4.91 Version: 5.10.13.1
Release: 5%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
Group: System Environment/Kernel Group: System Environment/Kernel
URL: https://github.com/microsoft/WSL2-Linux-Kernel URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel
Source0: https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-%{version}.tar.gz #Source0: https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/%{version}.tar.gz
Source0: kernel-%{version}.tar.gz
Source1: config Source1: config
Source2: config_aarch64 Source2: config_aarch64
Source3: sha512hmac-openssl.sh Source3: sha512hmac-openssl.sh
# Arm64 HyperV support required patch
Patch0: ver5_4_72_arm64_hyperv_support.patch
Patch1: efi-libstub-tpm-enable-tpm-eventlog-function-for-ARM.patch
# Kernel CVEs are addressed by moving to a newer version of the stable kernel. # Kernel CVEs are addressed by moving to a newer version of the stable kernel.
# Since kernel CVEs are filed against the upstream kernel version and not the # Since kernel CVEs are filed against the upstream kernel version and not the
# stable kernel version, our automated tooling will still flag the CVE as not # stable kernel version, our automated tooling will still flag the CVE as not
@ -144,6 +142,7 @@ BuildRequires: openssl
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: procps-ng-devel BuildRequires: procps-ng-devel
BuildRequires: python3
BuildRequires: xerces-c-devel BuildRequires: xerces-c-devel
Requires: filesystem Requires: filesystem
Requires: kmod Requires: kmod
@ -220,13 +219,7 @@ Group: System Environment/Kernel
This package contains common device tree blobs (dtb) This package contains common device tree blobs (dtb)
%prep %prep
%setup -q -n WSL2-Linux-Kernel-linux-msft-%{version} %setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
%ifarch aarch64
%patch0 -p1
%endif
%patch1 -p1
%build %build
make mrproper make mrproper
@ -356,7 +349,7 @@ ln -sf "%{_prefix}/src/linux-headers-%{uname_r}" "%{buildroot}/lib/modules/%{una
find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x
%ifarch aarch64 %ifarch aarch64
cp arch/arm64/kernel/module.lds %{buildroot}%{_prefix}/src/linux-headers-%{uname_r}/arch/arm64/kernel/ cp scripts/module.lds %{buildroot}%{_prefix}/src/linux-headers-%{uname_r}/scripts/module.lds
%endif %endif
# disable (JOBS=1) parallel build to fix this issue: # disable (JOBS=1) parallel build to fix this issue:
@ -459,6 +452,14 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%endif %endif
%changelog %changelog
* Thu Feb 18 2021 Chris Co <chrco@microsoft.com> - 5.10.13.1-1
- Update source to 5.10.13.1
- Remove patch to publish efi tpm event log on ARM. Present in updated source.
- Remove patch for arm64 hyperv support. Present in updated source.
- Account for new module.lds location on aarch64
- Remove CONFIG_GCC_PLUGIN_RANDSTRUCT
- Add CONFIG_SCSI_SMARTPQI=y
* Thu Feb 11 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-5 * Thu Feb 11 2021 Nicolas Ontiveros <niontive@microsoft.com> - 5.4.91-5
- Add configs to enable tcrypt in FIPS mode - Add configs to enable tcrypt in FIPS mode

36
SPECS/kernel/ver5_4_72_arm64_hyperv_support.patch
View File

@ -1,36 +0,0 @@
diff --git a/arch/arm64/Kbuild b/arch/arm64/Kbuild
index 24694219f12e..3c01bff26399 100644
--- a/arch/arm64/Kbuild
+++ b/arch/arm64/Kbuild
@@ -3,5 +3,5 @@ obj-y += kernel/ mm/
obj-$(CONFIG_NET) += net/
obj-$(CONFIG_KVM) += kvm/
obj-$(CONFIG_XEN) += xen/
-obj-$(CONFIG_HYPERV) += hyperv/
+obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/
obj-$(CONFIG_CRYPTO) += crypto/
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index d0cf596db82c..8ff557ae5cc6 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -55,6 +55,7 @@ static __init pteval_t create_mapping_protection(efi_memory_desc_t *md)
/* we will fill this structure from the stub, so don't put it in .bss */
struct screen_info screen_info __section(.data);
+EXPORT_SYMBOL(screen_info);
int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)
{
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index fc0160e8ed33..1709e6a923de 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -467,7 +467,7 @@ config QCOM_IOMMU
config HYPERV_IOMMU
bool "Hyper-V x2APIC IRQ Handling"
- depends on HYPERV
+ depends on HYPERV && X86
select IOMMU_API
default HYPERV
help

16
cgmanifest.json
View File

@ -1705,8 +1705,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "hyperv-daemons", "name": "hyperv-daemons",
"version": "5.4.91", "version": "5.10.13.1",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.91.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.13.1.tar.gz"
} }
} }
}, },
@ -2015,8 +2015,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel-headers", "name": "kernel-headers",
"version": "5.4.91", "version": "5.10.13.1",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.91.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.13.1.tar.gz"
} }
} }
}, },
@ -2025,8 +2025,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel-hyperv", "name": "kernel-hyperv",
"version": "5.4.91", "version": "5.10.13.1",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.91.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.13.1.tar.gz"
} }
} }
}, },
@ -2035,8 +2035,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel", "name": "kernel",
"version": "5.4.91", "version": "5.10.13.1",
"downloadUrl": "https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.91.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.13.1.tar.gz"
} }
} }
}, },

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

@ -1,5 +1,5 @@
filesystem-1.1-7.cm1.aarch64.rpm filesystem-1.1-7.cm1.aarch64.rpm
kernel-headers-5.4.91-5.cm1.noarch.rpm kernel-headers-5.10.13.1-1.cm1.noarch.rpm
glibc-2.28-17.cm1.aarch64.rpm glibc-2.28-17.cm1.aarch64.rpm
glibc-devel-2.28-17.cm1.aarch64.rpm glibc-devel-2.28-17.cm1.aarch64.rpm
glibc-i18n-2.28-17.cm1.aarch64.rpm glibc-i18n-2.28-17.cm1.aarch64.rpm

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

@ -1,5 +1,5 @@
filesystem-1.1-7.cm1.x86_64.rpm filesystem-1.1-7.cm1.x86_64.rpm
kernel-headers-5.4.91-5.cm1.noarch.rpm kernel-headers-5.10.13.1-1.cm1.noarch.rpm
glibc-2.28-17.cm1.x86_64.rpm glibc-2.28-17.cm1.x86_64.rpm
glibc-devel-2.28-17.cm1.x86_64.rpm glibc-devel-2.28-17.cm1.x86_64.rpm
glibc-i18n-2.28-17.cm1.x86_64.rpm glibc-i18n-2.28-17.cm1.x86_64.rpm

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

@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.aarch64.rpm
json-c-devel-0.14-3.cm1.aarch64.rpm json-c-devel-0.14-3.cm1.aarch64.rpm
kbd-2.0.4-5.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm
kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm
kernel-headers-5.4.91-5.cm1.noarch.rpm kernel-headers-5.10.13.1-1.cm1.noarch.rpm
kmod-25-4.cm1.aarch64.rpm kmod-25-4.cm1.aarch64.rpm
kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm
kmod-devel-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm

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

@ -145,7 +145,7 @@ json-c-debuginfo-0.14-3.cm1.x86_64.rpm
json-c-devel-0.14-3.cm1.x86_64.rpm json-c-devel-0.14-3.cm1.x86_64.rpm
kbd-2.0.4-5.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm
kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm
kernel-headers-5.4.91-5.cm1.noarch.rpm kernel-headers-5.10.13.1-1.cm1.noarch.rpm
kmod-25-4.cm1.x86_64.rpm kmod-25-4.cm1.x86_64.rpm
kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm
kmod-devel-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm

3
toolkit/scripts/toolchain/container/Dockerfile
View File

@ -63,9 +63,12 @@ COPY [ "./toolchain-md5sums", \
# Download source, then create lfs user and group. # Download source, then create lfs user and group.
# Append "; exit 0" after wget commands to ignore download errors that might be expected. The md5sum command will verify all downloads. # Append "; exit 0" after wget commands to ignore download errors that might be expected. The md5sum command will verify all downloads.
# Note: Fetch the kernel sources differently to ensure we rename the source tarball appropriately. The rename is needed to comply with
# the naming convention of the source cache (convention used to prevent naming collisions).
WORKDIR $LFS/sources WORKDIR $LFS/sources
RUN wget -nv --no-clobber --timeout=30 --no-check-certificate --continue --input-file=$LFS/tools/toolchain-local-wget-list --directory-prefix=$LFS/sources; exit 0 RUN wget -nv --no-clobber --timeout=30 --no-check-certificate --continue --input-file=$LFS/tools/toolchain-local-wget-list --directory-prefix=$LFS/sources; exit 0
RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolchain-remote-wget-list --directory-prefix=$LFS/sources; exit 0 RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolchain-remote-wget-list --directory-prefix=$LFS/sources; exit 0
RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/5.10.13.1.tar.gz -O kernel-5.10.13.1.tar.gz --directory-prefix=$LFS/sources; exit 0
USER root USER root
RUN /tools/toolchain-jdk8-wget.sh; exit 0 RUN /tools/toolchain-jdk8-wget.sh; exit 0
RUN md5sum -c $LFS/tools/toolchain-md5sums && \ RUN md5sum -c $LFS/tools/toolchain-md5sums && \

2
toolkit/scripts/toolchain/container/toolchain-md5sums
View File

@ -59,6 +59,7 @@ bc62e7df6f75357b6dd1ec34600dbeaf jdk8u212-b04-langtools.tar.bz2
d0272e7a6107c64dae62b80ca7ec65e2 jdk8u212-b04-nashorn.tar.bz2 d0272e7a6107c64dae62b80ca7ec65e2 jdk8u212-b04-nashorn.tar.bz2
befd51c2b53a442e1fa6644bba89a95a jdk8u212-b04.tar.bz2 befd51c2b53a442e1fa6644bba89a95a jdk8u212-b04.tar.bz2
94afc90c1f7bef4a27fdd59ece39c878 kbproto-1.0.7.tar.bz2 94afc90c1f7bef4a27fdd59ece39c878 kbproto-1.0.7.tar.bz2
41875db6e851bef877d871c0ddfdd8de kernel-5.10.13.1.tar.gz
d953ed6b47694dadf0e6042f8f9ff451 libarchive-3.4.2.tar.gz d953ed6b47694dadf0e6042f8f9ff451 libarchive-3.4.2.tar.gz
968ac4d42a1a71754313527be2ab5df3 libcap-2.26.tar.xz 968ac4d42a1a71754313527be2ab5df3 libcap-2.26.tar.xz
ba983eba5a9f05d152a0725b8e863151 libdmx-1.1.3.tar.bz2 ba983eba5a9f05d152a0725b8e863151 libdmx-1.1.3.tar.bz2
@ -98,7 +99,6 @@ ef8c2c1d16a00bd95b9fdcef63b8a2ca libXtst-1.2.3.tar.bz2
4cbe1c1def7a5e1b0ed5fce8e512f4c6 libXvMC-1.0.10.tar.bz2 4cbe1c1def7a5e1b0ed5fce8e512f4c6 libXvMC-1.0.10.tar.bz2
d7dd9b9df336b7dd4028b6b56542ff2c libXxf86dga-1.1.4.tar.bz2 d7dd9b9df336b7dd4028b6b56542ff2c libXxf86dga-1.1.4.tar.bz2
298b8fff82df17304dfdb5fe4066fe3a libXxf86vm-1.1.4.tar.bz2 298b8fff82df17304dfdb5fe4066fe3a libXxf86vm-1.1.4.tar.bz2
ef11a34be471f745c90310c67efe8e0b linux-msft-5.4.91.tar.gz
63ecacd3ff6552537a73f8c30c396caf lua-5.3.5-shared_library-1.patch 63ecacd3ff6552537a73f8c30c396caf lua-5.3.5-shared_library-1.patch
4f4b4f323fd3514a68e0ab3da8ce3455 lua-5.3.5.tar.gz 4f4b4f323fd3514a68e0ab3da8ce3455 lua-5.3.5.tar.gz
730bb15d96fffe47e148d1e09235af82 m4-1.4.18.tar.xz 730bb15d96fffe47e148d1e09235af82 m4-1.4.18.tar.xz

1
toolkit/scripts/toolchain/container/toolchain-remote-wget-list
View File

@ -39,7 +39,6 @@ http://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz
http://ftp.gnu.org/gnu/tar/tar-1.30.tar.xz http://ftp.gnu.org/gnu/tar/tar-1.30.tar.xz
http://ftp.gnu.org/gnu/texinfo/texinfo-6.5.tar.xz http://ftp.gnu.org/gnu/texinfo/texinfo-6.5.tar.xz
https://www.cpan.org/src/5.0/perl-5.30.3.tar.gz https://www.cpan.org/src/5.0/perl-5.30.3.tar.gz
https://github.com/microsoft/WSL2-Linux-Kernel/archive/linux-msft-5.4.91.tar.gz
http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz
https://ftp.gnu.org/gnu/bison/bison-3.1.tar.xz https://ftp.gnu.org/gnu/bison/bison-3.1.tar.xz
https://sourceware.org/pub/bzip2/bzip2-1.0.6.tar.gz https://sourceware.org/pub/bzip2/bzip2-1.0.6.tar.gz

8
toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
View File

@ -57,14 +57,14 @@ set -e
# #
cd /sources cd /sources
echo Linux-5.4.91 API Headers echo Linux-5.10.13.1 API Headers
tar xf linux-msft-5.4.91.tar.gz tar xf kernel-5.10.13.1.tar.gz
pushd WSL2-Linux-Kernel-linux-msft-5.4.91 pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.13.1
make mrproper make mrproper
make headers make headers
cp -rv usr/include/* /usr/include cp -rv usr/include/* /usr/include
popd popd
rm -rf WSL2-Linux-Kernel-linux-msft-5.4.91 rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.13.1
touch /logs/status_kernel_headers_complete touch /logs/status_kernel_headers_complete
echo 6.8. Man-pages-5.02 echo 6.8. Man-pages-5.02

8
toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh
View File

@ -113,14 +113,14 @@ rm -rf gcc-9.1.0
touch $LFS/logs/temptoolchain/status_gcc_pass1_complete touch $LFS/logs/temptoolchain/status_gcc_pass1_complete
echo Linux-5.4.91 API Headers echo Linux-5.10.13.1 API Headers
tar xf linux-msft-5.4.91.tar.gz tar xf kernel-5.10.13.1.tar.gz
pushd WSL2-Linux-Kernel-linux-msft-5.4.91 pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.13.1
make mrproper make mrproper
make headers make headers
cp -rv usr/include/* /tools/include cp -rv usr/include/* /tools/include
popd popd
rm -rf WSL2-Linux-Kernel-linux-msft-5.4.91 rm -rf CBL-Mariner-Linux-Kernel-rolling-lts-mariner-5.10.13.1
touch $LFS/logs/temptoolchain/status_kernel_headers_complete touch $LFS/logs/temptoolchain/status_kernel_headers_complete