Page MenuHomeFreeBSD
Files F163366928

D18579.id52082.diff
No OneTemporary
Actions

D18579.id52082.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -2226,11 +2226,6 @@
# 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
Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -38,6 +38,28 @@
# xargs -n1 | sort | uniq -d;
# done
+# 2019XXXX: amd(8) deprecation
+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
# 20181211: new clang import which bumps version from 6.0.1 to 7.0.1.
OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/allocator_interface.h
OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/asan_interface.h
Index: libexec/rc/rc.conf
===================================================================
--- libexec/rc/rc.conf
+++ libexec/rc/rc.conf
@@ -337,10 +337,6 @@
ftpd_flags="" # Additional flags to stand-alone ftpd.
### Network daemon (NFS): All need rpcbind_enable="YES" ###
-amd_enable="NO" # Run amd service with $amd_flags (or NO).
-amd_program="/usr/sbin/amd" # path to amd, if you want a different one.
-amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
-amd_map_program="NO" # Can be set to "ypcat -k amd.master"
autofs_enable="NO" # Run autofs daemons.
automount_flags="" # Flags to automount(8) (if autofs enabled).
automountd_flags="" # Flags to automountd(8) (if autofs enabled).
Index: libexec/rc/rc.d/Makefile
===================================================================
--- libexec/rc/rc.d/Makefile
+++ libexec/rc/rc.d/Makefile
@@ -149,12 +149,6 @@
CONFS+= powerd
.endif
-.if ${MK_AMD} != "no"
-CONFGROUPS+= AMD
-AMD+= amd
-AMDPACKAGE= amd
-.endif
-
.if ${MK_APM} != "no"
CONFGROUPS+= APM
APM+= apm
Index: release/Makefile
===================================================================
--- release/Makefile
+++ release/Makefile
@@ -192,7 +192,7 @@
# 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_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
MK_RESCUE=no MK_DICT=no \
@@ -221,7 +221,7 @@
# 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_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk
+++ share/mk/src.libnames.mk
@@ -474,9 +474,6 @@
LIBBSNMPTOOLSDIR= ${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a
-LIBAMUDIR= ${OBJTOP}/usr.sbin/amd/libamu
-LIBAMU?= ${LIBAMUDIR}/libamu.a
-
LIBBE?= ${LIBBEDIR}/libbe.a
LIBPMCSTATDIR= ${OBJTOP}/lib/libpmcstat
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -55,7 +55,6 @@
__DEFAULT_YES_OPTIONS = \
ACCT \
ACPI \
- AMD \
APM \
AT \
ATM \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -54,30 +54,6 @@
OLD_FILES+=usr/share/man/man8/iasl.8.gz
.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
Index: usr.sbin/Makefile
===================================================================
--- usr.sbin/Makefile
+++ usr.sbin/Makefile
@@ -107,7 +107,6 @@
SUBDIR.${MK_ACCT}+= accton
SUBDIR.${MK_ACCT}+= sa
-SUBDIR.${MK_AMD}+= amd
SUBDIR.${MK_AUDIT}+= audit
SUBDIR.${MK_AUDIT}+= auditd
.if ${MK_OPENSSL} != "no"
Index: usr.sbin/newsyslog/newsyslog.conf.d/Makefile
===================================================================
--- usr.sbin/newsyslog/newsyslog.conf.d/Makefile
+++ usr.sbin/newsyslog/newsyslog.conf.d/Makefile
@@ -6,10 +6,6 @@
CONFS=
-.if ${MK_AMD} != "no"
-CONFS+= amd.conf
-.endif
-
.if ${MK_FTP} != "no"
CONFS+= ftp.conf
.endif

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 1:47 PM (7 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35403939
Default Alt Text
D18579.id52082.diff (5 KB)

Event Timeline