Skip to content

Commit a5bd3e3

Browse files
SeanDoughertyjiria
andauthored
kernel: Enable CONFIG_SQUASHFS_ZSTD and CONFIG_FW_CFG_SYSFS (#15612)
CONFIG_SQUASHFS_ZSTD With this a better compression algo (zstd) becomes available to users, this is a read-only kernel feature with minimal overhead when not in use. Already enabled in our ARM kernel. CONFIG_FW_CFG_SYSFS Enables module that permits firmware config injection. Minimal overhead, not loaded when not in use. Already enabled in our ARM kernel Co-authored-by: Jiri Appl <jiria@microsoft.com>
1 parent cc2b238 commit a5bd3e3

File tree

16 files changed

+45
-19
lines changed

16 files changed

+45
-19
lines changed

SPECS-EXTENDED/kernel-ipe/config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,7 +2062,8 @@ CONFIG_DMIID=y
20622062
CONFIG_DMI_SYSFS=m
20632063
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
20642064
# CONFIG_ISCSI_IBFT is not set
2065-
# CONFIG_FW_CFG_SYSFS is not set
2065+
CONFIG_FW_CFG_SYSFS=m
2066+
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
20662067
CONFIG_SYSFB=y
20672068
# CONFIG_SYSFB_SIMPLEFB is not set
20682069
# CONFIG_GOOGLE_FIRMWARE is not set
@@ -7169,7 +7170,7 @@ CONFIG_SQUASHFS_ZLIB=y
71697170
CONFIG_SQUASHFS_LZ4=y
71707171
CONFIG_SQUASHFS_LZO=y
71717172
CONFIG_SQUASHFS_XZ=y
7172-
# CONFIG_SQUASHFS_ZSTD is not set
7173+
CONFIG_SQUASHFS_ZSTD=y
71737174
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
71747175
# CONFIG_SQUASHFS_EMBEDDED is not set
71757176
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

SPECS-EXTENDED/kernel-ipe/kernel-ipe.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
4-
"config": "c5a9f5ed9cd1300d10dc5c353f29cf3c0d81f55a5bb1a7cc77b46e7480b834bf",
4+
"config": "5585404b68f25ef8d78d73708719745333ebe987523392a274433ee8b46d6ef9",
55
"config_aarch64": "afd473ab5c76245d5e4455b408a981865511a226a87146210cad12edc0c67865",
66
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
77
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",

SPECS-EXTENDED/kernel-ipe/kernel-ipe.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
Summary: Linux Kernel
3434
Name: kernel-ipe
3535
Version: 6.6.119.3
36-
Release: 3%{?dist}
36+
Release: 4%{?dist}
3737
License: GPLv2
3838
Vendor: Microsoft Corporation
3939
Distribution: Azure Linux
@@ -460,6 +460,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
460460
%{_sysconfdir}/bash_completion.d/bpftool
461461

462462
%changelog
463+
* Tue Jan 28 2026 Sean Dougherty <sdougherty@microsoft.com> - 6.6.119.3-4
464+
- Enable CONFIG_FW_CFG_SYSFS and CONFIG_SQUASHFS_ZSTD
465+
463466
* Fri Jan 16 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-3
464467
- Enable XFRM_INTERFACE
465468

SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: Signed Linux Kernel for %{buildarch} systems
88
Name: kernel-64k-signed-%{buildarch}
99
Version: 6.6.119.3
10-
Release: 3%{?dist}
10+
Release: 4%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Azure Linux
@@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
105105
%exclude /module_info.ld
106106

107107
%changelog
108+
* Tue Jan 28 2026 Sean Dougherty <sdougherty@microsoft.com> - 6.6.119.3-4
109+
- Bump release to match kernel
110+
108111
* Fri Jan 16 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-3
109112
- Bump release to match kernel,kernel-ipe
110113

SPECS-SIGNED/kernel-signed/kernel-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.119.3
13-
Release: 3%{?dist}
13+
Release: 4%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Tue Jan 28 2026 Sean Dougherty <sdougherty@microsoft.com> - 6.6.119.3-4
149+
- Bump release to match kernel
150+
148151
* Fri Jan 16 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-3
149152
- Bump release to match kernel,kernel-ipe
150153

SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.119.3
9-
Release: 3%{?dist}
9+
Release: 4%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Tue Jan 28 2026 Sean Dougherty <sdougherty@microsoft.com> - 6.6.119.3-4
72+
- Bump release to match kernel
73+
7174
* Fri Jan 16 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-3
7275
- Bump release to match kernel,kernel-ipe
7376

SPECS/kernel-64k/kernel-64k.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Summary: Linux Kernel
2828
Name: kernel-64k
2929
Version: 6.6.119.3
30-
Release: 3%{?dist}
30+
Release: 4%{?dist}
3131
License: GPLv2
3232
Vendor: Microsoft Corporation
3333
Distribution: Azure Linux
@@ -380,6 +380,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
380380
%{_sysconfdir}/bash_completion.d/bpftool
381381

382382
%changelog
383+
* Tue Jan 28 2026 Sean Dougherty <sdougherty@microsoft.com> - 6.6.119.3-4
384+
- Bump release to match kernel
385+
383386
* Fri Jan 16 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-3
384387
- Bump release to match kernel,kernel-ipe
385388

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.6.119.3
17-
Release: 3%{?dist}
17+
Release: 4%{?dist}
1818
License: GPLv2
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -75,6 +75,9 @@ done
7575
%endif
7676

7777
%changelog
78+
* Tue Jan 28 2026 Sean Dougherty <sdougherty@microsoft.com> - 6.6.119.3-4
79+
- Bump release to match kernel
80+
7881
* Fri Jan 16 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-3
7982
- Bump release to match kernel,kernel-ipe
8083

SPECS/kernel/config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,7 +2062,8 @@ CONFIG_DMIID=y
20622062
CONFIG_DMI_SYSFS=m
20632063
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
20642064
# CONFIG_ISCSI_IBFT is not set
2065-
# CONFIG_FW_CFG_SYSFS is not set
2065+
CONFIG_FW_CFG_SYSFS=m
2066+
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
20662067
CONFIG_SYSFB=y
20672068
# CONFIG_SYSFB_SIMPLEFB is not set
20682069
# CONFIG_GOOGLE_FIRMWARE is not set
@@ -7169,7 +7170,7 @@ CONFIG_SQUASHFS_ZLIB=y
71697170
CONFIG_SQUASHFS_LZ4=y
71707171
CONFIG_SQUASHFS_LZO=y
71717172
CONFIG_SQUASHFS_XZ=y
7172-
# CONFIG_SQUASHFS_ZSTD is not set
7173+
CONFIG_SQUASHFS_ZSTD=y
71737174
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
71747175
# CONFIG_SQUASHFS_EMBEDDED is not set
71757176
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

SPECS/kernel/kernel-uki.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Summary: Unified Kernel Image
1414
Name: kernel-uki
1515
Version: 6.6.119.3
16-
Release: 3%{?dist}
16+
Release: 4%{?dist}
1717
License: GPLv2
1818
Vendor: Microsoft Corporation
1919
Distribution: Azure Linux
@@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7070
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7171

7272
%changelog
73+
* Tue Jan 28 2026 Sean Dougherty <sdougherty@microsoft.com> - 6.6.119.3-4
74+
- Bump release to match kernel
75+
7376
* Fri Jan 16 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-3
7477
- Bump release to match kernel,kernel-ipe
7578

0 commit comments

Comments
 (0)