diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:15:16 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:15:28 +0000 |
| commit | 0cf6719e1d2f19f831279583065810ceb5ecbd28 (patch) | |
| tree | 34052095977dde7bec44b99f60acc8bb77325f76 /debian/config | |
| parent | Merging upstream version 4.19.282. (diff) | |
| download | linux-0cf6719e1d2f19f831279583065810ceb5ecbd28.tar.xz linux-0cf6719e1d2f19f831279583065810ceb5ecbd28.zip | |
Merging debian version 4.19.282-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/config')
| -rw-r--r-- | debian/config/config | 5 | ||||
| -rw-r--r-- | debian/config/defines | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/config/config b/debian/config/config index efb96d6ad..10ab79148 100644 --- a/debian/config/config +++ b/debian/config/config @@ -7619,8 +7619,9 @@ CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_FALLBACK is not set # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set CONFIG_FORTIFY_SOURCE=y -CONFIG_LOCK_DOWN_KERNEL=y -CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y +#. These are overridden if the [build]signed-code setting is enabled +# CONFIG_LOCK_DOWN_KERNEL is not set +# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set ## choice: Default security module CONFIG_DEFAULT_SECURITY_APPARMOR=y ## end choice diff --git a/debian/config/defines b/debian/config/defines index 4b66c8dcd..bfbb9aefc 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] -abiname: 23progress5u1 +abiname: 24 ignore-changes: __cpuhp_* bpf_analyzer |