Page MenuHomeFreeBSD

Remove APM (series of commits, but shown as one for review)
Needs RevisionPublic

Authored by imp on Wed, Sep 16, 7:09 AM.

Details

Reviewers
markm
zeising
jkim
Summary

Remove apm as a module

De-orbit apm.ko as part of the APM retirement discussed on arch@.

Remove apm screen saver module.

Remove apm screen saver

With APM being removing, the APM screen saver is no longer needed or
useful.

Remove apm and apmd startup scripts

With APM departing the system, we no longer need to provide a way to
turn APM on at boot, nor a away to run apmd.

Remove apmd

With apm gone, there's no need for apmd.

No need to have a description of the apm packages anymore.

Remove APM build option.

Remove apm BIOS support

Remove the APM BIOS support. This became irrelevant around the time
Pentium 150-200 laptops were released and the world started moving to
ACPI.

Kept apm_bios.h because the apm program and the apm compat layer need
it still.

timer_restore is now unused, remove it

apm was the only consumer of timer_restore. Now that it's gone, this
can be removed.

Remove apm searching and support from zzz

Remove APM support from powerd.

Diff Detail

Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 33586
Build 30837: arc lint + arc unit

Event Timeline

imp created this revision.Wed, Sep 16, 7:09 AM
imp requested review of this revision.Wed, Sep 16, 7:09 AM

You probably want to remove tools/build/options/WITHOUT_APM since that option is gone and update tools/build/options/WITHOUT_ACPI to indicate that it also governs the installation of the apm(8) userland utility. OptionalObsoleteFiles.inc probably need to take this into account also.

markm accepted this revision.Wed, Sep 16, 7:53 AM
This revision is now accepted and ready to land.Wed, Sep 16, 7:53 AM
zeising requested changes to this revision.Wed, Sep 16, 8:30 AM

You need to remove the .Xr to apmd(8) from rc.conf(5) and acpiconf(8) as well, and references to apm(4) from apm(8).

usr.sbin/zzz/zzz.8
62

Since this utility is staying, you probably want to keep the reference.

This revision now requires changes to proceed.Wed, Sep 16, 8:30 AM
jkim accepted this revision.Wed, Sep 16, 1:01 PM
jkim added a subscriber: jkim.

LGTM

imp added a comment.Wed, Sep 16, 3:30 PM

You probably want to remove tools/build/options/WITHOUT_APM since that option is gone and update tools/build/options/WITHOUT_ACPI to indicate that it also governs the installation of the apm(8) userland utility. OptionalObsoleteFiles.inc probably need to take this into account also.

WITHOUT_APM already is on the remove list. OptionalObsoleteFiles has been updated. Please check to make sure it's been correctly updated. I've not re-run the script that generates src.conf.5, though.

usr.sbin/zzz/zzz.8
62

While this is true, apm 8 is no longer relevant to zzz. It will no longer use it, which is why I removed it.

In D26450#588478, @imp wrote:

You probably want to remove tools/build/options/WITHOUT_APM since that option is gone and update tools/build/options/WITHOUT_ACPI to indicate that it also governs the installation of the apm(8) userland utility. OptionalObsoleteFiles.inc probably need to take this into account also.

WITHOUT_APM already is on the remove list. OptionalObsoleteFiles has been updated. Please check to make sure it's been correctly updated. I've not re-run the script that generates src.conf.5, though.

I didn't see WITHOUT_APM on the remove list first, sorry about that.
src.conf.5 can be updated afterwards. SInce it's a generated file I guess it doesn't have to be part of the review. :)

Still needs rc.conf.8 and apm.8 updated.

tools/build/mk/OptionalObsoleteFiles.inc
67–68

If we're keeping apm.8 and apmconf.8 (wich are the same manual), you should keep these lines in OptionalObsoleteFiles.inc, since we're only installing the apm(8) utility if we're doing WITH_ACPI.
I don't know if we also need to add the i386 path there, since the util is built on i386 also. I don't have a i386 system to check on.

usr.sbin/zzz/zzz.8
62

Noted, makes sense.