Author: emaste
Date: Mon Mar 9 20:46:43 2020
New Revision: 358821
URL: https://svnweb.freebsd.org/changeset/base/358821
Log:
retire amd(8)
autofs was introduced with FreeBSD 10.1 and is the supported method for
automounting filesystems. As of r296194 the amd man page claimed that it
is deprecated. Remove it from base now; the sysutils/am-utils port is
still available if necessary.
Discussed with: cy
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
Deleted:
head/contrib/amd/
head/libexec/rc/rc.d/amd
head/tools/build/options/WITHOUT_AMD
head/tools/build/options/WITH_AMD
head/usr.sbin/amd/
Modified:
head/Makefile.inc1
head/ObsoleteFiles.inc
head/UPDATING
head/libexec/rc/rc.d/Makefile
head/release/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.sbin/Makefile
head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Mon Mar 9 20:31:38 2020 (r358820)
+++ head/Makefile.inc1 Mon Mar 9 20:46:43 2020 (r358821)
@@ -2284,11 +2284,6 @@ _basic_bootstrap_tools+=sbin/sysctl bin/chflags
# mkfifo is used by sys/conf/newvers.sh
_basic_bootstrap_tools+=usr.bin/mkfifo
-.if ${MK_AMD} != "no"
-# unifdef is only used by usr.sbin/amd/libamu/Makefile
-_basic_bootstrap_tools+=usr.bin/unifdef
-.endif
-
.if ${MK_BOOT} != "no"
_basic_bootstrap_tools+=bin/dd
# xz/unxz is used by EFI
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Mon Mar 9 20:31:38 2020 (r358820)
+++ head/ObsoleteFiles.inc Mon Mar 9 20:46:43 2020 (r358821)
@@ -36,6 +36,28 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20200309: amd(8) retired
+OLD_FILES+=etc/amd.map
+OLD_FILES+=etc/newsyslog.conf.d/amd.conf
+OLD_FILES+=etc/rc.d/amd
+OLD_FILES+=usr/bin/pawd
+OLD_FILES+=usr/sbin/amd
+OLD_FILES+=usr/sbin/amq
+OLD_FILES+=usr/sbin/fixmount
+OLD_FILES+=usr/sbin/fsinfo
+OLD_FILES+=usr/sbin/hlfsd
+OLD_FILES+=usr/sbin/mk-amd-map
+OLD_FILES+=usr/sbin/wire-test
+OLD_FILES+=usr/share/examples/etc/amd.map
+OLD_FILES+=usr/share/man/man1/pawd.1.gz
+OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
+OLD_FILES+=usr/share/man/man8/amd.8.gz
+OLD_FILES+=usr/share/man/man8/amq.8.gz
+OLD_FILES+=usr/share/man/man8/fixmount.8.gz
+OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
+OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
+OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
+OLD_FILES+=usr/share/man/man8/wire-test.8.gz
# 20200301: bktr removed
OLD_DIRS+=usr/include/dev/bktr
OLD_FILES+=usr/include/dev/bktr/ioctl_bktr.h
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Mon Mar 9 20:31:38 2020 (r358820)
+++ head/UPDATING Mon Mar 9 20:46:43 2020 (r358821)
@@ -26,6 +26,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20200309:
+ The amd(8) automount daemon has been removed from the source tree.
+ As of FreeBSD 10.1 autofs(5) is the preferred tool for automounting.
+ amd is still available in the sysutils/am-utils port.
+
20200301:
Removed brooktree driver (bktr.4) from the tree.
Modified: head/libexec/rc/rc.d/Makefile
==============================================================================
--- head/libexec/rc/rc.d/Makefile Mon Mar 9 20:31:38 2020
(r358820)
+++ head/libexec/rc/rc.d/Makefile Mon Mar 9 20:46:43 2020
(r358821)
@@ -141,12 +141,6 @@ ACPIPACKAGE= acpi
CONFS+= powerd
.endif
-.if ${MK_AMD} != "no"
-CONFGROUPS+= AMD
-AMD+= amd
-AMDPACKAGE= amd
-.endif
-
.if ${MK_APM} != "no"
CONFGROUPS+= APM
APM+= apm
Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile Mon Mar 9 20:31:38 2020 (r358820)
+++ head/release/Makefile Mon Mar 9 20:46:43 2020 (r358821)
@@ -192,7 +192,7 @@ disc1: packagesystem
# Install system
mkdir -p ${.TARGET}
cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
- DESTDIR=${.OBJDIR}/${.TARGET} MK_AMD=no MK_AT=no \
+ DESTDIR=${.OBJDIR}/${.TARGET} MK_AT=no \
MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
MK_TOOLCHAIN=no MK_PROFILE=no \
MK_RESCUE=no MK_DICT=no \
@@ -221,7 +221,7 @@ bootonly: packagesystem
# Install system
mkdir -p ${.TARGET}
cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
- DESTDIR=${.OBJDIR}/${.TARGET} MK_AMD=no MK_AT=no \
+ DESTDIR=${.OBJDIR}/${.TARGET} MK_AT=no \
MK_GAMES=no \
MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
MK_TOOLCHAIN=no MK_PROFILE=no \
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Mar 9 20:31:38
2020 (r358820)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Mar 9 20:46:43
2020 (r358821)
@@ -58,30 +58,6 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
OLD_FILES+=etc/rc.d/powerd
.endif
-.if ${MK_AMD} == no
-OLD_FILES+=etc/amd.map
-OLD_FILES+=etc/newsyslog.conf.d/amd.conf
-OLD_FILES+=etc/rc.d/amd
-OLD_FILES+=usr/bin/pawd
-OLD_FILES+=usr/sbin/amd
-OLD_FILES+=usr/sbin/amq
-OLD_FILES+=usr/sbin/fixmount
-OLD_FILES+=usr/sbin/fsinfo
-OLD_FILES+=usr/sbin/hlfsd
-OLD_FILES+=usr/sbin/mk-amd-map
-OLD_FILES+=usr/sbin/wire-test
-OLD_FILES+=usr/share/examples/etc/amd.map
-OLD_FILES+=usr/share/man/man1/pawd.1.gz
-OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
-OLD_FILES+=usr/share/man/man8/amd.8.gz
-OLD_FILES+=usr/share/man/man8/amq.8.gz
-OLD_FILES+=usr/share/man/man8/fixmount.8.gz
-OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
-OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
-OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
-OLD_FILES+=usr/share/man/man8/wire-test.8.gz
-.endif
-
.if ${MK_APM} == no
OLD_FILES+=etc/rc.d/apm
OLD_FILES+=etc/rc.d/apmd
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Mon Mar 9 20:31:38 2020 (r358820)
+++ head/usr.sbin/Makefile Mon Mar 9 20:46:43 2020 (r358821)
@@ -109,7 +109,6 @@ SUBDIR= adduser \
SUBDIR.${MK_ACCT}+= accton
SUBDIR.${MK_ACCT}+= sa
-SUBDIR.${MK_AMD}+= amd
SUBDIR.${MK_AUDIT}+= audit
SUBDIR.${MK_AUDIT}+= auditd
.if ${MK_OPENSSL} != "no"
Modified: head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
==============================================================================
--- head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile Mon Mar 9 20:31:38
2020 (r358820)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile Mon Mar 9 20:46:43
2020 (r358821)
@@ -6,10 +6,6 @@ CONFSDIR= /etc/newsyslog.conf.d
CONFS=
-.if ${MK_AMD} != "no"
-CONFS+= amd.conf
-.endif
-
.if ${MK_FTP} != "no"
CONFS+= ftp.conf
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
