Page MenuHomeFreeBSD
Files F163609257

D56629.diff
No OneTemporary
Actions

D56629.diff
View Options

diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -92,11 +92,11 @@
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
--- 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
--- 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.arm b/packages/Makefile.i386
copy from packages/Makefile.arm
copy to packages/Makefile.i386
diff --git a/packages/Makefile.powerpc b/packages/Makefile.powerpc
--- 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
--- 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
--- 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
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -61,6 +61,9 @@
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

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 25, 9:05 PM (15 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35496176
Default Alt Text
D56629.diff (2 KB)

Event Timeline