diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 502dccfe251..389190d564f 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.15.63.1 -Release: 1%{?dist} +Release: 2%{?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 Sep 06 2022 Nikola Bojanic - 5.15.63.1-2 +- Bump release number to match kernel release + * Mon Aug 29 2022 CBL-Mariner Servicing Account - 5.15.63.1-1 - Upgrade to 5.15.63.1 diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index b2e4dc942af..91301084c1e 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.15.63.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -36,6 +36,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Tue Sep 06 2022 Nikola Bojanic - 5.15.63.1-2 +- Bump release number to match kernel release + * Mon Aug 29 2022 CBL-Mariner Servicing Account - 5.15.63.1-1 - Upgrade to 5.15.63.1 diff --git a/SPECS/kernel/config b/SPECS/kernel/config index e99b0c302e2..7c1f442ce78 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -208,7 +208,7 @@ CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y -# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_CHECKPOINT_RESTORE=y # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -936,7 +936,7 @@ CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ELFCORE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y -# CONFIG_BINFMT_MISC is not set +CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y # end of Executable file formats @@ -986,6 +986,7 @@ CONFIG_THP_SWAP=y CONFIG_CLEANCACHE=y # CONFIG_FRONTSWAP is not set # CONFIG_CMA is not set +CONFIG_MEM_SOFT_DIRTY=y # CONFIG_ZPOOL is not set # CONFIG_ZSMALLOC is not set CONFIG_GENERIC_EARLY_IOREMAP=y @@ -1028,11 +1029,11 @@ CONFIG_SKB_EXTENSIONS=y # Networking options # CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m +CONFIG_PACKET_DIAG=y CONFIG_UNIX=y CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y -CONFIG_UNIX_DIAG=m +CONFIG_UNIX_DIAG=y # CONFIG_TLS is not set CONFIG_XFRM=y CONFIG_XFRM_OFFLOAD=y @@ -1083,7 +1084,11 @@ CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m -# CONFIG_INET_DIAG is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=y +# CONFIG_INET_RAW_DIAG is not set +# CONFIG_INET_DIAG_DESTROY is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BIC is not set CONFIG_TCP_CONG_CUBIC=y @@ -1224,7 +1229,7 @@ CONFIG_NETFILTER_XTABLES_COMPAT=y # # Xtables combined modules # -CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_MARK=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_SET=m @@ -1487,14 +1492,15 @@ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_INET_SCTP_DIAG=m # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -CONFIG_STP=m +CONFIG_STP=y CONFIG_GARP=m CONFIG_MRP=m -CONFIG_BRIDGE=m +CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y # CONFIG_BRIDGE_MRP is not set @@ -1504,7 +1510,7 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set -CONFIG_LLC=m +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set @@ -1614,7 +1620,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS_COMMON=m CONFIG_HYPERV_VSOCKETS=m -CONFIG_NETLINK_DIAG=m +CONFIG_NETLINK_DIAG=y CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m # CONFIG_MPLS_ROUTING is not set @@ -2394,7 +2400,7 @@ CONFIG_DUMMY=m # CONFIG_NET_FC is not set CONFIG_IFB=m # CONFIG_NET_TEAM is not set -CONFIG_MACVLAN=m +CONFIG_MACVLAN=y CONFIG_MACVTAP=m CONFIG_IPVLAN_L3S=y CONFIG_IPVLAN=m @@ -2408,7 +2414,7 @@ CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y CONFIG_NET_POLL_CONTROLLER=y -CONFIG_TUN=m +CONFIG_TUN=y CONFIG_TAP=m # CONFIG_TUN_VNET_CROSS_LE is not set CONFIG_VETH=y diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index 5a3f3598e48..f137f3c88f3 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "ae4a0b7776705fcd646474fc649ed219765f9f7444da945cc23e79bea907b574", + "config": "dcd5458781f331997452267fd89350c205e66a8a7cf7969a9a8e8abf5683b684", "config_aarch64": "f0a1d640c05eaf0ded04a083619534e7bbdfc6baf12f7e989435b26d03896b9d", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", "kernel-5.15.63.1.tar.gz": "ead7508937c262a154f2ca22efdb4de4b8760a7572a5bc9b58083271a9765cc7" diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 564ba12f7b5..3ab645bacda 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -18,7 +18,7 @@ Summary: Linux Kernel Name: kernel Version: 5.15.63.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -391,6 +391,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Tue Sep 06 2022 Nikola Bojanic - 5.15.63.1-2 +- Enable CRIU support: https://criu.org/Linux_kernel + * Mon Aug 29 2022 CBL-Mariner Servicing Account - 5.15.63.1-1 - Upgrade to 5.15.63.1 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 7cfba5e8dc7..93f1f74838a 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-10.cm2.aarch64.rpm -kernel-headers-5.15.63.1-1.cm2.noarch.rpm +kernel-headers-5.15.63.1-2.cm2.noarch.rpm glibc-2.35-2.cm2.aarch64.rpm glibc-devel-2.35-2.cm2.aarch64.rpm glibc-i18n-2.35-2.cm2.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 d83efca38ef..d0c7d36c15e 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-10.cm2.x86_64.rpm -kernel-headers-5.15.63.1-1.cm2.noarch.rpm +kernel-headers-5.15.63.1-2.cm2.noarch.rpm glibc-2.35-2.cm2.x86_64.rpm glibc-devel-2.35-2.cm2.x86_64.rpm glibc-i18n-2.35-2.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 2c6d361d3f2..beaacb3969d 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -131,7 +131,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.63.1-1.cm2.noarch.rpm +kernel-headers-5.15.63.1-2.cm2.noarch.rpm kmod-29-1.cm2.aarch64.rpm kmod-debuginfo-29-1.cm2.aarch64.rpm kmod-devel-29-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index db9e95a49d3..de572db17b2 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -131,7 +131,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.63.1-1.cm2.noarch.rpm +kernel-headers-5.15.63.1-2.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