svn commit: r342242 - in head: . etc/mtree libexec/rc libexec/rc/rc.d share/examples share/examples/ibcs2 share/man/man4 share/man/man5 usr.sbin/bsdconfig/startup usr.sbin/bsdconfig/startup/include
Mateusz Guzik
mjg at FreeBSD.org
Wed Dec 19 21:56:57 UTC 2018
Author: mjg
Date: Wed Dec 19 21:56:54 2018
New Revision: 342242
URL: https://svnweb.freebsd.org/changeset/base/342242
Log:
Remove iBCS2, part1: userspace
iBCS2 was disconnected from the build in 2015 (see r291419)
bsdconfig parts submitted by dteske.
Reviewed by: kib (previous version)
Sponsored by: The FreeBSD Foundation
Deleted:
head/share/examples/ibcs2/
Modified:
head/ObsoleteFiles.inc
head/etc/mtree/BSD.usr.dist
head/libexec/rc/rc.conf
head/libexec/rc/rc.d/archdep
head/share/examples/Makefile
head/share/man/man4/kld.4
head/share/man/man5/rc.conf.5
head/usr.sbin/bsdconfig/startup/include/messages.subr
head/usr.sbin/bsdconfig/startup/misc
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Wed Dec 19 21:28:11 2018 (r342241)
+++ head/ObsoleteFiles.inc Wed Dec 19 21:56:54 2018 (r342242)
@@ -38,6 +38,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20181219: ibcs removal
+OLD_FILES+=usr/share/examples/ibcs2/hello.uu
+OLD_FILES+=usr/share/examples/ibcs2/README
+OLD_DIRS+=usr/share/examples/ibcs2
# 20181215: Migration of CTM to ports
OLD_FILES+=usr/sbin/ctm
OLD_FILES+=usr/sbin/ctm_dequeue
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Wed Dec 19 21:28:11 2018 (r342241)
+++ head/etc/mtree/BSD.usr.dist Wed Dec 19 21:56:54 2018 (r342242)
@@ -251,8 +251,6 @@
..
hostapd
..
- ibcs2
- ..
indent
..
ipfilter
Modified: head/libexec/rc/rc.conf
==============================================================================
--- head/libexec/rc/rc.conf Wed Dec 19 21:28:11 2018 (r342241)
+++ head/libexec/rc/rc.conf Wed Dec 19 21:56:54 2018 (r342242)
@@ -626,8 +626,6 @@ quotaon_flags="-a" # Turn quotas on for all file syste
quotaoff_flags="-a" # Turn quotas off for all file systems at shutdown
quotacheck_flags="-a" # Check all file system quotas (if enabled)
accounting_enable="NO" # Turn on process accounting (or NO).
-ibcs2_enable="NO" # Ibcs2 (SCO) emulation loaded at startup (or NO).
-ibcs2_loaders="coff" # List of additional Ibcs2 loaders (or NO).
firstboot_sentinel="/firstboot" # Scripts with "firstboot" keyword are run if
# this file exists. Should be on a R/W filesystem so
# the file can be deleted after the boot completes.
Modified: head/libexec/rc/rc.d/archdep
==============================================================================
--- head/libexec/rc/rc.d/archdep Wed Dec 19 21:28:11 2018 (r342241)
+++ head/libexec/rc/rc.d/archdep Wed Dec 19 21:56:54 2018 (r342242)
@@ -19,25 +19,6 @@ archdep_start()
_arch=`${SYSCTL_N} hw.machine_arch`
case $_arch in
- i386)
- # SCO binary emulation
- #
- if checkyesno ibcs2_enable; then
- echo -n 'Initial i386 initialization:'
- echo -n ' ibcs2'
- load_kld ibcs2
- case ${ibcs2_loaders} in
- [Nn][Oo])
- ;;
- *)
- for i in ${ibcs2_loaders}; do
- load_kld ibcs2_$i
- done
- ;;
- esac
- echo '.'
- fi
- ;;
esac
}
Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile Wed Dec 19 21:28:11 2018 (r342241)
+++ head/share/examples/Makefile Wed Dec 19 21:56:54 2018 (r342242)
@@ -16,7 +16,6 @@ LDIRS= BSD_daemon \
drivers \
etc \
find_interface \
- ibcs2 \
indent \
ipfw \
jails \
@@ -98,11 +97,6 @@ SE_FIND_INTERFACE= \
Makefile \
README \
find_interface.c
-
-SE_DIRS+= ibcs2
-SE_IBCS2= \
- README \
- hello.uu
SE_DIRS+= indent
SE_INDENT= indent.pro
Modified: head/share/man/man4/kld.4
==============================================================================
--- head/share/man/man4/kld.4 Wed Dec 19 21:28:11 2018 (r342241)
+++ head/share/man/man4/kld.4 Wed Dec 19 21:56:54 2018 (r342242)
@@ -57,10 +57,8 @@ system makes extensive use of loadable kernel modules,
versions of most file systems, the
.Tn NFS
client and server, all the screen-savers, and the
-.Tn iBCS2
-and
.Tn Linux
-emulators.
+emulator.
.Nm
modules are placed by default in the
.Pa /boot/kernel
Modified: head/share/man/man5/rc.conf.5
==============================================================================
--- head/share/man/man5/rc.conf.5 Wed Dec 19 21:28:11 2018 (r342241)
+++ head/share/man/man5/rc.conf.5 Wed Dec 19 21:56:54 2018 (r342242)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 24, 2018
+.Dd December 19, 2018
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -3540,21 +3540,6 @@ Set to
to enable system accounting through the
.Xr accton 8
facility.
-.It Va ibcs2_enable
-.Pq Vt bool
-Set to
-.Dq Li YES
-to enable iBCS2 (SCO) binary emulation at system initial boot
-time.
-.It Va ibcs2_loaders
-.Pq Vt str
-If not set to
-.Dq Li NO
-and if
-.Va ibcs2_enable
-is set to
-.Dq Li YES ,
-this specifies a list of additional iBCS2 loaders to enable.
.It Va firstboot_sentinel
.Pq Vt str
This variable specifies the full path to a
Modified: head/usr.sbin/bsdconfig/startup/include/messages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/include/messages.subr Wed Dec 19 21:28:11 2018 (r342241)
+++ head/usr.sbin/bsdconfig/startup/include/messages.subr Wed Dec 19 21:56:54 2018 (r342242)
@@ -90,8 +90,6 @@ msg_rcvar_contains_invalid_chars="ERROR! rc.conf(5) va
msg_rcvar_must_start_with="ERROR! rc.conf(5) variable name must start with\n a letter [a-zA-Z] or underscore [_]."
msg_reset="Reset"
msg_reset_desc="Reset to default view settings"
-msg_sco="SCO"
-msg_sco_desc="This host wants to be able to run IBCS2 binaries."
msg_show_configured="Show Configured"
msg_show_configured_desc="Calculate rc.conf(5) locations (slowest)"
msg_show_default_value="Show Default/Value"
Modified: head/usr.sbin/bsdconfig/startup/misc
==============================================================================
--- head/usr.sbin/bsdconfig/startup/misc Wed Dec 19 21:28:11 2018 (r342241)
+++ head/usr.sbin/bsdconfig/startup/misc Wed Dec 19 21:56:54 2018 (r342242)
@@ -73,7 +73,6 @@ dialog_menu_main()
if [ "$UNAME_P" = "i386" ]; then
var_list="$var_list
apm_enable
- ibcs2_enable
" # END-QUOTE
fi
@@ -94,7 +93,6 @@ dialog_menu_main()
export msg_nis_server msg_nis_server_desc
export msg_accounting msg_accounting_desc
export msg_lpd msg_lpd_desc
- export msg_sco msg_sco_desc
:| awk \
-v uname_p="$UNAME_P" \
-v menu_tags="$DIALOG_MENU_TAGS" \
@@ -223,21 +221,6 @@ dialog_menu_main()
mprint(tag, ENVIRON["msg_lpd_desc"])
if (ditem == char) defaultitem = tag
- if ( uname_p == "i386" )
- {
- #
- # SCO: This host wants to be able to run IBCS2
- # binaries.
- #
- char = substr(menu_tags, i++, 1)
- mark = ( ENVIRON["ibcs2_enable"] ~ \
- /^[Yy][Ee][Ss]$/ ? "X" : " " )
- subtag = ENVIRON["msg_sco"]
- tag = sprintf(mtag_fmt, char, mark, subtag)
- mprint(tag, ENVIRON["msg_sco_desc"])
- if (ditem == char) defaultitem = tag
- }
-
printf "\"\n"
if ( defaultitem )
@@ -343,9 +326,6 @@ while :; do
?" ["?"] $msg_lpd")
f_eval_catch -dk err "$0" f_sysrc_set \
'f_sysrc_set lpd_enable "%s"' "$reverse" ;;
- ?" ["?"] $msg_sco")
- f_eval_catch -dk err "$0" f_sysrc_set \
- 'f_sysrc_set ibcs2_enable "%s"' "$reverse" ;;
# Multi-variable On/Off toggle bits
?" ["?"] $msg_nis_client")
if f_eval_catch -dk err "$0" f_sysrc_set \
More information about the svn-src-all
mailing list