diff --git a/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec b/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec index 55e49015a6..ec64cb31f6 100644 --- 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: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: https://github.com/microsoft/WSL2-Linux-Kernel Group: System Environment/Kernel @@ -80,6 +80,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r} %changelog +* Tue Sep 01 2020 Chris Co 5.4.51-2 +- Update release number * Wed Aug 19 2020 Chris Co 5.4.51-1 - Update source to 5.4.51 * Wed Aug 19 2020 Chris Co 5.4.42-12 diff --git a/SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec b/SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec index 41db303fa1..60c9eb9736 100644 --- 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: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: https://github.com/microsoft/WSL2-Linux-Kernel Group: System Environment/Kernel @@ -80,6 +80,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r} %changelog +* Tue Sep 01 2020 Chris Co 5.4.51-2 +- Update release number * Wed Aug 19 2020 Chris Co 5.4.51-1 - Update source to 5.4.51 * Wed Aug 19 2020 Chris Co 5.4.42-12 diff --git a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json index e3ea92f133..7c8319a6e1 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json +++ b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json @@ -6,6 +6,6 @@ "hypervkvpd.service": "25339871302f7a47e1aecfa9fc2586c78bc37edb98773752f0a5dec30f0ed3a1", "hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1", "hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d", - "linux-msft-5.4.51.tar.gz": "68519d9752065992789d59dd5fdb730017d6571534458508060027c920962b45" + "linux-msft-5.4.51.tar.gz": "3bcd6b09e952fac4f708614658b508ce80c8e25c04780b6b44a481b1479a08e7" } } \ No newline at end of file diff --git a/SPECS/hyperv-daemons/hyperv-daemons.spec b/SPECS/hyperv-daemons/hyperv-daemons.spec index b93cfc5e30..73376f872c 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons/hyperv-daemons.spec @@ -10,7 +10,7 @@ Summary: Hyper-V daemons suite Name: hyperv-daemons Version: 5.4.51 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/microsoft/WSL2-Linux-Kernel Group: System/Kernel @@ -230,6 +230,9 @@ fi %changelog +* Tue Sep 01 2020 Chris Co 5.4.51-2 +- Update source hash + * Wed Aug 19 2020 Chris Co 5.4.51-1 - Update source to 5.4.51 diff --git a/SPECS/kernel-headers/kernel-headers.signatures.json b/SPECS/kernel-headers/kernel-headers.signatures.json index 813f650d86..5b8cb3407f 100644 --- a/SPECS/kernel-headers/kernel-headers.signatures.json +++ b/SPECS/kernel-headers/kernel-headers.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "linux-msft-5.4.51.tar.gz": "68519d9752065992789d59dd5fdb730017d6571534458508060027c920962b45" + "linux-msft-5.4.51.tar.gz": "3bcd6b09e952fac4f708614658b508ce80c8e25c04780b6b44a481b1479a08e7" } } \ No newline at end of file diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 64588d76c3..02722f4bd6 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.4.51 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: https://github.com/microsoft/WSL2-Linux-Kernel Group: System Environment/Kernel @@ -27,6 +27,8 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %defattr(-,root,root) %{_includedir}/* %changelog +* Tue Sep 01 2020 Chris Co 5.4.51-2 +- Update source hash * Wed Aug 19 2020 Chris Co 5.4.51-1 - Update source to 5.4.51 * Fri Jun 12 2020 Chris Co 5.4.42-1 diff --git a/SPECS/kernel-hyperv/config b/SPECS/kernel-hyperv/config index 60b512ee74..5c119d3230 100644 --- a/SPECS/kernel-hyperv/config +++ b/SPECS/kernel-hyperv/config @@ -822,7 +822,7 @@ CONFIG_HAVE_FAST_GUP=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y -# CONFIG_PAGE_REPORTING is not set +CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_VIRT_TO_BUS=y @@ -2453,7 +2453,6 @@ CONFIG_DEVPORT=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_URANDOM_ONLY is not set # # I2C support diff --git a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json index 9ce6d1723b..8aee336018 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.signatures.json +++ b/SPECS/kernel-hyperv/kernel-hyperv.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "config": "7b4a585097acebeb8f5eba7e91160dc0722d1a18669d53b1ce0e79a0c7bc2545", - "linux-msft-5.4.51.tar.gz": "68519d9752065992789d59dd5fdb730017d6571534458508060027c920962b45" + "config": "d71a61261f1ef2b2f72d78066d9be7c8b08fac607fe79c40032e0566c02053cd", + "linux-msft-5.4.51.tar.gz": "3bcd6b09e952fac4f708614658b508ce80c8e25c04780b6b44a481b1479a08e7" } } \ No newline at end of file diff --git a/SPECS/kernel-hyperv/kernel-hyperv.spec b/SPECS/kernel-hyperv/kernel-hyperv.spec index aea0fb0841..e923ffb591 100644 --- a/SPECS/kernel-hyperv/kernel-hyperv.spec +++ b/SPECS/kernel-hyperv/kernel-hyperv.spec @@ -2,7 +2,7 @@ Summary: Linux Kernel optimized for Hyper-V Name: kernel-hyperv Version: 5.4.51 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: https://github.com/microsoft/WSL2-Linux-Kernel Group: System Environment/Kernel @@ -225,6 +225,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Tue Sep 01 2020 Chris Co 5.4.51-2 +- Update source hash * Wed Aug 19 2020 Chris Co 5.4.51-1 - Update source to 5.4.51 - Remove signed subpackage diff --git a/SPECS/kernel/config b/SPECS/kernel/config index 6a6f184188..5b84870364 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -920,7 +920,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MEMORY_BALLOON=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y -# CONFIG_PAGE_REPORTING is not set +CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -3009,7 +3009,6 @@ CONFIG_DEVPORT=y CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_URANDOM_ONLY is not set # # I2C support diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index 0705f04645..417a71aca7 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -870,7 +870,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MEMORY_BALLOON=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y -# CONFIG_PAGE_REPORTING is not set +CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -2927,7 +2927,6 @@ CONFIG_DEVPORT=y # end of Character devices # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_URANDOM_ONLY is not set # # I2C support diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index 3dd7b2be37..417aa00b23 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { - "config": "51608598af8508723cadff27fbc8f7cb5d1cb905c94fa0186c8c2b186e96625b", - "config_aarch64": "15986870ba303135c25f0b45435b8d9da80f83aea2d453c6c146fcdfad4822de", - "linux-msft-5.4.51.tar.gz": "68519d9752065992789d59dd5fdb730017d6571534458508060027c920962b45" + "config": "0df38b5912956790e989a79e08e5a753cb7ef7cd720c8e94573bee55c084b01d", + "config_aarch64": "6ffe93967295c026f0c9b351b81d70ef4e971e66fc0201e3553c8732edf392d5", + "linux-msft-5.4.51.tar.gz": "3bcd6b09e952fac4f708614658b508ce80c8e25c04780b6b44a481b1479a08e7" } } \ No newline at end of file diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 7e3a6b9cef..36eb693089 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -2,7 +2,7 @@ Summary: Linux Kernel Name: kernel Version: 5.4.51 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: https://github.com/microsoft/WSL2-Linux-Kernel Group: System Environment/Kernel @@ -300,6 +300,8 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_libdir}/perf/include/bpf/* %changelog +* Tue Sep 01 2020 Chris Co 5.4.51-2 +- Update source hash * Wed Aug 19 2020 Chris Co 5.4.51-1 - Update source to 5.4.51 - Enable DXGKRNL config diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index d581deb3dc..7c08f728c1 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.aarch64.rpm -kernel-headers-5.4.51-1.cm1.noarch.rpm +kernel-headers-5.4.51-2.cm1.noarch.rpm glibc-2.28-11.cm1.aarch64.rpm glibc-devel-2.28-11.cm1.aarch64.rpm glibc-i18n-2.28-11.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 56ff486241..db93d2f4d7 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-7.cm1.x86_64.rpm -kernel-headers-5.4.51-1.cm1.noarch.rpm +kernel-headers-5.4.51-2.cm1.noarch.rpm glibc-2.28-11.cm1.x86_64.rpm glibc-devel-2.28-11.cm1.x86_64.rpm glibc-i18n-2.28-11.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 4aaaa902d2..7e7d2c1040 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-2.cm1.aarch64.rpm json-c-devel-0.14-2.cm1.aarch64.rpm kbd-2.0.4-5.cm1.aarch64.rpm kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm -kernel-headers-5.4.51-1.cm1.noarch.rpm +kernel-headers-5.4.51-2.cm1.noarch.rpm kmod-25-4.cm1.aarch64.rpm kmod-debuginfo-25-4.cm1.aarch64.rpm kmod-devel-25-4.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 0031a37877..65a53160cf 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -145,7 +145,7 @@ json-c-debuginfo-0.14-2.cm1.x86_64.rpm json-c-devel-0.14-2.cm1.x86_64.rpm kbd-2.0.4-5.cm1.x86_64.rpm kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm -kernel-headers-5.4.51-1.cm1.noarch.rpm +kernel-headers-5.4.51-2.cm1.noarch.rpm kmod-25-4.cm1.x86_64.rpm kmod-debuginfo-25-4.cm1.x86_64.rpm kmod-devel-25-4.cm1.x86_64.rpm diff --git a/toolkit/scripts/toolchain/container/toolchain-md5sums b/toolkit/scripts/toolchain/container/toolchain-md5sums index 9870f31179..5a79a13369 100644 --- a/toolkit/scripts/toolchain/container/toolchain-md5sums +++ b/toolkit/scripts/toolchain/container/toolchain-md5sums @@ -98,7 +98,7 @@ ef8c2c1d16a00bd95b9fdcef63b8a2ca libXtst-1.2.3.tar.bz2 4cbe1c1def7a5e1b0ed5fce8e512f4c6 libXvMC-1.0.10.tar.bz2 d7dd9b9df336b7dd4028b6b56542ff2c libXxf86dga-1.1.4.tar.bz2 298b8fff82df17304dfdb5fe4066fe3a libXxf86vm-1.1.4.tar.bz2 -86a48b2be4b9f6b696025fde83d7524f linux-msft-5.4.51.tar.gz +a144b639702d36f8fc2b59bf8f5690a7 linux-msft-5.4.51.tar.gz 63ecacd3ff6552537a73f8c30c396caf lua-5.3.5-shared_library-1.patch 4f4b4f323fd3514a68e0ab3da8ce3455 lua-5.3.5.tar.gz 730bb15d96fffe47e148d1e09235af82 m4-1.4.18.tar.xz