The branch main has been updated by emaste:

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

commit fc544d3b57f27f1422969fca0002cb2bff30ab17
Author:     Ed Maste <[email protected]>
AuthorDate: 2023-04-05 23:27:24 +0000
Commit:     Ed Maste <[email protected]>
CommitDate: 2026-09-24 16:57:09 +0000

    makefs: Remove unused "mac68k" support
    
    Obtained from:  OpenBSD 4f3c7809d4013a2eb3e75fc5e7bd2d8ae1f41843
---
 usr.sbin/makefs/cd9660/cd9660_eltorito.c | 6 ++----
 usr.sbin/makefs/makefs.8                 | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c 
b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index dd5bf67b2b09..76a208a404d9 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -110,14 +110,12 @@ cd9660_add_boot_disk(iso9660_disk *diskStructure, const 
char *boot_info)
                new_image->system = ET_SYS_X86;
        else if (strcmp(sysname, "powerpc") == 0)
                new_image->system = ET_SYS_PPC;
-       else if (strcmp(sysname, "macppc") == 0 ||
-                strcmp(sysname, "mac68k") == 0)
+       else if (strcmp(sysname, "macppc") == 0)
                new_image->system = ET_SYS_MAC;
        else if (strcmp(sysname, "efi") == 0)
                new_image->system = ET_SYS_EFI;
        else {
-               warnx("boot disk system must be "
-                     "i386, powerpc, macppc, mac68k, or efi");
+               warnx("boot disk system must be i386, powerpc, macppc, or efi");
                free(temp);
                free(new_image);
                return 0;
diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index 56e2ffda956f..e165702813ae 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -395,7 +395,6 @@ where
 is one of
 .Ql efi ,
 .Ql i386 ,
-.Ql mac68k ,
 .Ql macppc ,
 or
 .Ql powerpc .

Reply via email to