From nobody Sat Jul 25 13:07:54 2026 X-Original-To: dev-commits-src-all@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 4h6lXB5qTFz6lND2 for ; Sat, 25 Jul 2026 13:07:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6lXB5Cy3z3ltV for ; Sat, 25 Jul 2026 13:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784984874; 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=46W8HFDRRcQqOsFTn/KvSN3RgzBMjSWA03/clXSOlr4=; b=wKFqZS5wyPL0P9O9Mnh8UqJxwlzQpnaJz7h1PNIN+NbvnH2B0Ruk5rozQV8i/2X41CpcPH wtBgpcFJd8cY7ttyW9ozS5eQP8zedtWTE7hCK7urbZsuAWWSP9YZjOjV4bJCHgHZwfXSA/ bs5IslNrXE2cX5RxuTTBpKvFRM31pNffEFZDxMSgLyjQYFHiSzBKNlkMnfI6PPxUois3g5 06J+IJ9/ZHd+8tDvqu+qbVNtkOk5ZUEngrNEQbwoMTcjshxY1l/L2GCcLlEiBpqOcWCy9Z XFQILP0zsN2K7w6PJFn0wNj+YXpeA9hMd4M1xpFF3jublxZTTvuzxvnmoHWPtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784984874; a=rsa-sha256; cv=none; b=VPZFeOpZEv5b3xa1QF9imT1nUnBsVTM2FnV6KRDDAnKXfjKY/4Wq6Wz8Y4imgU3QIvrCMl zNLjpra2gAWye2sBDkQE7pl6kBb7FiHWuxWB0dTERUxz+3OM7YnLqAG9JACLhBvtR38j02 BOpwwXxwuYdop4HnBc2zy8uFAFoQuV0NUG+EswQ/WkEepPoKYuq1DN+3EqhzobtDbIZXPl 047UmSRhOcNG7v2wBlmd9tgho1eB7kmPtleRtvVld6c1rEouIzQ6zB9nHJrWT1TBP2Vxbo 3Ko+O9mUEgklwIxysHtg8CSqkOT5bcFwliHQTs4M9IsZ9mhZ4FZ8AJch1vMcEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784984874; 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=46W8HFDRRcQqOsFTn/KvSN3RgzBMjSWA03/clXSOlr4=; b=Op/eDlmjtmKq/SH3NDWWPv3sMVbw3uRGQfN555+ehyaBgoJXvPlWWOYk8rs8/M0HkqDPeL /DbJSuh8vrIWBJn2r/gpyOdl6BssujykI6dgC5mN7zqzSM91AlEy7GNOslB+1liBPSYP+L hBDclR6znkSeSvxa8ZoLKPSZcWVb5QBHN/poPAGn+afo7ezPFUFmWAYhBbj9ik0TW/Z1Mv zlsFu3/TloBiy90NgH0BLgNXA/78B+FlplDChZ4OMTNbHyA7UAX1piMSfLXtqPafypNB+G mwHt1E+HUOxCpALA4hLvM8ewFEjWnVBxbm4/uE8M9VlzvaO7Qn5DkIO+JaEoRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6lXB40RhzdRW for ; Sat, 25 Jul 2026 13:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ac0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 13:07:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: b04fa0f8b8c5 - stable/15 - apm: Only install rc script on i386 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b04fa0f8b8c562c7f8af9ad762ffcd31e6d63745 Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 13:07:54 +0000 Message-Id: <6a64b52a.26ac0.398b7a83@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=b04fa0f8b8c562c7f8af9ad762ffcd31e6d63745 commit b04fa0f8b8c562c7f8af9ad762ffcd31e6d63745 Author: Lexi Winter AuthorDate: 2026-04-26 16:47:27 +0000 Commit: Lexi Winter CommitDate: 2026-07-25 13:01:23 +0000 apm: Only install rc script on i386 The apm(8) rc script only works on i386, but it's installed on all platforms. Only install it on i386, which avoids creating a useless FreeBSD-apm package on other platforms. While here, build the acpi package on i386. Relnotes: yes MFC after: 2 weeks Reviewed by: imp Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56629 (cherry picked from commit b7daab8be1d4555f23a297e60e4128c01caabf82) --- libexec/rc/rc.d/Makefile | 6 +++--- packages/Makefile.arm | 1 - packages/Makefile.arm64 | 1 - packages/Makefile.i386 | 18 ++++++++++++++++++ packages/Makefile.powerpc | 1 - packages/Makefile.riscv64 | 1 - packages/apm/Makefile | 6 ------ tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 8 files changed, 24 insertions(+), 13 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index f25338c68766..3eed19987f83 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -92,11 +92,11 @@ CONFGROUPS.${MK_ACPI}+= ACPI ACPIPACKAGE= acpi ACPI= power_profile +.if ${MACHINE} == "i386" CONFGROUPS.${MK_APM}+= APM APMPACKAGE= apm -APM= apm -.if ${MACHINE} == "i386" -APM+= apmd +APM= apm \ + apmd .endif CONFGROUPS.${MK_AUDIT}+= AUDIT diff --git a/packages/Makefile.arm b/packages/Makefile.arm index db36ead23828..e7e37f03a7ba 100644 --- a/packages/Makefile.arm +++ b/packages/Makefile.arm @@ -15,4 +15,3 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. SUBDIR.${MK_ACPI}+= acpi -SUBDIR.${MK_APM}+= apm diff --git a/packages/Makefile.arm64 b/packages/Makefile.arm64 index 4bfca51bd031..2df3c30b3544 100644 --- a/packages/Makefile.arm64 +++ b/packages/Makefile.arm64 @@ -15,6 +15,5 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. SUBDIR.${MK_ACPI}+= acpi -SUBDIR.${MK_APM}+= apm SUBDIR.${MK_BHYVE}+= bhyve SUBDIR.${MK_BHYVE}+= libvmmapi diff --git a/packages/Makefile.i386 b/packages/Makefile.i386 new file mode 100644 index 000000000000..db36ead23828 --- /dev/null +++ b/packages/Makefile.i386 @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2026 Lexi Winter +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +SUBDIR.${MK_ACPI}+= acpi +SUBDIR.${MK_APM}+= apm diff --git a/packages/Makefile.powerpc b/packages/Makefile.powerpc index db36ead23828..e7e37f03a7ba 100644 --- a/packages/Makefile.powerpc +++ b/packages/Makefile.powerpc @@ -15,4 +15,3 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. SUBDIR.${MK_ACPI}+= acpi -SUBDIR.${MK_APM}+= apm diff --git a/packages/Makefile.riscv64 b/packages/Makefile.riscv64 index 4bfca51bd031..2df3c30b3544 100644 --- a/packages/Makefile.riscv64 +++ b/packages/Makefile.riscv64 @@ -15,6 +15,5 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. SUBDIR.${MK_ACPI}+= acpi -SUBDIR.${MK_APM}+= apm SUBDIR.${MK_BHYVE}+= bhyve SUBDIR.${MK_BHYVE}+= libvmmapi diff --git a/packages/apm/Makefile b/packages/apm/Makefile index ddf8d1ed12ae..b2488d13bb05 100644 --- a/packages/apm/Makefile +++ b/packages/apm/Makefile @@ -1,11 +1,5 @@ WORLDPACKAGE= apm -# On non-amd64 platforms, this package only contain an rc script. -# (This should be fixed.) -.if ${MACHINE_CPUARCH} != "amd64" -SUBPACKAGES= -.endif - # APM isn't applicable to jails. PKG_SETS= optional diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c76c51af68a5..d2a091b54fb1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -61,6 +61,9 @@ OLD_FILES+=etc/rc.d/apmd OLD_FILES+=etc/apmd.conf OLD_FILES+=usr/sbin/apm OLD_FILES+=usr/share/examples/etc/apmd.conf +.elif ${TARGET_ARCH} != "i386" +OLD_FILES+=etc/rc.d/apm +OLD_FILES+=etc/rc.d/apmd .endif .if ${MK_AT} == no