The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=87bf0aaba8f1bd743d4df24ae422dd8075260d45

commit 87bf0aaba8f1bd743d4df24ae422dd8075260d45
Author:     Henrich Hartzer <henrichhart...@tuta.io>
AuthorDate: 2024-05-10 23:03:14 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2024-05-23 20:30:57 +0000

    Remove COMPAT_FREEBSD4/5/6/7/9 from MINIMAL and FIRECRACKER kernel 
configurations
    
    FIRECRACKER is not a legacy config, so remove the really old FreeBSD
    versions from it. MINIMAL has a similar history, and limited target
    audience which has little to no overlap with really old binaries. Either
    of these is really easy to get additional binary compat with the include
    directive, so balance things better. Leave GENERIC alone.
    
    PR: 231768
    Signed-off-by: Henrich Hartzer <henrichhart...@tuta.io>
    Reviewed by: imp (MINIMAL), cperciva (FIRECRACKER)
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1228
---
 sys/amd64/conf/FIRECRACKER | 5 -----
 sys/amd64/conf/MINIMAL     | 5 -----
 sys/i386/conf/MINIMAL      | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER
index b8ea17ee4a78..a36fb974c24e 100644
--- a/sys/amd64/conf/FIRECRACKER
+++ b/sys/amd64/conf/FIRECRACKER
@@ -57,11 +57,6 @@ options      GEOM_RAID               # Soft RAID 
functionality.
 options        GEOM_LABEL              # Provides labelization
 options        EFIRT                   # EFI Runtime Services support
 options        COMPAT_FREEBSD32        # Compatible with i386 binaries
-options        COMPAT_FREEBSD4         # Compatible with FreeBSD4
-options        COMPAT_FREEBSD5         # Compatible with FreeBSD5
-options        COMPAT_FREEBSD6         # Compatible with FreeBSD6
-options        COMPAT_FREEBSD7         # Compatible with FreeBSD7
-options        COMPAT_FREEBSD9         # Compatible with FreeBSD9
 options        COMPAT_FREEBSD10        # Compatible with FreeBSD10
 options        COMPAT_FREEBSD11        # Compatible with FreeBSD11
 options        COMPAT_FREEBSD12        # Compatible with FreeBSD12
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index 191b88daca14..0baf6d6431de 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -49,11 +49,6 @@ options      QUOTA                   # Enable disk quotas 
for UFS
 options        MD_ROOT                 # MD is a potential root device
 options        GEOM_LABEL              # Provides labelization
 options        COMPAT_FREEBSD32        # Compatible with i386 binaries
-options        COMPAT_FREEBSD4         # Compatible with FreeBSD4
-options        COMPAT_FREEBSD5         # Compatible with FreeBSD5
-options        COMPAT_FREEBSD6         # Compatible with FreeBSD6
-options        COMPAT_FREEBSD7         # Compatible with FreeBSD7
-options        COMPAT_FREEBSD9         # Compatible with FreeBSD9
 options        COMPAT_FREEBSD10        # Compatible with FreeBSD10
 options        COMPAT_FREEBSD11        # Compatible with FreeBSD11
 options        COMPAT_FREEBSD12        # Compatible with FreeBSD12
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index 73277c7a3cee..2a06eb84bff8 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -54,11 +54,6 @@ options      UFS_GJOURNAL            # Enable gjournal-based 
UFS journaling
 options        QUOTA                   # Enable disk quotas for UFS
 options        MD_ROOT                 # MD is a potential root device
 options        GEOM_LABEL              # Provides labelization
-options        COMPAT_FREEBSD4         # Compatible with FreeBSD4
-options        COMPAT_FREEBSD5         # Compatible with FreeBSD5
-options        COMPAT_FREEBSD6         # Compatible with FreeBSD6
-options        COMPAT_FREEBSD7         # Compatible with FreeBSD7
-options        COMPAT_FREEBSD9         # Compatible with FreeBSD9
 options        COMPAT_FREEBSD10        # Compatible with FreeBSD10
 options        COMPAT_FREEBSD11        # Compatible with FreeBSD11
 options        COMPAT_FREEBSD12        # Compatible with FreeBSD12

Reply via email to