Date: Tue, 3 Sep 2019 19:42:04 +0000 (UTC) From: Kris Moore <kmoore@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351781 - in head: . etc/mtree share/man/man5 share/mk targets/pseudo/userland tools/build/mk usr.sbin usr.sbin/pc-sysinstall Message-ID: <201909031942.x83Jg4Kw069697@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmoore (ports committer) Date: Tue Sep 3 19:42:04 2019 New Revision: 351781 URL: https://svnweb.freebsd.org/changeset/base/351781 Log: - Retire pc-sysinstall(8) https://reviews.freebsd.org/D21094 Submitted by: kmoore@FreeBSD.org Approved by: imp@FreeBSD.org Deleted: head/usr.sbin/pc-sysinstall/ Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.usr.dist head/share/man/man5/src.conf.5 head/share/mk/src.opts.mk head/targets/pseudo/userland/Makefile.depend head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.sbin/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Tue Sep 3 19:39:06 2019 (r351780) +++ head/ObsoleteFiles.inc Tue Sep 3 19:42:04 2019 (r351781) @@ -37,6 +37,87 @@ # -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \ # xargs -n1 | sort | uniq -d; # done + +# 20190903: pc-sysinstall(8) removed +OLD_FILES+=usr/share/examples/pc-sysinstall/README +OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf +OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall +OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli +OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror +OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall +OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore +OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync +OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade +OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs +OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz +OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh +OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh +OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs +OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade +OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt +OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt +OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt +OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf +OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list +OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size +OLD_FILES+=usr/share/pc-sysinstall/doc/help-index +OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall +OLD_FILES+=usr/sbin/pc-sysinstall +OLD_DIRS+=usr/share/examples/pc-sysinstall +OLD_DIRS+=usr/share/pc-sysinstall/backend +OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager +OLD_DIRS+=usr/share/pc-sysinstall/backend-query +OLD_DIRS+=usr/share/pc-sysinstall/conf/license +OLD_DIRS+=usr/share/pc-sysinstall/conf +OLD_DIRS+=usr/share/pc-sysinstall/doc +OLD_DIRS+=usr/share/pc-sysinstall # 20190825: zlib 1.0.4 removed from kernel OLD_FILES+=usr/include/sys/zlib.h Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Tue Sep 3 19:39:06 2019 (r351780) +++ head/etc/mtree/BSD.usr.dist Tue Sep 3 19:42:04 2019 (r351781) @@ -303,8 +303,6 @@ .. netgraph .. - pc-sysinstall - .. perfmon .. pf @@ -1166,20 +1164,6 @@ .. man3 .. - .. - .. - pc-sysinstall - backend - .. - backend-partmanager - .. - backend-query - .. - conf - license - .. - .. - doc .. .. security Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Tue Sep 3 19:39:06 2019 (r351780) +++ head/share/man/man5/src.conf.5 Tue Sep 3 19:42:04 2019 (r351781) @@ -1584,10 +1584,6 @@ Set to build some programs without PAM support, partic .Xr ftpd 8 and .Xr ppp 8 . -.It Va WITHOUT_PC_SYSINSTALL -Set to not build -.Xr pc-sysinstall 8 -and related programs. .It Va WITHOUT_PF Set to not build PF firewall package. When set, it enforces these options: Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Tue Sep 3 19:39:06 2019 (r351780) +++ head/share/mk/src.opts.mk Tue Sep 3 19:42:04 2019 (r351781) @@ -153,7 +153,6 @@ __DEFAULT_YES_OPTIONS = \ OFED \ OPENSSL \ PAM \ - PC_SYSINSTALL \ PF \ PKGBOOTSTRAP \ PMC \ Modified: head/targets/pseudo/userland/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/Makefile.depend Tue Sep 3 19:39:06 2019 (r351780) +++ head/targets/pseudo/userland/Makefile.depend Tue Sep 3 19:42:04 2019 (r351781) @@ -652,13 +652,6 @@ DIRDEPS+= \ usr.sbin/ntp/ntpq \ usr.sbin/ntp/ntptime \ usr.sbin/ntp/sntp \ - usr.sbin/pc-sysinstall/backend \ - usr.sbin/pc-sysinstall/backend-partmanager \ - usr.sbin/pc-sysinstall/backend-query \ - usr.sbin/pc-sysinstall/conf \ - usr.sbin/pc-sysinstall/doc \ - usr.sbin/pc-sysinstall/examples \ - usr.sbin/pc-sysinstall/pc-sysinstall \ usr.sbin/pciconf \ usr.sbin/periodic \ usr.sbin/pkg \ Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Sep 3 19:39:06 2019 (r351780) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Sep 3 19:42:04 2019 (r351781) @@ -2469,16 +2469,6 @@ OLD_FILES+=usr/share/examples/netgraph/raw OLD_FILES+=usr/share/examples/netgraph/udp.tunnel OLD_FILES+=usr/share/examples/netgraph/virtual.chain OLD_FILES+=usr/share/examples/netgraph/virtual.lan -OLD_FILES+=usr/share/examples/pc-sysinstall/README -OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs OLD_FILES+=usr/share/examples/perfmon/Makefile OLD_FILES+=usr/share/examples/perfmon/README OLD_FILES+=usr/share/examples/perfmon/perfmon.c @@ -2611,7 +2601,6 @@ OLD_DIRS+=usr/share/examples/libusb20 OLD_DIRS+=usr/share/examples/libvgl OLD_DIRS+=usr/share/examples/mdoc OLD_DIRS+=usr/share/examples/netgraph -OLD_DIRS+=usr/share/examples/pc-sysinstall OLD_DIRS+=usr/share/examples/perfmon OLD_DIRS+=usr/share/examples/pf OLD_DIRS+=usr/share/examples/ppi @@ -7822,95 +7811,6 @@ OLD_FILES+=usr/share/man/man8/sshd.8.gz .if ${MK_OPENSSL} == no OLD_FILES+=etc/rc.d/keyserv -.endif - -.if ${MK_PC_SYSINSTALL} == no -# backend-partmanager -OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh -# backend-query -OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh -OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh -# backend -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh -OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh -# conf -OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs -OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade -OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt -OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt -OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt -OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf -# doc -OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list -OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size -OLD_FILES+=usr/share/pc-sysinstall/doc/help-index -OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall -# examples -OLD_FILES+=usr/share/examples/pc-sysinstall/README -OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade -OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs -# pc-sysinstall -OLD_FILES+=usr/sbin/pc-sysinstall -OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz -OLD_DIRS+=usr/share/pc-sysinstall/backend -OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager -OLD_DIRS+=usr/share/pc-sysinstall/backend-query -OLD_DIRS+=usr/share/pc-sysinstall/conf/license -OLD_DIRS+=usr/share/pc-sysinstall/conf -OLD_DIRS+=usr/share/pc-sysinstall/doc -OLD_DIRS+=usr/share/pc-sysinstall -OLD_DIRS+=usr/share/examples/pc-sysinstall .endif .if ${MK_PF} == no Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Tue Sep 3 19:39:06 2019 (r351780) +++ head/usr.sbin/Makefile Tue Sep 3 19:42:04 2019 (r351781) @@ -181,7 +181,6 @@ SUBDIR.${MK_NIS}+= ypserv SUBDIR.${MK_NIS}+= ypset SUBDIR.${MK_NTP}+= ntp SUBDIR.${MK_OPENSSL}+= keyserv -SUBDIR.${MK_PC_SYSINSTALL}+= pc-sysinstall SUBDIR.${MK_PF}+= ftp-proxy SUBDIR.${MK_PKGBOOTSTRAP}+= pkg .if ${COMPILER_FEATURES:Mc++11}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909031942.x83Jg4Kw069697>