From nobody Thu Sep 24 16:57:24 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hrKkr1tgmz6swZ6 for ; Thu, 24 Sep 2026 16:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hrKkr1SVsz4hBP for ; Thu, 24 Sep 2026 16:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790269044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FLTzRkcRNZ6JhbgwnTyaM3/JV/kaXSI8CWP46AWI1Ns=; b=hgffFJGWhUvJ7XhLVDfUYGsf6HG8H25cabOV2bLo8U4kCSYa2iZkR4d7IX+tBVHbmsCfwP n7dgfvD6MJx8ka9Eo09ZKefOqUU/GT+E0UjU9BQOJRgAE9tH8gf0Q9h1eKskIYTDelesnA rlraa+kxWBKd+bgLTbPvBWWRPnoFYx5mHRvOXtFfI6nYYA2EYNfhHPGSP4xXuXKqKQfkwS aYGT21x3Q0F3tzMaHsNxCHj3ir4XLrrI8ZkAz/I4FGjfhQNovesr6qr0SJpSpnckcOm5ID tXtrEE9jikutAj21drjAzGYMAvDyNu1l85CulQM0FdzAnKSHG4/qfw4Vc9D+Bw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790269044; b=bdcWDBNqS8xFiSI36tz3hW1CnmV7L12+Sj1lsSuW7487LOJYZmHLIqO2Z4g2Qz1dH508iq 1IakV4Uh7Ek7kQQvGgZreIZhHoigfAcHesmnsmxQIRMJb2ZnuWeDvTHMk850Udg+LkBahH RapbLvfrqWegAVCEIHFfEtchKIofSkgZASakCRtaD8C2FGIfn9/Q6dt2s4BOLI6OkSDhww cyhczA25b7ct7/cVjD69DEocmfZZAmCpjuO5hWfeFkPp36PW+avmIV3uvnbHNOqp9cCGBC vHUN+z8qDPFdmwDMh0UVeMWGwP618k1oBdirSpZQdeg0Ws4oCdTteQ8vQn3BaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790269044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FLTzRkcRNZ6JhbgwnTyaM3/JV/kaXSI8CWP46AWI1Ns=; b=FVvUXlhiZ+iZh4VAx4KPzg+lHXM6Zsfkf4zAb4F7FjlE9jo9QHj40jgqv/zaa66AmFgNxI Tx1/i4lN84feZF/r/rbuCzQsAbrPnu4iIgUivqe233LC0yAPLwy/FAfnm1Qbflh5uXgQN/ IYXAF6NBRG32+tyTOH+04xA6Itln8tr6YcmBdrhpwDOMJvrUGCBdcp2Sr2auA09lWDHzlG lF5129KR6dRtQyho36HyU1/QRHg0H6sIpfw+JYonYBhhdBeLuwlATuLySzfujzfXvYora7 ztnK3iZha0hPa1Eh/88018Z5aaFIWahTnkHXNZIO5huPtJUnypjlWAYjPhNM0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hrKkr0WTtzYcQ for ; Thu, 24 Sep 2026 16:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19912 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 24 Sep 2026 16:57:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fc544d3b57f2 - main - makefs: Remove unused "mac68k" support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc544d3b57f27f1422969fca0002cb2bff30ab17 Auto-Submitted: auto-generated Date: Thu, 24 Sep 2026 16:57:24 +0000 Message-Id: <6ab55674.19912.15258d78@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fc544d3b57f27f1422969fca0002cb2bff30ab17 commit fc544d3b57f27f1422969fca0002cb2bff30ab17 Author: Ed Maste AuthorDate: 2023-04-05 23:27:24 +0000 Commit: Ed Maste 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 .