svn commit: r278139 - in head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common: pid plockstat
Author: markj Date: Tue Feb 3 06:22:46 2015 New Revision: 278139 URL: https://svnweb.freebsd.org/changeset/base/278139 Log: Avoid hard-coding a path to ksh in scripts that are executed directly by the test harness. This is a problem in many of the *.ksh test scripts as well, but those scripts are executed using a shell whose path is specified in dtest.pl, so there's no need to modify them. MFC after:1 week Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe == --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Tue Feb 3 06:16:18 2015(r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Tue Feb 3 06:22:46 2015(r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe == --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Tue Feb 3 06:16:18 2015(r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Tue Feb 3 06:22:46 2015(r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe == --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Tue Feb 3 06:16:18 2015(r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Tue Feb 3 06:22:46 2015(r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe == --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Tue Feb 3 06:16:18 2015(r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Tue Feb 3 06:22:46 2015(r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe == --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Tue Feb 3 06:16:18 2015(r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Tue Feb 3 06:22:46 2015(r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe == --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Tue Feb 3 06:16:18 2015(r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Tue Feb 3 06:22:46 2015(r278139) @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/usr/bin/env ksh # # CDDL HEADER START # Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe == --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Tue Feb 3 06:16:18 2015(r278138) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/ts
svn commit: r278138 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat
Author: markj Date: Tue Feb 3 06:16:18 2015 New Revision: 278138 URL: https://svnweb.freebsd.org/changeset/base/278138 Log: Use a MIME type of text/plain for a couple of shell scripts with a file extension of ".exe". MFC after:1 week Modified: Directory Properties: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe (props changed) head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe (props changed) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278137 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace
Author: markj
Date: Tue Feb 3 06:04:16 2015
New Revision: 278137
URL: https://svnweb.freebsd.org/changeset/base/278137
Log:
Continue to handle the case where state is NULL, though this currently
cannot happen on FreeBSD. r278136 overlooked the fact that a destructor
registered with devfs_set_cdevpriv(9) is invoked even in the case of an
error.
X-MFC-With: r278136
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cTue Feb
3 05:38:52 2015(r278136)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cTue Feb
3 06:04:16 2015(r278137)
@@ -14174,7 +14174,7 @@ dtrace_state_create(struct cdev *dev)
if (dev != NULL) {
cr = dev->si_cred;
m = dev2unit(dev);
- }
+ }
/* Allocate memory for the state. */
state = kmem_zalloc(sizeof(dtrace_state_t), KM_SLEEP);
@@ -16841,7 +16841,12 @@ dtrace_dtr(void *data)
mutex_enter(&cpu_lock);
mutex_enter(&dtrace_lock);
- if (state->dts_anon) {
+#ifdef illumos
+ if (state->dts_anon)
+#else
+ if (state != NULL && state->dts_anon)
+#endif
+ {
/*
* There is anonymous state. Destroy that first.
*/
@@ -16849,9 +16854,13 @@ dtrace_dtr(void *data)
dtrace_state_destroy(state->dts_anon);
}
+#ifdef illumos
dtrace_state_destroy(state);
-#ifndef illumos
- kmem_free(state, 0);
+#else
+ if (state == NULL) {
+ dtrace_state_destroy(state);
+ kmem_free(state, 0);
+ }
#endif
ASSERT(dtrace_opens > 0);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278136 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace
Author: markj
Date: Tue Feb 3 05:38:52 2015
New Revision: 278136
URL: https://svnweb.freebsd.org/changeset/base/278136
Log:
Diff reduction with illumos, in preparation for merging r266993 from the
vendor branch. No functional change.
MFC after:1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cTue Feb
3 03:14:17 2015(r278135)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cTue Feb
3 05:38:52 2015(r278136)
@@ -16841,23 +16841,20 @@ dtrace_dtr(void *data)
mutex_enter(&cpu_lock);
mutex_enter(&dtrace_lock);
- if (state != NULL) {
- if (state->dts_anon) {
- /*
-* There is anonymous state. Destroy that first.
-*/
- ASSERT(dtrace_anon.dta_state == NULL);
- dtrace_state_destroy(state->dts_anon);
- }
-
- dtrace_state_destroy(state);
+ if (state->dts_anon) {
+ /*
+* There is anonymous state. Destroy that first.
+*/
+ ASSERT(dtrace_anon.dta_state == NULL);
+ dtrace_state_destroy(state->dts_anon);
+ }
+ dtrace_state_destroy(state);
#ifndef illumos
- kmem_free(state, 0);
+ kmem_free(state, 0);
#endif
- }
-
ASSERT(dtrace_opens > 0);
+
#ifdef illumos
/*
* Only relinquish control of the kernel debugger interface when there
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278135 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 03:14:17 2015
New Revision: 278135
URL: https://svnweb.freebsd.org/changeset/base/278135
Log:
- Remove more files when MK_USB == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:13:16
2015(r278134)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:14:17
2015(r278135)
@@ -7332,8 +7332,245 @@ OLD_FILES+=usr/share/man/man8/unbound.8.
.endif
.if ${MK_USB} == no
+OLD_FILES+=etc/devd/uath.conf
OLD_FILES+=etc/devd/uauth.conf
+OLD_FILES+=etc/devd/ulpt.conf
OLD_FILES+=etc/devd/usb.conf
+OLD_FILES+=usr/bin/usbhidaction
+OLD_FILES+=usr/bin/usbhidctl
+OLD_FILES+=usr/include/libusb.h
+OLD_FILES+=usr/include/libusb20.h
+OLD_FILES+=usr/include/libusb20_desc.h
+OLD_FILES+=usr/include/usb.h
+OLD_FILES+=usr/include/usbhid.h
+OLD_FILES+=usr/lib/libusb.a
+OLD_FILES+=usr/lib/libusb.so
+OLD_LIBS+=usr/lib/libusb.so.3
+OLD_FILES+=usr/lib/libusb_p.a
+OLD_FILES+=usr/lib/libusbhid.a
+OLD_FILES+=usr/lib/libusbhid.so
+OLD_LIBS+=usr/lib/libusbhid.so.4
+OLD_FILES+=usr/lib/libusbhid_p.a
+OLD_FILES+=usr/lib32/libusb.a
+OLD_FILES+=usr/lib32/libusb.so
+OLD_LIBS+=usr/lib32/libusb.so.3
+OLD_FILES+=usr/lib32/libusb_p.a
+OLD_FILES+=usr/lib32/libusbhid.a
+OLD_FILES+=usr/lib32/libusbhid.so
+OLD_LIBS+=usr/lib32/libusbhid.so.4
+OLD_FILES+=usr/lib32/libusbhid_p.a
+OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc
+OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc
+OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc
+OLD_FILES+=usr/sbin/uathload
+OLD_FILES+=usr/sbin/uhsoctl
+OLD_FILES+=usr/sbin/usbconfig
+OLD_FILES+=usr/sbin/usbdump
+OLD_FILES+=usr/share/man/man1/uhsoctl.1.gz
+OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz
+OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz
+OLD_FILES+=usr/share/man/man3/hid_dispose_report_desc.3.gz
+OLD_FILES+=usr/share/man/man3/hid_end_parse.3.gz
+OLD_FILES+=usr/share/man/man3/hid_get_data.3.gz
+OLD_FILES+=usr/share/man/man3/hid_get_item.3.gz
+OLD_FILES+=usr/share/man/man3/hid_get_report_desc.3.gz
+OLD_FILES+=usr/share/man/man3/hid_init.3.gz
+OLD_FILES+=usr/share/man/man3/hid_locate.3.gz
+OLD_FILES+=usr/share/man/man3/hid_report_size.3.gz
+OLD_FILES+=usr/share/man/man3/hid_set_data.3.gz
+OLD_FILES+=usr/share/man/man3/hid_start_parse.3.gz
+OLD_FILES+=usr/share/man/man3/hid_usage_in_page.3.gz
+OLD_FILES+=usr/share/man/man3/hid_usage_page.3.gz
+OLD_FILES+=usr/share/man/man3/libusb.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_add_dev_quirk.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_alloc_default.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_dequeue_device.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_device_foreach.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_enqueue_device.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_free.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_get_dev_quirk.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_get_quirk_name.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_get_template.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_remove_dev_quirk.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_be_set_template.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_desc_foreach.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc_config.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_check_connected.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_close.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_detach_kernel_driver.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_free.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_address.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_backend_name.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_bus_number.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_config_index.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_debug.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_desc.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_device_desc.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_fd.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_iface_desc.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_info.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_mode.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_address.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_port.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_port_path.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_mode.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_usage.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_get_speed.3.gz
+OLD_FILES+=usr/share/man/man3/libusb20_dev_kernel_driver_active.3.gz
+OLD_FI
svn commit: r278134 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 03:13:16 2015
New Revision: 278134
URL: https://svnweb.freebsd.org/changeset/base/278134
Log:
- Remove more files when MK_UNBOUND == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:11:24
2015(r278133)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:13:16
2015(r278134)
@@ -7307,6 +7307,7 @@ OLD_FILES+=usr/share/man/man1/ul.1.gz
.if ${MK_UNBOUND} == no
OLD_FILES+=etc/rc.d/local_unbound
+OLD_FILES+=etc/unbound
OLD_FILES+=usr/lib/private/libunbound.a
OLD_FILES+=usr/lib/private/libunbound.so
OLD_LIBS+=usr/lib/private/libunbound.so.5
@@ -7323,6 +7324,11 @@ OLD_FILES+=usr/sbin/unbound-anchor
OLD_FILES+=usr/sbin/unbound-checkconf
OLD_FILES+=usr/sbin/unbound-control
OLD_FILES+=usr/sbin/unbound-control-setup
+OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
+OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
+OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
+OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
+OLD_FILES+=usr/share/man/man8/unbound.8.gz
.endif
.if ${MK_USB} == no
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278133 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 03:11:24 2015
New Revision: 278133
URL: https://svnweb.freebsd.org/changeset/base/278133
Log:
- Remove more files when MK_TEXTPROC == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:10:23
2015(r278132)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:11:24
2015(r278133)
@@ -7292,6 +7292,15 @@ OLD_FILES+=${TESTS_FILES}
. endif
.endif # Test suite.
+.if ${MK_TEXTPROC} == no
+OLD_FILES+=usr/bin/checknr
+OLD_FILES+=usr/bin/colcrt
+OLD_FILES+=usr/bin/ul
+OLD_FILES+=usr/share/man/man1/checknr.1.gz
+OLD_FILES+=usr/share/man/man1/colcrt.1.gz
+OLD_FILES+=usr/share/man/man1/ul.1.gz
+.endif
+
#.if ${MK_TOOLCHAIN} == no
# to be filled in
#.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278132 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 03:10:23 2015
New Revision: 278132
URL: https://svnweb.freebsd.org/changeset/base/278132
Log:
- Remove more files when MK_TESTS == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:05:06
2015(r278131)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:10:23
2015(r278132)
@@ -7229,6 +7229,7 @@ OLD_FILES+=usr/tests/usr.bin/yacc/undefi
.endif
.else
# ATF libraries.
+OLD_FILES+=etc/mtree/BSD.tests.dist
OLD_FILES+=usr/bin/atf-sh
OLD_DIRS+=usr/include/atf-c
OLD_FILES+=usr/include/atf-c/build.h
@@ -7259,6 +7260,7 @@ OLD_FILES+=usr/lib/libatf-c++.so.1
OLD_FILES+=usr/lib/libatf-c++.so
OLD_FILES+=usr/lib/libatf-c.a
OLD_FILES+=usr/libexec/atf-check
+OLD_FILES+=usr/libexec/atf-sh
OLD_DIRS+=usr/share/atf
OLD_FILES+=usr/share/atf/libatf-sh.subr
OLD_DIRS+=usr/share/doc/atf
@@ -7266,14 +7268,20 @@ OLD_FILES+=usr/share/doc/atf/AUTHORS
OLD_FILES+=usr/share/doc/atf/COPYING
OLD_FILES+=usr/share/doc/atf/NEWS
OLD_FILES+=usr/share/doc/atf/README
+OLD_FILES+=usr/share/doc/pjdfstest/README
OLD_FILES+=usr/share/man/man1/atf-check.1.gz
OLD_FILES+=usr/share/man/man1/atf-sh.1.gz
OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz
OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz
+OLD_FILES+=usr/share/man/man3/atf-sh.3.gz
OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz
+OLD_FILES+=usr/share/man/man7/atf.7.gz
OLD_FILES+=usr/share/mk/atf.test.mk
+OLD_FILES+=usr/share/mk/plain.test.mk
+OLD_FILES+=usr/share/mk/suite.test.mk
+OLD_FILES+=usr/share/mk/tap.test.mk
# Test suite.
. if exists(${DESTDIR}${TESTSBASE})
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278131 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 03:05:06 2015
New Revision: 278131
URL: https://svnweb.freebsd.org/changeset/base/278131
Log:
- Remove more files when MK_TCSH == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:02:41
2015(r278130)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:05:06
2015(r278131)
@@ -6684,10 +6684,19 @@ OLD_FILES+=usr/share/man/man8/talkd.8.gz
.endif
.if ${MK_TCSH} == no
+OLD_FILES+=.cshrc
+OLD_FILES+=etc/csh.cshrc
+OLD_FILES+=etc/csh.login
+OLD_FILES+=etc/csh.logout
OLD_FILES+=bin/csh
OLD_FILES+=bin/tcsh
OLD_FILES+=rescue/csh
OLD_FILES+=rescue/tcsh
+OLD_FILES+=root/.cshrc
+OLD_FILES+=root/.login
+OLD_FILES+=usr/share/examples/etc/csh.cshrc
+OLD_FILES+=usr/share/examples/etc/csh.login
+OLD_FILES+=usr/share/examples/etc/csh.logout
OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
OLD_DIRS+=usr/share/examples/tcsh
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278130 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 03:02:41 2015
New Revision: 278130
URL: https://svnweb.freebsd.org/changeset/base/278130
Log:
- Remove more files when MK_SYSCONS == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:59:47
2015(r278129)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 03:02:41
2015(r278130)
@@ -6491,9 +6491,190 @@ OLD_FILES+=usr/tests/lib/libc/ssp/h_vspr
OLD_FILES+=usr/tests/lib/libc/ssp/ssp_test
.endif
-#.if ${MK_SYSCONS} == no
-# to be filled in
-#.endif
+.if ${MK_SYSCONS} == no
+OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts
+OLD_FILES+=usr/share/syscons/fonts/armscii8-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/armscii8-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/armscii8-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp1251-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp1251-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp1251-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866b-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866c-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866u-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866u-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/cp866u-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/haik8-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/haik8-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/haik8-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso02-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso02-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso02-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso04-wide-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso05-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso05-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso05-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso07-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso07-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso07-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso08-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso08-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso08-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso09-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso15-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso15-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso15-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/iso15-thin-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-rb-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-rc-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x8.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-1131-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-1251-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-8x14.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-8x16.fnt
+OLD_FILES+=usr/share/syscons/fonts/swiss-8x8.fnt
+OLD_FILES+=usr/share/syscons/keymaps/INDEX.keymaps
+OLD_FILES+=usr/share/syscons/keymaps/be.iso.acc.kbd
+OLD_FILES+=usr/share/syscons/keymaps/be.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
+O
svn commit: r278129 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 02:59:47 2015
New Revision: 278129
URL: https://svnweb.freebsd.org/changeset/base/278129
Log:
- Remove more files when MK_SSP == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:57:50
2015(r278128)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:59:47
2015(r278129)
@@ -6456,6 +6456,41 @@ OLD_FILES+=usr/share/doc/pjdfstest/READM
OLD_DIRS+=usr/share/doc/pjdfstest
.endif
+.if ${MK_SSP} == no
+OLD_LIBS+=lib/libssp.so.0
+OLD_FILES+=usr/include/ssp/ssp.h
+OLD_FILES+=usr/include/ssp/stdio.h
+OLD_FILES+=usr/include/ssp/string.h
+OLD_FILES+=usr/include/ssp/unistd.h
+OLD_FILES+=usr/lib/libssp.a
+OLD_FILES+=usr/lib/libssp.so
+OLD_FILES+=usr/lib/libssp_nonshared.a
+OLD_FILES+=usr/lib32/libssp.a
+OLD_FILES+=usr/lib32/libssp.so
+OLD_LIBS+=usr/lib32/libssp.so.0
+OLD_FILES+=usr/lib32/libssp_nonshared.a
+OLD_FILES+=usr/tests/lib/libc/ssp/Kyuafile
+OLD_FILES+=usr/tests/lib/libc/ssp/h_fgets
+OLD_FILES+=usr/tests/lib/libc/ssp/h_getcwd
+OLD_FILES+=usr/tests/lib/libc/ssp/h_gets
+OLD_FILES+=usr/tests/lib/libc/ssp/h_memcpy
+OLD_FILES+=usr/tests/lib/libc/ssp/h_memmove
+OLD_FILES+=usr/tests/lib/libc/ssp/h_memset
+OLD_FILES+=usr/tests/lib/libc/ssp/h_read
+OLD_FILES+=usr/tests/lib/libc/ssp/h_readlink
+OLD_FILES+=usr/tests/lib/libc/ssp/h_snprintf
+OLD_FILES+=usr/tests/lib/libc/ssp/h_sprintf
+OLD_FILES+=usr/tests/lib/libc/ssp/h_stpcpy
+OLD_FILES+=usr/tests/lib/libc/ssp/h_stpncpy
+OLD_FILES+=usr/tests/lib/libc/ssp/h_strcat
+OLD_FILES+=usr/tests/lib/libc/ssp/h_strcpy
+OLD_FILES+=usr/tests/lib/libc/ssp/h_strncat
+OLD_FILES+=usr/tests/lib/libc/ssp/h_strncpy
+OLD_FILES+=usr/tests/lib/libc/ssp/h_vsnprintf
+OLD_FILES+=usr/tests/lib/libc/ssp/h_vsprintf
+OLD_FILES+=usr/tests/lib/libc/ssp/ssp_test
+.endif
+
#.if ${MK_SYSCONS} == no
# to be filled in
#.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278128 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 02:57:50 2015
New Revision: 278128
URL: https://svnweb.freebsd.org/changeset/base/278128
Log:
- Remove more files when MK_QUOTAS == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:56:25
2015(r278127)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:57:50
2015(r278128)
@@ -6138,6 +6138,21 @@ OLD_FILES+=usr/lib/private/libldns_p.a
OLD_FILES+=usr/lib/private/libssh_p.a
.endif
+.if ${MK_QUOTAS} == no
+OLD_FILES+=sbin/quotacheck
+OLD_FILES+=usr/bin/quota
+OLD_FILES+=usr/sbin/edquota
+OLD_FILES+=usr/sbin/quotaoff
+OLD_FILES+=usr/sbin/quotaon
+OLD_FILES+=usr/sbin/repquota
+OLD_FILES+=usr/share/man/man1/quota.1.gz
+OLD_FILES+=usr/share/man/man8/edquota.8.gz
+OLD_FILES+=usr/share/man/man8/quotacheck.8.gz
+OLD_FILES+=usr/share/man/man8/quotaoff.8.gz
+OLD_FILES+=usr/share/man/man8/quotaon.8.gz
+OLD_FILES+=usr/share/man/man8/repquota.8.gz
+.endif
+
.if ${MK_RCMDS} == no
OLD_FILES+=bin/rcp
OLD_FILES+=etc/rc.d/rwho
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278127 - head/tools/build/mk
Author: amdmi3 (ports committer) Date: Tue Feb 3 02:56:25 2015 New Revision: 278127 URL: https://svnweb.freebsd.org/changeset/base/278127 Log: - Remove more files when MK_PORTSNAP == no MFC after:1 week Reviewed by: ngie Approved by: ngie Differential Revision:D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:54:54 2015(r278126) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:56:25 2015(r278127) @@ -6018,6 +6018,7 @@ OLD_FILES+=usr/libexec/make_index OLD_FILES+=usr/libexec/phttpget OLD_FILES+=usr/sbin/portsnap OLD_FILES+=usr/share/examples/etc/portsnap.conf +OLD_FILES+=usr/share/man/man8/phttpget.8.gz OLD_FILES+=usr/share/man/man8/portsnap.8.gz .endif ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278126 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 02:54:54 2015
New Revision: 278126
URL: https://svnweb.freebsd.org/changeset/base/278126
Log:
- Remove more files when MK_PMC == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:25:02
2015(r278125)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 02:54:54
2015(r278126)
@@ -5926,6 +5926,92 @@ OLD_FILES+=usr/sbin/pkg
OLD_FILES+=usr/share/man/man7/pkg.7.gz
.endif
+.if ${MK_PMC} == no
+OLD_FILES+=usr/bin/pmcstudy
+OLD_FILES+=usr/include/pmc.h
+OLD_FILES+=usr/include/pmclog.h
+OLD_FILES+=usr/lib/libpmc.a
+OLD_FILES+=usr/lib/libpmc.so
+OLD_LIBS+=usr/lib/libpmc.so.5
+OLD_FILES+=usr/lib/libpmc_p.a
+OLD_FILES+=usr/lib32/libpmc.a
+OLD_FILES+=usr/lib32/libpmc.so
+OLD_LIBS+=usr/lib32/libpmc.so.5
+OLD_FILES+=usr/lib32/libpmc_p.a
+OLD_FILES+=usr/sbin/pmcannotate
+OLD_FILES+=usr/sbin/pmccontrol
+OLD_FILES+=usr/sbin/pmcstat
+OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz
+OLD_FILES+=usr/share/man/man3/pmc.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.core.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.core2.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.corei7.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.corei7uc.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.haswell.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.haswelluc.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.sandybridgexeon.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.soft.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.tsc.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.ucf.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.westmere.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.westmereuc.3.gz
+OLD_FILES+=usr/share/man/man3/pmc.xscale.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_allocate.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_attach.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_capabilities.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_configure_logfile.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_cpuinfo.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_detach.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_disable.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_enable.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_event_names_of_class.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_flush_logfile.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_get_driver_stats.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_get_msr.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_init.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_name_of_capability.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_name_of_class.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_name_of_cputype.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_name_of_disposition.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_name_of_event.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_name_of_mode.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_name_of_state.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_ncpu.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_npmc.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_pmcinfo.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_read.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_release.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_rw.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_set.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_start.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_stop.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_width.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_write.3.gz
+OLD_FILES+=usr/share/man/man3/pmc_writelog.3.gz
+OLD_FILES+=usr/share/man/man3/pmclog.3.gz
+OLD_FILES+=usr/share/man/man3/pmclog_close.3.gz
+OLD_FILES+=usr/share/man/man3/pmclog_feed.3.gz
+OLD_FILES+=usr/share/man/man3/pmclog_open.3.gz
+OLD_FILES+=usr/share/man/man3/pmclog_read.3.gz
+OLD_FILES+=usr/share/man/man8/pmcannotate.8.gz
+OLD_FILES+=usr/share/man/man8/pmccontrol.8.gz
+OLD_FILES+=usr/share/man/man8/pmcstat.8.gz
+.endif
+
.if ${MK_PORTSNAP} == no
OLD_FILES+=etc/portsnap.conf
OLD_FILES+=usr/libexec/make_index
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r278119 - head/release/tools
On Mon, Feb 02, 2015 at 05:56:33PM -0800, NGie Cooper wrote: > On Mon, Feb 2, 2015 at 4:10 PM, Glen Barber wrote: > > Author: gjb > > Date: Tue Feb 3 00:10:48 2015 > > New Revision: 278119 > > URL: https://svnweb.freebsd.org/changeset/base/278119 > ... > ... > > -ifconfig_vtnet0="SYNCDHCP mtu 1460" > > +ifconfig_DEFAULT="SYNCDHCP mtu 1460" > > ... > > Why hardcode the MTU to 1460? > GCE specifications. Glen pgpcg_Aahf0x5.pgp Description: PGP signature
Re: svn commit: r278119 - head/release/tools
On Mon, Feb 2, 2015 at 4:10 PM, Glen Barber wrote: > Author: gjb > Date: Tue Feb 3 00:10:48 2015 > New Revision: 278119 > URL: https://svnweb.freebsd.org/changeset/base/278119 ... ... > -ifconfig_vtnet0="SYNCDHCP mtu 1460" > +ifconfig_DEFAULT="SYNCDHCP mtu 1460" ... Why hardcode the MTU to 1460? ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278121 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 00:19:50 2015
New Revision: 278121
URL: https://svnweb.freebsd.org/changeset/base/278121
Log:
- Remove more files when MK_PF == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 00:17:49
2015(r278120)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 00:19:50
2015(r278121)
@@ -5889,6 +5889,11 @@ OLD_FILES+=etc/pf.os
OLD_FILES+=etc/rc.d/ftp-proxy
OLD_FILES+=sbin/pfctl
OLD_FILES+=sbin/pflogd
+OLD_FILES+=usr/include/netpfil/pf/pf.h
+OLD_FILES+=usr/include/netpfil/pf/pf_altq.h
+OLD_FILES+=usr/include/netpfil/pf/pf_mtag.h
+OLD_FILES+=usr/lib/snmp_pf.so
+OLD_LIBS+=usr/lib/snmp_pf.so.6
OLD_FILES+=usr/libexec/tftp-proxy
OLD_FILES+=usr/sbin/ftp-proxy
OLD_FILES+=usr/share/examples/etc/pf.os
@@ -5912,6 +5917,8 @@ OLD_FILES+=usr/share/man/man8/ftp-proxy.
OLD_FILES+=usr/share/man/man8/pfctl.8.gz
OLD_FILES+=usr/share/man/man8/pflogd.8.gz
OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz
+OLD_FILES+=usr/share/snmp/defs/pf_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt
.endif
.if ${MK_PKGBOOTSTRAP} == no
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278120 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Tue Feb 3 00:17:49 2015
New Revision: 278120
URL: https://svnweb.freebsd.org/changeset/base/278120
Log:
- Remove more files when MK_OPENSSH == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 00:10:48
2015(r278119)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Feb 3 00:17:49
2015(r278120)
@@ -5741,18 +5741,28 @@ OLD_FILES+=usr/share/man/man8/ntptime.8.
#.endif
.if ${MK_OPENSSH} == no
+OLD_FILES+=etc/rc.d/sshd
+OLD_FILES+=etc/ssh/moduli
+OLD_FILES+=etc/ssh/ssh_config
+OLD_FILES+=etc/ssh/sshd_config
+OLD_FILES+=usr/bin/scp
OLD_FILES+=usr/bin/sftp
+OLD_FILES+=usr/bin/slogin
OLD_FILES+=usr/bin/ssh
OLD_FILES+=usr/bin/ssh-add
OLD_FILES+=usr/bin/ssh-agent
OLD_FILES+=usr/bin/ssh-copy-id
OLD_FILES+=usr/bin/ssh-keygen
OLD_FILES+=usr/bin/ssh-keyscan
+OLD_FILES+=usr/lib/pam_ssh.so
+OLD_LIBS+=usr/lib/pam_ssh.so.5
OLD_FILES+=usr/lib/private/libssh.a
OLD_FILES+=usr/lib/private/libssh.so
OLD_LIBS+=usr/lib/private/libssh.so.5
OLD_FILES+=usr/lib/private/libssh_p.a
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/pam_ssh.so
+OLD_LIBS+=usr/lib32/pam_ssh.so.5
OLD_FILES+=usr/lib32/private/libssh.a
OLD_FILES+=usr/lib32/private/libssh.so
OLD_LIBS+=usr/lib32/private/libssh.so.5
@@ -5762,6 +5772,22 @@ OLD_FILES+=usr/libexec/sftp-server
OLD_FILES+=usr/libexec/ssh-keysign
OLD_FILES+=usr/libexec/ssh-pkcs11-helper
OLD_FILES+=usr/sbin/sshd
+OLD_FILES+=usr/share/man/man1/scp.1.gz
+OLD_FILES+=usr/share/man/man1/sftp.1.gz
+OLD_FILES+=usr/share/man/man1/slogin.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-add.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-agent.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-copy-id.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-keygen.1.gz
+OLD_FILES+=usr/share/man/man1/ssh-keyscan.1.gz
+OLD_FILES+=usr/share/man/man1/ssh.1.gz
+OLD_FILES+=usr/share/man/man5/ssh_config.5.gz
+OLD_FILES+=usr/share/man/man5/sshd_config.5.gz
+OLD_FILES+=usr/share/man/man8/pam_ssh.8.gz
+OLD_FILES+=usr/share/man/man8/sftp-server.8.gz
+OLD_FILES+=usr/share/man/man8/ssh-keysign.8.gz
+OLD_FILES+=usr/share/man/man8/ssh-pkcs11-helper.8.gz
+OLD_FILES+=usr/share/man/man8/sshd.8.gz
.endif
.if ${MK_OPENSSL} == no
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278119 - head/release/tools
Author: gjb
Date: Tue Feb 3 00:10:48 2015
New Revision: 278119
URL: https://svnweb.freebsd.org/changeset/base/278119
Log:
Use ifconfig_DEFAULT="" instead of hard-coding vtnet(4)
MFC after:2 weeks
X-MFC-with: r277458, r277536, r277606, r277609,
r277836, r278118
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/gce.conf
Modified: head/release/tools/gce.conf
==
--- head/release/tools/gce.conf Tue Feb 3 00:07:54 2015(r278118)
+++ head/release/tools/gce.conf Tue Feb 3 00:10:48 2015(r278119)
@@ -21,7 +21,7 @@ vm_extra_install_base() {
vm_extra_pre_umount() {
cat << EOF >> ${DESTDIR}/etc/rc.conf
dumpdev="AUTO"
-ifconfig_vtnet0="SYNCDHCP mtu 1460"
+ifconfig_DEFAULT="SYNCDHCP mtu 1460"
ntpd_sync_on_start="YES"
case \$(uname -r) in
*-BETA*|*-RC*|*-RELEASE*)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278118 - head/release/tools
Author: gjb
Date: Tue Feb 3 00:07:54 2015
New Revision: 278118
URL: https://svnweb.freebsd.org/changeset/base/278118
Log:
Move service_enable="YES" rc.conf(5) additions to
VM_RC_LIST and deduplicate.
Evaluate if firstboot_freebsd_update should be enabled
based on UNAME_r, because it is not supported for the
-CURRENT or -STABLE branches.
MFC after:2 weeks
X-MFC-with: r277458, r277536, r277606, r277609,
r277836
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/gce.conf
Modified: head/release/tools/gce.conf
==
--- head/release/tools/gce.conf Mon Feb 2 23:41:43 2015(r278117)
+++ head/release/tools/gce.conf Tue Feb 3 00:07:54 2015(r278118)
@@ -9,7 +9,8 @@ export VM_EXTRA_PACKAGES="firstboot-free
google-startup-scripts"
# Set to a list of third-party software to enable in rc.conf(5).
-export VM_RC_LIST="google_accounts_manager ntpd"
+export VM_RC_LIST="google_accounts_manager ntpd sshd firstboot_growfs \
+ firstboot_pkgs google_startup"
vm_extra_install_base() {
echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf
@@ -22,17 +23,16 @@ vm_extra_pre_umount() {
dumpdev="AUTO"
ifconfig_vtnet0="SYNCDHCP mtu 1460"
ntpd_sync_on_start="YES"
-ntpd_enable="YES"
-sshd_enable="YES"
-google_accounts_manager_enable="YES"
-#disabled until I can figure out why the reboot for updates is hanging
-#firstboot_freebsd_update_enable="YES"
-#firstboot_pkgs_enable="YES"
+case \$(uname -r) in
+ *-BETA*|*-RC*|*-RELEASE*)
+ firstboot_freebsd_update_enable="YES"
+ ;;
+ *)
+ ;;
+esac
# need to fill in something here
#firstboot_pkgs_list=""
panicmail_autosubmit="YES"
-firstboot_growfs_enable="YES"
-google_startup_enable="YES"
EOF
cat << EOF >> ${DESTDIR}/boot/loader.conf
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278117 - head/sys/ofed/include/linux
Author: np
Date: Mon Feb 2 23:41:43 2015
New Revision: 278117
URL: https://svnweb.freebsd.org/changeset/base/278117
Log:
Fix bug in idr_pre_get where it doesn't handle 'need' correctly.
Obtained from:Chelsio Communications' internal repository.
Modified:
head/sys/ofed/include/linux/linux_idr.c
Modified: head/sys/ofed/include/linux/linux_idr.c
==
--- head/sys/ofed/include/linux/linux_idr.c Mon Feb 2 21:09:26 2015
(r278116)
+++ head/sys/ofed/include/linux/linux_idr.c Mon Feb 2 23:41:43 2015
(r278117)
@@ -223,7 +223,7 @@ idr_pre_get(struct idr *idr, gfp_t gfp_m
for (il = idr->free; il != NULL; il = il->ary[0])
need--;
mtx_unlock(&idr->lock);
- if (need == 0)
+ if (need <= 0)
break;
for (head = NULL; need; need--) {
iln = malloc(sizeof(*il), M_IDR, M_ZERO | gfp_mask);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278116 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Mon Feb 2 21:09:26 2015 New Revision: 278116 URL: https://svnweb.freebsd.org/changeset/base/278116 Log: Overhaul the relnotes page to reorganize the sections. With the previous layout, the majority of the release notes were categorized under one main "What's New" section, which in addition to making the page difficult to parse relevant bits, also had a few rendering issues, such as 'Note' blocks visually not appearing as if they pertain to a particular change. This change removes the "What's New" section, integrating it with the introduction. In addition, each section now provides a brief description of its contents, broken down further into a subsection for each "topic", making it much easier to find a specific topic in the page. MFC after:3 days X-MFC-Note: direct commit, not a merge Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Feb 2 21:09:23 2015(r278115) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Feb 2 21:09:26 2015(r278116) @@ -90,6 +90,21 @@ information on known bugs, security advisories, and corrections to documentation. An up-to-date copy of the errata for &os; &release.current; can be found on the &os; Web site. + +This document describes the most user-visible new or changed + features in &os; since &release.prev;. In general, changes + described here are unique to the &release.branch; branch unless + specifically marked as &merged; features. + +Typical release note items document recent security + advisories issued after &release.prev;, new drivers or hardware + support, new commands or options, major bug fixes, or + contributed software upgrades. They may also list changes to + major ports/packages or release engineering practices. Clearly + the release notes cannot list every single change made to &os; + between releases; this document focuses primarily on security + advisories, user-visible changes, and major architectural + improvements. @@ -114,23 +129,11 @@ - -What's New - -This section describes the most user-visible new or changed - features in &os; since &release.prev;. In general, changes - described here are unique to the &release.branch; branch unless - specifically marked as &merged; features. + +Security and Errata -Typical release note items document recent security - advisories issued after &release.prev;, new drivers or hardware - support, new commands or options, major bug fixes, or - contributed software upgrades. They may also list changes to - major ports/packages or release engineering practices. Clearly - the release notes cannot list every single change made to &os; - between releases; this document focuses primarily on security - advisories, user-visible changes, and major architectural - improvements. +This section lists the various Security Advisories and + Errata Notices since &release.prev;. Security Advisories @@ -139,389 +142,41 @@ - - Kernel Changes - - Support for GPS ports has been added to - &man.uhso.4;. - - The if_nf10bmac(4) - device has been added, providing support for NetFPGA-10G - Embedded CPU Ethernet Core. - - - The if_nf10bmac(4) driver operates on - the FPGA, and is not suited for the PCI host - interface. - - - The &man.full.4; device has been added, - and the lindev(4) device has been removed. - Prior to this change, lindev(4) provided - only the /dev/full character device, - returning ENOSPC on write attempts. As - this device is not specific to &linux;, a native &os; version - has been added. - - The &man.mpr.4; - device has been added, providing support for LSI Fusion-MPT - 3 12Gb SCSI/SATA controllers. - - The &man.mrsas.4; driver has been added, - providing support for LSI MegaRAID SAS controllers. The - &man.mfi.4; driver will attach to the controller, by default. - To enable &man.mrsas.4; add - hw.mfi.mrsas_enable=1 to - /boot/loader.conf, which turns off - &man.mfi.4; device probing. - - - At this time, the &man.mfiutil.8; utility and the &os; - version of MegaCLI and - StorCli do not work with - &man.mrsas.4;. - - - A kernel bug that inhibited proper - functionality of the dev.cpu.0.freq - &man.sysctl.8; on &intel; processors with Turbo - Boost ™ enabled has been fixed. - - The IMAGACT_BINMISC - kernel
svn commit: r278115 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Mon Feb 2 21:09:23 2015 New Revision: 278115 URL: https://svnweb.freebsd.org/changeset/base/278115 Log: Move the 'Upgrading from Previous Releases of FreeBSD' section to the top of the file, following the introduction. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Feb 2 20:48:31 2015(r278114) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Feb 2 21:09:23 2015(r278115) @@ -92,6 +92,28 @@ &release.current; can be found on the &os; Web site. + +Upgrading from Previous Releases of &os; + +Binary upgrades between RELEASE versions + (and snapshots of the various security branches) are supported + using the &man.freebsd-update.8; utility. The binary upgrade + procedure will update unmodified userland utilities, as well as + unmodified GENERIC kernels distributed as a part of an official + &os; release. The &man.freebsd-update.8; utility requires that + the host being upgraded have Internet connectivity. + +Source-based upgrades (those based on recompiling the &os; + base system from source code) from previous versions are + supported, according to the instructions in + /usr/src/UPDATING. + + + Upgrading &os; should only be attempted after backing up + all data and configuration files. + + + What's New @@ -825,26 +847,4 @@ - - -Upgrading from Previous Releases of &os; - -Binary upgrades between RELEASE versions - (and snapshots of the various security branches) are supported - using the &man.freebsd-update.8; utility. The binary upgrade - procedure will update unmodified userland utilities, as well as - unmodified GENERIC kernels distributed as a part of an official - &os; release. The &man.freebsd-update.8; utility requires that - the host being upgraded have Internet connectivity. - -Source-based upgrades (those based on recompiling the &os; - base system from source code) from previous versions are - supported, according to the instructions in - /usr/src/UPDATING. - - - Upgrading &os; should only be attempted after backing up - all data and configuration files. - - ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278114 - head/cddl/contrib/opensolaris/lib/libdtrace/common
Author: markj
Date: Mon Feb 2 20:48:31 2015
New Revision: 278114
URL: https://svnweb.freebsd.org/changeset/base/278114
Log:
Let the standard deviation of the empty set be 0. This is consistent with
the behaviour for averages, and fixes a crash that can occur when attempting
to print a stddev aggregation containing no elements:
dtrace:::BEGIN { @ = stddev(0); clear(@); printa("%@d", @); }
PR: 197260
MFC after:2 week
Modified:
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
==
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Mon Feb
2 20:36:16 2015(r278113)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Mon Feb
2 20:48:31 2015(r278114)
@@ -382,6 +382,9 @@ dt_stddev(uint64_t *data, uint64_t norma
int64_t norm_avg;
uint64_t diff[2];
+ if (data[0] == 0)
+ return (0);
+
/*
* The standard approximation for standard deviation is
* sqrt(average(x**2) - average(x)**2), i.e. the square root
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r278111 - in head/sys/cam: . scsi
On 02.02.2015 22:28, Nathan Whitehorn wrote:
> You may want to look at PR 195479 on this topic. Does this also turn off
> the infinite console spam?
This patch was supposed to only workaround issues I see when storage has
a problem. In that case hiding messages is a bad idea, because admin
should see that something goes wrong. So I didn't hide them.
I don't know why would VMware report BUSY status regularly for disks
under load, as mentioned in that PR. My patch should partially help in
that case by avoiding errors reported to applications. But still each
error like that freezes the device operation for one second before
retry, so real cause still must be fixed or performance will heavily suffer.
> On 02/02/15 12:23, Alexander Motin wrote:
>> Author: mav
>> Date: Mon Feb 2 20:23:05 2015
>> New Revision: 278111
>> URL: https://svnweb.freebsd.org/changeset/base/278111
>>
>> Log:
>>Retry indefinitely on SCSI BUSY status from VMware disks and CDs.
>>
>>VMware returns BUSY status when storage has transient connectivity
>> issues.
>>It is often better to wait and let VM admin fix the problem then
>> crash.
>>
>>Discussed with:ken
>>MFC after:1 week
>>
>> Modified:
>>head/sys/cam/cam.h
>>head/sys/cam/cam_periph.c
>>head/sys/cam/scsi/scsi_cd.c
>>head/sys/cam/scsi/scsi_da.c
>>
>> Modified: head/sys/cam/cam.h
>> ==
>>
>> --- head/sys/cam/cam.hMon Feb 2 20:18:47 2015(r278110)
>> +++ head/sys/cam/cam.hMon Feb 2 20:23:05 2015(r278111)
>> @@ -121,7 +121,8 @@ enum {
>> SF_QUIET_IR= 0x04,/* Be quiet about Illegal Request
>> reponses */
>> SF_PRINT_ALWAYS= 0x08,/* Always print error status. */
>> SF_NO_RECOVERY= 0x10,/* Don't do active error
>> recovery. */
>> -SF_NO_RETRY= 0x20/* Don't do any retries. */
>> +SF_NO_RETRY= 0x20,/* Don't do any retries. */
>> +SF_RETRY_BUSY= 0x40/* Retry BUSY status. */
>> };
>>
>> /* CAM Status field values */
>>
>> Modified: head/sys/cam/cam_periph.c
>> ==
>>
>> --- head/sys/cam/cam_periph.cMon Feb 2 20:18:47 2015(r278110)
>> +++ head/sys/cam/cam_periph.cMon Feb 2 20:23:05 2015(r278111)
>> @@ -1359,8 +1359,8 @@ camperiphscsistatuserror(union ccb *ccb,
>>* Restart the queue after either another
>>* command completes or a 1 second timeout.
>>*/
>> - if (ccb->ccb_h.retry_count > 0) {
>> - ccb->ccb_h.retry_count--;
>> +if ((sense_flags & SF_RETRY_BUSY) != 0 ||
>> +(ccb->ccb_h.retry_count--) > 0) {
>> error = ERESTART;
>> *relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT
>> | RELSIM_RELEASE_AFTER_CMDCMPLT;
>>
>> Modified: head/sys/cam/scsi/scsi_cd.c
>> ==
>>
>> --- head/sys/cam/scsi/scsi_cd.cMon Feb 2 20:18:47 2015(r278110)
>> +++ head/sys/cam/scsi/scsi_cd.cMon Feb 2 20:23:05 2015(r278111)
>> @@ -87,14 +87,16 @@ typedef enum {
>> CD_Q_NONE= 0x00,
>> CD_Q_NO_TOUCH= 0x01,
>> CD_Q_BCD_TRACKS= 0x02,
>> -CD_Q_10_BYTE_ONLY= 0x10
>> +CD_Q_10_BYTE_ONLY= 0x10,
>> +CD_Q_RETRY_BUSY= 0x40
>> } cd_quirks;
>>
>> #define CD_Q_BIT_STRING\
>> "\020"\
>> "\001NO_TOUCH"\
>> "\002BCD_TRACKS"\
>> -"\00510_BYTE_ONLY"
>> +"\00510_BYTE_ONLY"\
>> +"\007RETRY_BUSY"
>>
>> typedef enum {
>> CD_FLAG_INVALID= 0x0001,
>> @@ -189,6 +191,14 @@ static struct cd_quirk_entry cd_quirk_ta
>> {
>> { T_CDROM, SIP_MEDIA_REMOVABLE, "CHINON", "CD-ROM
>> CDS-535","*"},
>> /* quirks */ CD_Q_BCD_TRACKS
>> +},
>> +{
>> +/*
>> + * VMware returns BUSY status when storage has transient
>> + * connectivity problems, so better wait.
>> + */
>> +{T_CDROM, SIP_MEDIA_REMOVABLE, "NECVMWar", "VMware IDE
>> CDR10", "*"},
>> +/*quirks*/ CD_Q_RETRY_BUSY
>> }
>> };
>>
>> @@ -2581,6 +2591,9 @@ cderror(union ccb *ccb, u_int32_t cam_fl
>>* don't treat UAs as errors.
>>*/
>> sense_flags |= SF_RETRY_UA;
>> +
>> +if (softc->quirks & CD_Q_RETRY_BUSY)
>> +sense_flags |= SF_RETRY_BUSY;
>> return (cam_periph_error(ccb, cam_flags, sense_flags,
>>&softc->saved_ccb));
>> }
>>
>> Modified: head/sys/cam/scsi/scsi_da.c
>> ==
>>
>> --- head/sys/cam/scsi/scsi_da.cMon Feb 2 20:18:47 2015(r278110)
>> +++ head/sys/cam/scsi/scsi_da.cMon Feb 2 20:23:05 2015(r278111)
>> @@ -101,7 +101,8 @@ typedef enum {
>> DA_Q_NO_PREVENT
Re: svn commit: r278111 - in head/sys/cam: . scsi
You may want to look at PR 195479 on this topic. Does this also turn off
the infinite console spam?
-Nathan
On 02/02/15 12:23, Alexander Motin wrote:
Author: mav
Date: Mon Feb 2 20:23:05 2015
New Revision: 278111
URL: https://svnweb.freebsd.org/changeset/base/278111
Log:
Retry indefinitely on SCSI BUSY status from VMware disks and CDs.
VMware returns BUSY status when storage has transient connectivity issues.
It is often better to wait and let VM admin fix the problem then crash.
Discussed with: ken
MFC after: 1 week
Modified:
head/sys/cam/cam.h
head/sys/cam/cam_periph.c
head/sys/cam/scsi/scsi_cd.c
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/cam.h
==
--- head/sys/cam/cam.h Mon Feb 2 20:18:47 2015(r278110)
+++ head/sys/cam/cam.h Mon Feb 2 20:23:05 2015(r278111)
@@ -121,7 +121,8 @@ enum {
SF_QUIET_IR = 0x04, /* Be quiet about Illegal Request
reponses */
SF_PRINT_ALWAYS = 0x08, /* Always print error status. */
SF_NO_RECOVERY = 0x10, /* Don't do active error recovery. */
- SF_NO_RETRY = 0x20 /* Don't do any retries. */
+ SF_NO_RETRY = 0x20, /* Don't do any retries. */
+ SF_RETRY_BUSY = 0x40 /* Retry BUSY status. */
};
/* CAM Status field values */
Modified: head/sys/cam/cam_periph.c
==
--- head/sys/cam/cam_periph.c Mon Feb 2 20:18:47 2015(r278110)
+++ head/sys/cam/cam_periph.c Mon Feb 2 20:23:05 2015(r278111)
@@ -1359,8 +1359,8 @@ camperiphscsistatuserror(union ccb *ccb,
* Restart the queue after either another
* command completes or a 1 second timeout.
*/
- if (ccb->ccb_h.retry_count > 0) {
- ccb->ccb_h.retry_count--;
+ if ((sense_flags & SF_RETRY_BUSY) != 0 ||
+ (ccb->ccb_h.retry_count--) > 0) {
error = ERESTART;
*relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT
| RELSIM_RELEASE_AFTER_CMDCMPLT;
Modified: head/sys/cam/scsi/scsi_cd.c
==
--- head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:18:47 2015(r278110)
+++ head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:23:05 2015(r278111)
@@ -87,14 +87,16 @@ typedef enum {
CD_Q_NONE = 0x00,
CD_Q_NO_TOUCH = 0x01,
CD_Q_BCD_TRACKS = 0x02,
- CD_Q_10_BYTE_ONLY = 0x10
+ CD_Q_10_BYTE_ONLY = 0x10,
+ CD_Q_RETRY_BUSY = 0x40
} cd_quirks;
#define CD_Q_BIT_STRING \
"\020"\
"\001NO_TOUCH"\
"\002BCD_TRACKS" \
- "\00510_BYTE_ONLY"
+ "\00510_BYTE_ONLY"\
+ "\007RETRY_BUSY"
typedef enum {
CD_FLAG_INVALID = 0x0001,
@@ -189,6 +191,14 @@ static struct cd_quirk_entry cd_quirk_ta
{
{ T_CDROM, SIP_MEDIA_REMOVABLE, "CHINON", "CD-ROM CDS-535","*"},
/* quirks */ CD_Q_BCD_TRACKS
+ },
+ {
+ /*
+* VMware returns BUSY status when storage has transient
+* connectivity problems, so better wait.
+*/
+ {T_CDROM, SIP_MEDIA_REMOVABLE, "NECVMWar", "VMware IDE CDR10",
"*"},
+ /*quirks*/ CD_Q_RETRY_BUSY
}
};
@@ -2581,6 +2591,9 @@ cderror(union ccb *ccb, u_int32_t cam_fl
* don't treat UAs as errors.
*/
sense_flags |= SF_RETRY_UA;
+
+ if (softc->quirks & CD_Q_RETRY_BUSY)
+ sense_flags |= SF_RETRY_BUSY;
return (cam_periph_error(ccb, cam_flags, sense_flags,
&softc->saved_ccb));
}
Modified: head/sys/cam/scsi/scsi_da.c
==
--- head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:18:47 2015(r278110)
+++ head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:23:05 2015(r278111)
@@ -101,7 +101,8 @@ typedef enum {
DA_Q_NO_PREVENT = 0x04,
DA_Q_4K = 0x08,
DA_Q_NO_RC16= 0x10,
- DA_Q_NO_UNMAP = 0x20
+ DA_Q_NO_UNMAP = 0x20,
+ DA_Q_RETRY_BUSY = 0x40
} da_quirks;
#define DA_Q_BIT_STRING \
@@ -110,7 +111,9 @@ typedef enum {
"\002NO_6_BYTE" \
"\003NO_PREVENT" \
"\0044K" \
- "\005NO_RC16"
+ "\005NO_RC16" \
+ "\006NO_UNMAP"\
+ "\007RETRY_BUSY"
typedef enum {
DA_CCB_PROBE_RC = 0x01,
@@ -359,6 +362,14 @@ static struct da_quirk_entry da_qu
svn commit: r278111 - in head/sys/cam: . scsi
Author: mav
Date: Mon Feb 2 20:23:05 2015
New Revision: 278111
URL: https://svnweb.freebsd.org/changeset/base/278111
Log:
Retry indefinitely on SCSI BUSY status from VMware disks and CDs.
VMware returns BUSY status when storage has transient connectivity issues.
It is often better to wait and let VM admin fix the problem then crash.
Discussed with: ken
MFC after:1 week
Modified:
head/sys/cam/cam.h
head/sys/cam/cam_periph.c
head/sys/cam/scsi/scsi_cd.c
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/cam.h
==
--- head/sys/cam/cam.h Mon Feb 2 20:18:47 2015(r278110)
+++ head/sys/cam/cam.h Mon Feb 2 20:23:05 2015(r278111)
@@ -121,7 +121,8 @@ enum {
SF_QUIET_IR = 0x04, /* Be quiet about Illegal Request
reponses */
SF_PRINT_ALWAYS = 0x08, /* Always print error status. */
SF_NO_RECOVERY = 0x10, /* Don't do active error recovery. */
- SF_NO_RETRY = 0x20 /* Don't do any retries. */
+ SF_NO_RETRY = 0x20, /* Don't do any retries. */
+ SF_RETRY_BUSY = 0x40 /* Retry BUSY status. */
};
/* CAM Status field values */
Modified: head/sys/cam/cam_periph.c
==
--- head/sys/cam/cam_periph.c Mon Feb 2 20:18:47 2015(r278110)
+++ head/sys/cam/cam_periph.c Mon Feb 2 20:23:05 2015(r278111)
@@ -1359,8 +1359,8 @@ camperiphscsistatuserror(union ccb *ccb,
* Restart the queue after either another
* command completes or a 1 second timeout.
*/
- if (ccb->ccb_h.retry_count > 0) {
- ccb->ccb_h.retry_count--;
+ if ((sense_flags & SF_RETRY_BUSY) != 0 ||
+ (ccb->ccb_h.retry_count--) > 0) {
error = ERESTART;
*relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT
| RELSIM_RELEASE_AFTER_CMDCMPLT;
Modified: head/sys/cam/scsi/scsi_cd.c
==
--- head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:18:47 2015(r278110)
+++ head/sys/cam/scsi/scsi_cd.c Mon Feb 2 20:23:05 2015(r278111)
@@ -87,14 +87,16 @@ typedef enum {
CD_Q_NONE = 0x00,
CD_Q_NO_TOUCH = 0x01,
CD_Q_BCD_TRACKS = 0x02,
- CD_Q_10_BYTE_ONLY = 0x10
+ CD_Q_10_BYTE_ONLY = 0x10,
+ CD_Q_RETRY_BUSY = 0x40
} cd_quirks;
#define CD_Q_BIT_STRING\
"\020" \
"\001NO_TOUCH" \
"\002BCD_TRACKS"\
- "\00510_BYTE_ONLY"
+ "\00510_BYTE_ONLY" \
+ "\007RETRY_BUSY"
typedef enum {
CD_FLAG_INVALID = 0x0001,
@@ -189,6 +191,14 @@ static struct cd_quirk_entry cd_quirk_ta
{
{ T_CDROM, SIP_MEDIA_REMOVABLE, "CHINON", "CD-ROM CDS-535","*"},
/* quirks */ CD_Q_BCD_TRACKS
+ },
+ {
+ /*
+* VMware returns BUSY status when storage has transient
+* connectivity problems, so better wait.
+*/
+ {T_CDROM, SIP_MEDIA_REMOVABLE, "NECVMWar", "VMware IDE CDR10",
"*"},
+ /*quirks*/ CD_Q_RETRY_BUSY
}
};
@@ -2581,6 +2591,9 @@ cderror(union ccb *ccb, u_int32_t cam_fl
* don't treat UAs as errors.
*/
sense_flags |= SF_RETRY_UA;
+
+ if (softc->quirks & CD_Q_RETRY_BUSY)
+ sense_flags |= SF_RETRY_BUSY;
return (cam_periph_error(ccb, cam_flags, sense_flags,
&softc->saved_ccb));
}
Modified: head/sys/cam/scsi/scsi_da.c
==
--- head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:18:47 2015(r278110)
+++ head/sys/cam/scsi/scsi_da.c Mon Feb 2 20:23:05 2015(r278111)
@@ -101,7 +101,8 @@ typedef enum {
DA_Q_NO_PREVENT = 0x04,
DA_Q_4K = 0x08,
DA_Q_NO_RC16= 0x10,
- DA_Q_NO_UNMAP = 0x20
+ DA_Q_NO_UNMAP = 0x20,
+ DA_Q_RETRY_BUSY = 0x40
} da_quirks;
#define DA_Q_BIT_STRING\
@@ -110,7 +111,9 @@ typedef enum {
"\002NO_6_BYTE" \
"\003NO_PREVENT"\
"\0044K"\
- "\005NO_RC16"
+ "\005NO_RC16" \
+ "\006NO_UNMAP" \
+ "\007RETRY_BUSY"
typedef enum {
DA_CCB_PROBE_RC = 0x01,
@@ -359,6 +362,14 @@ static struct da_quirk_entry da_quirk_ta
{T_DIRECT, SIP_MEDIA_FIXED, "STEC", "*", "*"},
/*quirks*/ DA_Q_NO_UNMAP
},
+ {
+ /*
+* VM
Re: svn commit: r278108 - head/sys/dev/gpio
On 02/02/15 12:08, Ian Lepore wrote:
On Mon, 2015-02-02 at 11:24 -0800, Nathan Whitehorn wrote:
Please don't condition things like this on FDT. They are useful on Open
Firmware systems too.
-Nathan
Is there something defined for OFW? The gpio code needs to work on
hint-based (not-FDT and not-OFW) mips systems too.
There isn't right now, so far as I'm aware, but there should be.
-Nathan
-- Ian
On 02/02/15 11:22, Luiz Otavio O Souza wrote:
Author: loos
Date: Mon Feb 2 19:22:34 2015
New Revision: 278108
URL: https://svnweb.freebsd.org/changeset/base/278108
Log:
Register the GPIO controller device reference on xref table for FDT systems.
Modified:
head/sys/dev/gpio/gpiobus.c
head/sys/dev/gpio/gpiobusvar.h
head/sys/dev/gpio/ofw_gpiobus.c
Modified: head/sys/dev/gpio/gpiobus.c
==
--- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015(r278107)
+++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015(r278108)
@@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev)
device_delete_child(dev, busdev);
return (NULL);
}
+#ifdef FDT
+ ofw_gpiobus_register_provider(dev);
+#endif
bus_generic_attach(dev);
return (busdev);
@@ -152,6 +155,10 @@ int
gpiobus_detach_bus(device_t dev)
{
+#ifdef FDT
+ ofw_gpiobus_unregister_provider(dev);
+#endif
+
return (bus_generic_detach(dev));
}
Modified: head/sys/dev/gpio/gpiobusvar.h
==
--- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015
(r278107)
+++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015
(r278108)
@@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d
}
device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t);
+void ofw_gpiobus_register_provider(device_t);
+void ofw_gpiobus_unregister_provider(device_t);
#endif
int gpio_check_flags(uint32_t, uint32_t);
device_t gpiobus_attach_bus(device_t);
Modified: head/sys/dev/gpio/ofw_gpiobus.c
==
--- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015
(r278107)
+++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015
(r278108)
@@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s
return (0);
}
+void
+ofw_gpiobus_register_provider(device_t provider)
+{
+ phandle_t node;
+
+ node = ofw_bus_get_node(provider);
+ OF_device_register_xref(OF_xref_from_node(node), provider);
+}
+
+void
+ofw_gpiobus_unregister_provider(device_t provider)
+{
+ phandle_t node;
+
+ node = ofw_bus_get_node(provider);
+ OF_device_register_xref(OF_xref_from_node(node), NULL);
+}
+
static struct ofw_gpiobus_devinfo *
ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node)
{
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r278108 - head/sys/dev/gpio
On Mon, 2015-02-02 at 11:24 -0800, Nathan Whitehorn wrote:
> Please don't condition things like this on FDT. They are useful on Open
> Firmware systems too.
> -Nathan
>
Is there something defined for OFW? The gpio code needs to work on
hint-based (not-FDT and not-OFW) mips systems too.
-- Ian
> On 02/02/15 11:22, Luiz Otavio O Souza wrote:
> > Author: loos
> > Date: Mon Feb 2 19:22:34 2015
> > New Revision: 278108
> > URL: https://svnweb.freebsd.org/changeset/base/278108
> >
> > Log:
> >Register the GPIO controller device reference on xref table for FDT
> > systems.
> >
> > Modified:
> >head/sys/dev/gpio/gpiobus.c
> >head/sys/dev/gpio/gpiobusvar.h
> >head/sys/dev/gpio/ofw_gpiobus.c
> >
> > Modified: head/sys/dev/gpio/gpiobus.c
> > ==
> > --- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015
> > (r278107)
> > +++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015
> > (r278108)
> > @@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev)
> > device_delete_child(dev, busdev);
> > return (NULL);
> > }
> > +#ifdef FDT
> > + ofw_gpiobus_register_provider(dev);
> > +#endif
> > bus_generic_attach(dev);
> >
> > return (busdev);
> > @@ -152,6 +155,10 @@ int
> > gpiobus_detach_bus(device_t dev)
> > {
> >
> > +#ifdef FDT
> > + ofw_gpiobus_unregister_provider(dev);
> > +#endif
> > +
> > return (bus_generic_detach(dev));
> > }
> >
> >
> > Modified: head/sys/dev/gpio/gpiobusvar.h
> > ==
> > --- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015
> > (r278107)
> > +++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015
> > (r278108)
> > @@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d
> > }
> >
> > device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t);
> > +void ofw_gpiobus_register_provider(device_t);
> > +void ofw_gpiobus_unregister_provider(device_t);
> > #endif
> > int gpio_check_flags(uint32_t, uint32_t);
> > device_t gpiobus_attach_bus(device_t);
> >
> > Modified: head/sys/dev/gpio/ofw_gpiobus.c
> > ==
> > --- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015
> > (r278107)
> > +++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015
> > (r278108)
> > @@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s
> > return (0);
> > }
> >
> > +void
> > +ofw_gpiobus_register_provider(device_t provider)
> > +{
> > + phandle_t node;
> > +
> > + node = ofw_bus_get_node(provider);
> > + OF_device_register_xref(OF_xref_from_node(node), provider);
> > +}
> > +
> > +void
> > +ofw_gpiobus_unregister_provider(device_t provider)
> > +{
> > + phandle_t node;
> > +
> > + node = ofw_bus_get_node(provider);
> > + OF_device_register_xref(OF_xref_from_node(node), NULL);
> > +}
> > +
> > static struct ofw_gpiobus_devinfo *
> > ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node)
> > {
> >
>
>
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278109 - head/contrib/llvm/patches
Author: dim
Date: Mon Feb 2 20:05:52 2015
New Revision: 278109
URL: https://svnweb.freebsd.org/changeset/base/278109
Log:
Belatedly add the clang patch corresponding to r277423.
Added:
head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff
head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff
- copied unchanged from r278063,
head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff
head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff
- copied unchanged from r278063,
head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff
Deleted:
head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff
head/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff
Added: head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff Mon Feb
2 20:05:52 2015(r278109)
@@ -0,0 +1,33 @@
+Allow clang to be built for mips/mips64 backend types by adding our mips
+triple ids
+
+This only allows testing and does not change the defaults for mips/mips64.
+They still build/use gcc by default.
+
+Differential Revision: https://reviews.freebsd.org/D1190
+Reviewed by: dim
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/277423
+
+Index: tools/clang/lib/Driver/Tools.cpp
+===
+--- tools/clang/lib/Driver/Tools.cpp
tools/clang/lib/Driver/Tools.cpp
+@@ -6592,6 +6592,17 @@ void freebsd::Link::ConstructJob(Compilation &C, c
+ CmdArgs.push_back("elf32ppc_fbsd");
+ }
+
++ if (Arg *A = Args.getLastArg(options::OPT_G)) {
++if (ToolChain.getArch() == llvm::Triple::mips ||
++ ToolChain.getArch() == llvm::Triple::mipsel ||
++ ToolChain.getArch() == llvm::Triple::mips64 ||
++ ToolChain.getArch() == llvm::Triple::mips64el) {
++ StringRef v = A->getValue();
++ CmdArgs.push_back(Args.MakeArgString("-G" + v));
++ A->claim();
++}
++ }
++
+ if (Output.isFilename()) {
+ CmdArgs.push_back("-o");
+ CmdArgs.push_back(Output.getFilename());
Copied: head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff (from
r278063, head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diffMon Feb
2 20:05:52 2015(r278109, copy of r278063,
head/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff)
@@ -0,0 +1,83 @@
+Pull in r226664 from upstream llvm trunk (by Tim Northover):
+
+ AArch64: add backend option to reserve x18 (platform register)
+
+ AAPCS64 says that it's up to the platform to specify whether x18 is
+ reserved, and a first step on that way is to add a flag controlling
+ it.
+
+ From: Andrew Turner
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/24
+
+Index: lib/Target/AArch64/AArch64RegisterInfo.cpp
+===
+--- lib/Target/AArch64/AArch64RegisterInfo.cpp
lib/Target/AArch64/AArch64RegisterInfo.cpp
+@@ -33,6 +33,10 @@ using namespace llvm;
+ #define GET_REGINFO_TARGET_DESC
+ #include "AArch64GenRegisterInfo.inc"
+
++static cl::opt
++ReserveX18("aarch64-reserve-x18", cl::Hidden,
++ cl::desc("Reserve X18, making it unavailable as GPR"));
++
+ AArch64RegisterInfo::AArch64RegisterInfo(const AArch64InstrInfo *tii,
+ const AArch64Subtarget *sti)
+ : AArch64GenRegisterInfo(AArch64::LR), TII(tii), STI(sti) {}
+@@ -90,7 +94,7 @@ AArch64RegisterInfo::getReservedRegs(const Machine
+ Reserved.set(AArch64::W29);
+ }
+
+- if (STI->isTargetDarwin()) {
++ if (STI->isTargetDarwin() || ReserveX18) {
+ Reserved.set(AArch64::X18); // Platform register
+ Reserved.set(AArch64::W18);
+ }
+@@ -117,7 +121,7 @@ bool AArch64RegisterInfo::isReservedReg(const Mach
+ return true;
+ case AArch64::X18:
+ case AArch64::W18:
+-return STI->isTargetDarwin();
++return STI->isTargetDarwin() || ReserveX18;
+ case AArch64::FP:
+ case AArch64::W29:
+ return TFI->hasFP(MF) || STI->isTargetDarwin();
+@@ -379,7 +383,7 @@ unsigned AArch64RegisterInfo::getRegPressureLimit(
+ case AArch64::GPR64commonRegClassID:
+ return 32 - 1 // XZR/SP
+- (TFI->hasFP(MF) || STI->isTargetDarwin()) // FP
+- - STI->isTargetDarwin() // X18 reserved as platform register
++ - (STI->isTargetDarwin() || ReserveX18) // X18 reserved as
platform register
+- hasBasePointer(MF); // X19
+ case AArch64::FPR8RegClassID:
+ case AArch64::FPR16RegClassID:
+Index: test/CodeGen/AA
Re: svn commit: r278108 - head/sys/dev/gpio
Please don't condition things like this on FDT. They are useful on Open
Firmware systems too.
-Nathan
On 02/02/15 11:22, Luiz Otavio O Souza wrote:
Author: loos
Date: Mon Feb 2 19:22:34 2015
New Revision: 278108
URL: https://svnweb.freebsd.org/changeset/base/278108
Log:
Register the GPIO controller device reference on xref table for FDT systems.
Modified:
head/sys/dev/gpio/gpiobus.c
head/sys/dev/gpio/gpiobusvar.h
head/sys/dev/gpio/ofw_gpiobus.c
Modified: head/sys/dev/gpio/gpiobus.c
==
--- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015(r278107)
+++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015(r278108)
@@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev)
device_delete_child(dev, busdev);
return (NULL);
}
+#ifdef FDT
+ ofw_gpiobus_register_provider(dev);
+#endif
bus_generic_attach(dev);
return (busdev);
@@ -152,6 +155,10 @@ int
gpiobus_detach_bus(device_t dev)
{
+#ifdef FDT
+ ofw_gpiobus_unregister_provider(dev);
+#endif
+
return (bus_generic_detach(dev));
}
Modified: head/sys/dev/gpio/gpiobusvar.h
==
--- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015
(r278107)
+++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015
(r278108)
@@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d
}
device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t);
+void ofw_gpiobus_register_provider(device_t);
+void ofw_gpiobus_unregister_provider(device_t);
#endif
int gpio_check_flags(uint32_t, uint32_t);
device_t gpiobus_attach_bus(device_t);
Modified: head/sys/dev/gpio/ofw_gpiobus.c
==
--- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015
(r278107)
+++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015
(r278108)
@@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s
return (0);
}
+void
+ofw_gpiobus_register_provider(device_t provider)
+{
+ phandle_t node;
+
+ node = ofw_bus_get_node(provider);
+ OF_device_register_xref(OF_xref_from_node(node), provider);
+}
+
+void
+ofw_gpiobus_unregister_provider(device_t provider)
+{
+ phandle_t node;
+
+ node = ofw_bus_get_node(provider);
+ OF_device_register_xref(OF_xref_from_node(node), NULL);
+}
+
static struct ofw_gpiobus_devinfo *
ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node)
{
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278108 - head/sys/dev/gpio
Author: loos
Date: Mon Feb 2 19:22:34 2015
New Revision: 278108
URL: https://svnweb.freebsd.org/changeset/base/278108
Log:
Register the GPIO controller device reference on xref table for FDT systems.
Modified:
head/sys/dev/gpio/gpiobus.c
head/sys/dev/gpio/gpiobusvar.h
head/sys/dev/gpio/ofw_gpiobus.c
Modified: head/sys/dev/gpio/gpiobus.c
==
--- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015(r278107)
+++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015(r278108)
@@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev)
device_delete_child(dev, busdev);
return (NULL);
}
+#ifdef FDT
+ ofw_gpiobus_register_provider(dev);
+#endif
bus_generic_attach(dev);
return (busdev);
@@ -152,6 +155,10 @@ int
gpiobus_detach_bus(device_t dev)
{
+#ifdef FDT
+ ofw_gpiobus_unregister_provider(dev);
+#endif
+
return (bus_generic_detach(dev));
}
Modified: head/sys/dev/gpio/gpiobusvar.h
==
--- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015
(r278107)
+++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015
(r278108)
@@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d
}
device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t);
+void ofw_gpiobus_register_provider(device_t);
+void ofw_gpiobus_unregister_provider(device_t);
#endif
int gpio_check_flags(uint32_t, uint32_t);
device_t gpiobus_attach_bus(device_t);
Modified: head/sys/dev/gpio/ofw_gpiobus.c
==
--- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015
(r278107)
+++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015
(r278108)
@@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s
return (0);
}
+void
+ofw_gpiobus_register_provider(device_t provider)
+{
+ phandle_t node;
+
+ node = ofw_bus_get_node(provider);
+ OF_device_register_xref(OF_xref_from_node(node), provider);
+}
+
+void
+ofw_gpiobus_unregister_provider(device_t provider)
+{
+ phandle_t node;
+
+ node = ofw_bus_get_node(provider);
+ OF_device_register_xref(OF_xref_from_node(node), NULL);
+}
+
static struct ofw_gpiobus_devinfo *
ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node)
{
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278107 - head/sbin/ifconfig
Author: vsevolod (ports committer)
Date: Mon Feb 2 19:00:18 2015
New Revision: 278107
URL: https://svnweb.freebsd.org/changeset/base/278107
Log:
Revert the change of flowid output format. [1]
Reverse the sorting order of the interfaces addresses familise so it should be
the same as getifaddrs(3) order. [2]
Suggested by: hrs [1], bz [2]
Approved by: hrs, bapt
Modified:
head/sbin/ifconfig/af_inet6.c
head/sbin/ifconfig/ifconfig.c
Modified: head/sbin/ifconfig/af_inet6.c
==
--- head/sbin/ifconfig/af_inet6.c Mon Feb 2 18:48:49 2015
(r278106)
+++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 19:00:18 2015
(r278107)
@@ -167,33 +167,6 @@ setip6eui64(const char *cmd, int dummy _
}
static void
-in6_print_scope(uint8_t *a)
-{
- const char *sname = NULL;
- uint16_t val;
-
- val = (a[0] << 4) + ((a[1] & 0xc0) >> 4);
-
- if ((val & 0xff0) == 0xff0)
- sname = "Multicast";
- else {
- switch(val) {
- case 0xfe8:
- sname = "Link";
- break;
- case 0xfec:
- sname = "Site";
- break;
- default:
- sname = "Global";
- break;
- }
- }
-
- printf("scope: %s ", sname);
-}
-
-static void
in6_status(int s __unused, const struct ifaddrs *ifa)
{
struct sockaddr_in6 *sin, null_sin;
@@ -284,8 +257,9 @@ in6_status(int s __unused, const struct
if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0)
printf("prefer_source ");
- in6_print_scope((uint8_t *)&((struct sockaddr_in6 *)
- (ifa->ifa_addr))->sin6_addr);
+ if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id)
+ printf("scopeid 0x%x ",
+ ((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id);
if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) {
printf("pltime ");
Modified: head/sbin/ifconfig/ifconfig.c
==
--- head/sbin/ifconfig/ifconfig.c Mon Feb 2 18:48:49 2015
(r278106)
+++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 19:00:18 2015
(r278107)
@@ -235,7 +235,7 @@ cmpifaddrs(struct ifaddrs *a, struct ifa
if (af1 < ORDERS_SIZE(e1->af_orders) &&
af2 < ORDERS_SIZE(e1->af_orders))
- return (e1->af_orders[af2] - e1->af_orders[af1]);
+ return (e1->af_orders[af1] - e1->af_orders[af2]);
}
return (0);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278105 - head/sys/dev/usb
Author: hselasky
Date: Mon Feb 2 18:20:10 2015
New Revision: 278105
URL: https://svnweb.freebsd.org/changeset/base/278105
Log:
Separate out detection of prevent and allow medium removal quirk.
PR: 185747
MFC after:1 week
Modified:
head/sys/dev/usb/usb_msctest.c
Modified: head/sys/dev/usb/usb_msctest.c
==
--- head/sys/dev/usb/usb_msctest.c Mon Feb 2 17:33:00 2015
(r278104)
+++ head/sys/dev/usb/usb_msctest.c Mon Feb 2 18:20:10 2015
(r278105)
@@ -113,6 +113,8 @@ static uint8_t scsi_request_sense[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static uint8_t scsi_read_capacity[] = { 0x25, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00 };
+static uint8_t scsi_prevent_removal[] ={ 0x1e, 0, 0, 0, 1, 0 };
+static uint8_t scsi_allow_removal[] = { 0x1e, 0, 0, 0, 0, 0 };
#ifndef USB_MSCTEST_BULK_SIZE
#defineUSB_MSCTEST_BULK_SIZE 64 /* dummy */
@@ -702,10 +704,28 @@ usb_msc_auto_quirk(struct usb_device *ud
USB_MS_HZ);
if (err != 0) {
+ if (err != ERR_CSW_FAILED)
+ goto error;
+ DPRINTF("Test unit ready failed\n");
+ }
+ err = bbb_command_start(sc, DIR_OUT, 0, NULL, 0,
+ &scsi_prevent_removal, sizeof(scsi_prevent_removal),
+ USB_MS_HZ);
+
+ if (err == 0) {
+ err = bbb_command_start(sc, DIR_OUT, 0, NULL, 0,
+ &scsi_allow_removal, sizeof(scsi_allow_removal),
+ USB_MS_HZ);
+ }
+
+ if (err != 0) {
if (err != ERR_CSW_FAILED)
goto error;
+ DPRINTF("Device doesn't handle prevent and allow removal\n");
+ usbd_add_dynamic_quirk(udev, UQ_MSC_NO_PREVENT_ALLOW);
}
+
timeout = 1;
retry_sync_cache:
@@ -718,11 +738,9 @@ retry_sync_cache:
if (err != ERR_CSW_FAILED)
goto error;
- DPRINTF("Device doesn't handle synchronize cache "
- "and prevent allow medium removal\n");
+ DPRINTF("Device doesn't handle synchronize cache\n");
usbd_add_dynamic_quirk(udev, UQ_MSC_NO_SYNC_CACHE);
- usbd_add_dynamic_quirk(udev, UQ_MSC_NO_PREVENT_ALLOW);
} else {
/*
@@ -749,13 +767,10 @@ retry_sync_cache:
goto retry_sync_cache;
DPRINTF("Device most likely doesn't "
- "handle synchronize cache nor"
- "prevent allow medium removal\n");
+ "handle synchronize cache\n");
usbd_add_dynamic_quirk(udev,
UQ_MSC_NO_SYNC_CACHE);
- usbd_add_dynamic_quirk(udev,
- UQ_MSC_NO_PREVENT_ALLOW);
} else {
if (err != ERR_CSW_FAILED)
goto error;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278104 - head/sys/mips/atheros
Author: sbruno
Date: Mon Feb 2 17:33:00 2015
New Revision: 278104
URL: https://svnweb.freebsd.org/changeset/base/278104
Log:
The linux driver code for the MDIO bus does a read-after-write
which seems to be required on MIPS74k platforms for correct
behaviour.
Reviewed by: adrian
Modified:
head/sys/mips/atheros/if_argevar.h
Modified: head/sys/mips/atheros/if_argevar.h
==
--- head/sys/mips/atheros/if_argevar.h Mon Feb 2 17:32:50 2015
(r278103)
+++ head/sys/mips/atheros/if_argevar.h Mon Feb 2 17:33:00 2015
(r278104)
@@ -74,8 +74,20 @@
#define ARGE_CLEAR_BITS(sc, reg, bits) \
ARGE_WRITE(sc, reg, ARGE_READ(sc, (reg)) & ~(bits))
-#define ARGE_MDIO_WRITE(_sc, _reg, _val) \
- ARGE_WRITE((_sc), (_reg), (_val))
+/*
+ * The linux driver code for the MDIO bus does a read-after-write
+ * which seems to be required on MIPS74k platforms for correct
+ * behaviour.
+ *
+ * So, ARGE_WRITE() does the write + barrier, and the following
+ * ARGE_READ() seems to flush the thing all the way through the device
+ * FIFO(s) before we continue issuing MDIO bus updates.
+ */
+#define ARGE_MDIO_WRITE(_sc, _reg, _val) \
+ do { \
+ ARGE_WRITE((_sc), (_reg), (_val)); \
+ ARGE_READ((_sc), (_reg)); \
+ } while (0)
#define ARGE_MDIO_READ(_sc, _reg) \
ARGE_READ((_sc), (_reg))
#defineARGE_MDIO_BARRIER_READ(_sc) ARGE_BARRIER_READ(_sc)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278103 - head/sys/netinet
Author: hselasky Date: Mon Feb 2 17:32:50 2015 New Revision: 278103 URL: https://svnweb.freebsd.org/changeset/base/278103 Log: The flowid and hashtype should be copied from the originating packet when fragmenting IP packets to preserve the order of the packets in a stream. Else the resulting fragments can be sent out of order when the hardware supports multiple transmit rings. Reviewed by: glebius @ MFC after:1 week Sponsored by: Mellanox Technologies Modified: head/sys/netinet/ip_output.c Modified: head/sys/netinet/ip_output.c == --- head/sys/netinet/ip_output.cMon Feb 2 16:19:11 2015 (r278102) +++ head/sys/netinet/ip_output.cMon Feb 2 17:32:50 2015 (r278103) @@ -789,6 +789,10 @@ smart_frag_failure: IPSTAT_INC(ips_odropped); goto done; } + /* make sure the flowid is the same for the fragmented mbufs */ + M_HASHTYPE_SET(m, M_HASHTYPE_GET(m0)); + m->m_pkthdr.flowid = m0->m_pkthdr.flowid; + /* copy multicast flag, if any */ m->m_flags |= (m0->m_flags & M_MCAST); /* * In the first mbuf, leave room for the link header, then ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r278101 - head/release/doc/share/mk
On Mon, Feb 02, 2015 at 04:10:04PM +, Hiroki Sato wrote: > Author: hrs > Date: Mon Feb 2 16:10:03 2015 > New Revision: 278101 > URL: https://svnweb.freebsd.org/changeset/base/278101 > > Log: > Add a toc.section.depth=3 parameter to use the same ToC depth as DocBook > DSSSL stylesheet. > Thank you. Glen pgpxiHuBzDFS2.pgp Description: PGP signature
svn commit: r278101 - head/release/doc/share/mk
Author: hrs
Date: Mon Feb 2 16:10:03 2015
New Revision: 278101
URL: https://svnweb.freebsd.org/changeset/base/278101
Log:
Add a toc.section.depth=3 parameter to use the same ToC depth as DocBook
DSSSL stylesheet.
Reported by: gjb
Modified:
head/release/doc/share/mk/doc.relnotes.mk
Modified: head/release/doc/share/mk/doc.relnotes.mk
==
--- head/release/doc/share/mk/doc.relnotes.mk Mon Feb 2 16:07:07 2015
(r278100)
+++ head/release/doc/share/mk/doc.relnotes.mk Mon Feb 2 16:10:03 2015
(r278101)
@@ -17,6 +17,7 @@ PROFILING+= --param profile.attribute "'
XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'"
XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'"
XSLTPROCFLAGS+= --param release.maillist "'${RELEASEMAILLIST}'"
+XSLTPROCFLAGS+=--param toc.section.depth "'3'"
# Find the RELNOTESng document catalogs
EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278100 - head/sys/rpc
Author: pfg
Date: Mon Feb 2 16:07:07 2015
New Revision: 278100
URL: https://svnweb.freebsd.org/changeset/base/278100
Log:
rpc: Uninitialized pointer read
Initialize *xprt to avoid exposing a random value
in cleanup_svc_vc_create.
This is the kernel counterpart of r278041.
CID: 1007340
Modified:
head/sys/rpc/svc_vc.c
Modified: head/sys/rpc/svc_vc.c
==
--- head/sys/rpc/svc_vc.c Mon Feb 2 16:06:23 2015(r278099)
+++ head/sys/rpc/svc_vc.c Mon Feb 2 16:07:07 2015(r278100)
@@ -143,7 +143,7 @@ SVCXPRT *
svc_vc_create(SVCPOOL *pool, struct socket *so, size_t sendsize,
size_t recvsize)
{
- SVCXPRT *xprt;
+ SVCXPRT *xprt = NULL;
struct sockaddr* sa;
int error;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278099 - head/sys/dev/iscsi
Author: mav Date: Mon Feb 2 16:06:23 2015 New Revision: 278099 URL: https://svnweb.freebsd.org/changeset/base/278099 Log: Missed addition to r278098. MFC after:1 week Modified: head/sys/dev/iscsi/iscsi_proto.h Modified: head/sys/dev/iscsi/iscsi_proto.h == --- head/sys/dev/iscsi/iscsi_proto.hMon Feb 2 15:59:17 2015 (r278098) +++ head/sys/dev/iscsi/iscsi_proto.hMon Feb 2 16:06:23 2015 (r278099) @@ -176,7 +176,8 @@ struct iscsi_bhs_task_management_respons uint8_t bhstmr_reserved; uint8_t bhstmr_total_ahs_len; uint8_t bhstmr_data_segment_len[3]; - uint64_tbhstmr_reserved2; + uint8_t bhstmr_additional_reponse_information[3]; + uint8_t bhstmr_reserved2[5]; uint32_tbhstmr_initiator_task_tag; uint32_tbhstmr_reserved3; uint32_tbhstmr_statsn; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278098 - head/sys/dev/iscsi
Author: mav
Date: Mon Feb 2 15:59:17 2015
New Revision: 278098
URL: https://svnweb.freebsd.org/changeset/base/278098
Log:
Add some fields and constants from RFC7144.
MFC after:1 week
Modified:
head/sys/dev/iscsi/iscsi_proto.h
Modified: head/sys/dev/iscsi/iscsi_proto.h
==
--- head/sys/dev/iscsi/iscsi_proto.hMon Feb 2 15:53:01 2015
(r278097)
+++ head/sys/dev/iscsi/iscsi_proto.hMon Feb 2 15:59:17 2015
(r278098)
@@ -115,7 +115,9 @@ struct iscsi_bhs_scsi_response {
uint8_t bhssr_status;
uint8_t bhssr_total_ahs_len;
uint8_t bhssr_data_segment_len[3];
- uint64_tbhssr_reserved;
+ uint16_tbhssr_status_qualifier;
+ uint16_tbhssr_reserved;
+ uint32_tbhssr_reserved2;
uint32_tbhssr_initiator_task_tag;
uint32_tbhssr_snack_tag;
uint32_tbhssr_statsn;
@@ -135,6 +137,10 @@ CTASSERT(sizeof(struct iscsi_bhs_scsi_re
#defineBHSTMR_FUNCTION_TARGET_WARM_RESET 6
#defineBHSTMR_FUNCTION_TARGET_COLD_RESET 7
#defineBHSTMR_FUNCTION_TASK_REASSIGN 8
+#defineBHSTMR_FUNCTION_QUERY_TASK 9
+#defineBHSTMR_FUNCTION_QUERY_TASK_SET 10
+#defineBHSTMR_FUNCTION_I_T_NEXUS_RESET 11
+#defineBHSTMR_FUNCTION_QUERY_ASYNC_EVENT 12
struct iscsi_bhs_task_management_request {
uint8_t bhstmr_opcode;
@@ -154,7 +160,14 @@ struct iscsi_bhs_task_management_request
CTASSERT(sizeof(struct iscsi_bhs_task_management_request) == ISCSI_BHS_SIZE);
#defineBHSTMR_RESPONSE_FUNCTION_COMPLETE 0
+#defineBHSTMR_RESPONSE_TASK_DOES_NOT_EXIST 1
+#defineBHSTMR_RESPONSE_LUN_DOES_NOT_EXIST 2
+#defineBHSTMR_RESPONSE_TASK_STILL_ALLEGIANT3
+#defineBHSTMR_RESPONSE_TASK_ALL_REASS_NOT_SUPP 4
#defineBHSTMR_RESPONSE_FUNCTION_NOT_SUPPORTED 5
+#defineBHSTMR_RESPONSE_FUNCTION_AUTH_FAIL 6
+#defineBHSTMR_RESPONSE_FUNCTION_SUCCEEDED 7
+#defineBHSTMR_RESPONSE_FUNCTION_REJECTED 255
struct iscsi_bhs_task_management_response {
uint8_t bhstmr_opcode;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278095 - head/tools/build/mk
Author: amdmi3 (ports committer) Date: Mon Feb 2 14:59:55 2015 New Revision: 278095 URL: https://svnweb.freebsd.org/changeset/base/278095 Log: - Remove more files when MK_NTP == no MFC after:1 week Reviewed by: ngie Approved by: ngie Differential Revision:D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:58:41 2015(r278094) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:59:55 2015(r278095) @@ -5725,6 +5725,7 @@ OLD_FILES+=usr/share/doc/ntp/release.htm OLD_FILES+=usr/share/doc/ntp/tickadj.html OLD_DIRS+=usr/share/doc/ntp OLD_FILES+=usr/share/examples/etc/ntp.conf +OLD_FILES+=usr/share/man/man1/sntp.1.gz OLD_FILES+=usr/share/man/man5/ntp.conf.5.gz OLD_FILES+=usr/share/man/man5/ntp.keys.5.gz OLD_FILES+=usr/share/man/man8/ntp-keygen.8.gz ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278094 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:58:41 2015
New Revision: 278094
URL: https://svnweb.freebsd.org/changeset/base/278094
Log:
- Remove more files when MK_NS_CACHING == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:57:45
2015(r278093)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:58:41
2015(r278094)
@@ -5638,6 +5638,15 @@ OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5
OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
.endif
+.if ${MK_NS_CACHING} == no
+OLD_FILES+=etc/nscd.conf
+OLD_FILES+=etc/rc.d/nscd
+OLD_FILES+=usr/sbin/nscd
+OLD_FILES+=usr/share/examples/etc/nscd.conf
+OLD_FILES+=usr/share/man/man5/nscd.conf.5.gz
+OLD_FILES+=usr/share/man/man8/nscd.8.gz
+.endif
+
.if ${MK_NTP} == no
OLD_FILES+=etc/ntp.conf
OLD_FILES+=etc/periodic/daily/480.status-ntpd
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278093 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:57:45 2015
New Revision: 278093
URL: https://svnweb.freebsd.org/changeset/base/278093
Log:
- Remove more files when MK_NLS_CATALOGS == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:56:39
2015(r278092)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:57:45
2015(r278093)
@@ -5614,6 +5614,30 @@ OLD_FILES+=usr/share/nls/zh_CN.UTF-8/lib
OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0
.endif
+.if ${MK_NLS_CATALOGS} == no
+OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
+OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
+OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
+OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
+OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
+OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
+.endif
+
.if ${MK_NTP} == no
OLD_FILES+=etc/ntp.conf
OLD_FILES+=etc/periodic/daily/480.status-ntpd
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278092 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:56:39 2015
New Revision: 278092
URL: https://svnweb.freebsd.org/changeset/base/278092
Log:
- Remove more files when MK_NLS == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:55:24
2015(r278091)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:56:39
2015(r278092)
@@ -5503,8 +5503,115 @@ OLD_FILES+=var/yp/Makefile.dist
.endif
.if ${MK_NLS} == no
+OLD_FILES+=usr/share/nls/C/ee.cat
+OLD_FILES+=usr/share/nls/be_BY.UTF-8/libc.cat
+OLD_FILES+=usr/share/nls/ca_ES.ISO8859-1/libc.cat
+OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/ee.cat
+OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/ee.cat
+OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/libc.cat
+OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/ee.cat
+OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/libc.cat
+OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat
+OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/en_US.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/en_US.ISO8859-15/ee.cat
+OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat
+OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/libc.cat
+OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/libc.cat
+OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/ee.cat
+OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/ee.cat
+OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/ee.cat
+OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/libc.cat
+OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/ee.cat
+OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/grep.cat
+OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/libc.cat
+OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
+OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat
+OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/libc.cat
+OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat
+OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat
+OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/libc.cat
+OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/ja_JP.SJIS/grep.cat
+OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
+OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat
+OLD_FILES+=usr/share/nls/ja_JP.UTF-8/libc.cat
+OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/ja_JP.eucJP/grep.cat
+OLD_FILES+=usr/share/nls/ja_JP.eucJP/libc.cat
+OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
+OLD_FILES+=usr/share/nls/ko_KR.UTF-8/libc.cat
+OLD_FILES+=usr/share/nls/ko_KR.eucKR/libc.cat
+OLD_FILES+=usr/share/nls/mn_MN.UTF-8/libc.cat
+OLD_FILES+=usr/share/nls/nl_NL.ISO8859-1/libc.cat
+OLD_FILES+=usr/share/nls/no_NO.ISO8859-1/libc.cat
+OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat
+OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/libc.cat
+OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/pt
svn commit: r278091 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:55:24 2015
New Revision: 278091
URL: https://svnweb.freebsd.org/changeset/base/278091
Log:
- Remove more files when MK_NETGRAPH_SUPPORT == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:54:28
2015(r278090)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:55:24
2015(r278091)
@@ -5438,6 +5438,15 @@ OLD_FILES+=usr/share/man/man8/nghook.8.g
OLD_FILES+=usr/share/man/man8/pppoed.8.gz
.endif
+.if ${MK_NETGRAPH_SUPPORT} == no
+OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
+OLD_FILES+=usr/lib/snmp_netgraph.so
+OLD_LIBS+=usr/lib/snmp_netgraph.so.6
+OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
+OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
+.endif
+
.if ${MK_NIS} == no
OLD_FILES+=usr/bin/ypcat
OLD_FILES+=usr/bin/ypchfn
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278090 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:54:28 2015
New Revision: 278090
URL: https://svnweb.freebsd.org/changeset/base/278090
Log:
- Remove more files when MK_NETGRAPH == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:52:38
2015(r278089)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:54:28
2015(r278090)
@@ -5401,6 +5401,43 @@ OLD_FILES+=usr/bin/nc
OLD_FILES+=usr/share/man/man1/nc.1.gz
.endif
+.if ${MK_NETGRAPH} == no
+OLD_FILES+=usr/include/netgraph.h
+OLD_FILES+=usr/lib/libnetgraph.a
+OLD_FILES+=usr/lib/libnetgraph.so
+OLD_LIBS+=usr/lib/libnetgraph.so.4
+OLD_FILES+=usr/lib/libnetgraph_p.a
+OLD_FILES+=usr/lib32/libnetgraph.a
+OLD_FILES+=usr/lib32/libnetgraph.so
+OLD_LIBS+=usr/lib32/libnetgraph.so.4
+OLD_FILES+=usr/lib32/libnetgraph_p.a
+OLD_FILES+=usr/libexec/pppoed
+OLD_FILES+=usr/sbin/flowctl
+OLD_FILES+=usr/sbin/lmcconfig
+OLD_FILES+=usr/sbin/ngctl
+OLD_FILES+=usr/sbin/nghook
+OLD_FILES+=usr/share/man/man3/NgAllocRecvAsciiMsg.3.gz
+OLD_FILES+=usr/share/man/man3/NgAllocRecvData.3.gz
+OLD_FILES+=usr/share/man/man3/NgAllocRecvMsg.3.gz
+OLD_FILES+=usr/share/man/man3/NgMkSockNode.3.gz
+OLD_FILES+=usr/share/man/man3/NgNameNode.3.gz
+OLD_FILES+=usr/share/man/man3/NgRecvAsciiMsg.3.gz
+OLD_FILES+=usr/share/man/man3/NgRecvData.3.gz
+OLD_FILES+=usr/share/man/man3/NgRecvMsg.3.gz
+OLD_FILES+=usr/share/man/man3/NgSendAsciiMsg.3.gz
+OLD_FILES+=usr/share/man/man3/NgSendData.3.gz
+OLD_FILES+=usr/share/man/man3/NgSendMsg.3.gz
+OLD_FILES+=usr/share/man/man3/NgSendMsgReply.3.gz
+OLD_FILES+=usr/share/man/man3/NgSetDebug.3.gz
+OLD_FILES+=usr/share/man/man3/NgSetErrLog.3.gz
+OLD_FILES+=usr/share/man/man3/netgraph.3.gz
+OLD_FILES+=usr/share/man/man8/flowctl.8.gz
+OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
+OLD_FILES+=usr/share/man/man8/ngctl.8.gz
+OLD_FILES+=usr/share/man/man8/nghook.8.gz
+OLD_FILES+=usr/share/man/man8/pppoed.8.gz
+.endif
+
.if ${MK_NIS} == no
OLD_FILES+=usr/bin/ypcat
OLD_FILES+=usr/bin/ypchfn
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278089 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:52:38 2015
New Revision: 278089
URL: https://svnweb.freebsd.org/changeset/base/278089
Log:
- Remove more files when MK_MAN_UTILS == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:51:26
2015(r278088)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:52:38
2015(r278089)
@@ -5362,6 +5362,32 @@ MAN_FILES!=find ${DESTDIR}/usr/share/man
OLD_FILES+=${MAN_FILES}
.endif
+.if ${MK_MAN_UTILS} == no
+OLD_FILES+=etc/periodic/weekly/320.whatis
+OLD_FILES+=etc/periodic/weekly/330.catman
+OLD_FILES+=usr/bin/apropos
+OLD_FILES+=usr/bin/catman
+OLD_FILES+=usr/bin/makewhatis
+OLD_FILES+=usr/bin/man
+OLD_FILES+=usr/bin/manpath
+OLD_FILES+=usr/bin/whatis
+OLD_FILES+=usr/libexec/catman.local
+OLD_FILES+=usr/libexec/makewhatis.local
+OLD_FILES+=usr/sbin/manctl
+OLD_FILES+=usr/share/man/man1/apropos.1.gz
+OLD_FILES+=usr/share/man/man1/catman.1.gz
+OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
+OLD_FILES+=usr/share/man/man1/man.1.gz
+OLD_FILES+=usr/share/man/man1/manpath.1.gz
+OLD_FILES+=usr/share/man/man1/whatis.1.gz
+OLD_FILES+=usr/share/man/man5/man.conf.5.gz
+OLD_FILES+=usr/share/man/man8/catman.local.8.gz
+OLD_FILES+=usr/share/man/man8/makewhatis.local.8.gz
+OLD_FILES+=usr/share/man/man8/manctl.8.gz
+OLD_FILES+=usr/share/man/whatis
+OLD_FILES+=usr/share/openssl/man/whatis
+.endif
+
.if ${MK_NDIS} == no
OLD_FILES+=usr/sbin/ndiscvt
OLD_FILES+=usr/sbin/ndisgen
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278088 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:51:26 2015
New Revision: 278088
URL: https://svnweb.freebsd.org/changeset/base/278088
Log:
- Remove more files when MK_MAN == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:50:14
2015(r278087)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:51:26
2015(r278088)
@@ -5357,10 +5357,10 @@ OLD_FILES+=usr/tests/usr.bin/bmake/varia
OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/legacy_test
.endif
-#.if ${MK_MAN} == no
-# This should add a dependency to a special target which removes all man pages.
-# Listing all of them here is overkill.
-#.endif
+.if ${MK_MAN} == no
+MAN_FILES!=find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man
-type f | sed -e 's,^${DESTDIR}/,,'; echo
+OLD_FILES+=${MAN_FILES}
+.endif
.if ${MK_NDIS} == no
OLD_FILES+=usr/sbin/ndiscvt
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278087 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:50:14 2015
New Revision: 278087
URL: https://svnweb.freebsd.org/changeset/base/278087
Log:
- Remove more files when MK_MAKE == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:48:05
2015(r278086)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:50:14
2015(r278087)
@@ -4992,6 +4992,371 @@ OLD_FILES+=usr/sbin/mailwrapper
OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz
.endif
+.if ${MK_MAKE} == no
+OLD_FILES+=usr/bin/make
+OLD_FILES+=usr/share/man/man1/make.1.gz
+OLD_FILES+=usr/share/mk/atf.test.mk
+OLD_FILES+=usr/share/mk/bsd.README
+OLD_FILES+=usr/share/mk/bsd.arch.inc.mk
+OLD_FILES+=usr/share/mk/bsd.compiler.mk
+OLD_FILES+=usr/share/mk/bsd.cpu.mk
+OLD_FILES+=usr/share/mk/bsd.crunchgen.mk
+OLD_FILES+=usr/share/mk/bsd.dep.mk
+OLD_FILES+=usr/share/mk/bsd.doc.mk
+OLD_FILES+=usr/share/mk/bsd.dtb.mk
+OLD_FILES+=usr/share/mk/bsd.endian.mk
+OLD_FILES+=usr/share/mk/bsd.files.mk
+OLD_FILES+=usr/share/mk/bsd.incs.mk
+OLD_FILES+=usr/share/mk/bsd.info.mk
+OLD_FILES+=usr/share/mk/bsd.init.mk
+OLD_FILES+=usr/share/mk/bsd.kmod.mk
+OLD_FILES+=usr/share/mk/bsd.lib.mk
+OLD_FILES+=usr/share/mk/bsd.libnames.mk
+OLD_FILES+=usr/share/mk/bsd.links.mk
+OLD_FILES+=usr/share/mk/bsd.man.mk
+OLD_FILES+=usr/share/mk/bsd.mkopt.mk
+OLD_FILES+=usr/share/mk/bsd.nls.mk
+OLD_FILES+=usr/share/mk/bsd.obj.mk
+OLD_FILES+=usr/share/mk/bsd.opts.mk
+OLD_FILES+=usr/share/mk/bsd.own.mk
+OLD_FILES+=usr/share/mk/bsd.port.mk
+OLD_FILES+=usr/share/mk/bsd.port.options.mk
+OLD_FILES+=usr/share/mk/bsd.port.post.mk
+OLD_FILES+=usr/share/mk/bsd.port.pre.mk
+OLD_FILES+=usr/share/mk/bsd.port.subdir.mk
+OLD_FILES+=usr/share/mk/bsd.prog.mk
+OLD_FILES+=usr/share/mk/bsd.progs.mk
+OLD_FILES+=usr/share/mk/bsd.snmpmod.mk
+OLD_FILES+=usr/share/mk/bsd.subdir.mk
+OLD_FILES+=usr/share/mk/bsd.symver.mk
+OLD_FILES+=usr/share/mk/bsd.sys.mk
+OLD_FILES+=usr/share/mk/bsd.test.mk
+OLD_FILES+=usr/share/mk/plain.test.mk
+OLD_FILES+=usr/share/mk/suite.test.mk
+OLD_FILES+=usr/share/mk/sys.mk
+OLD_FILES+=usr/share/mk/tap.test.mk
+OLD_FILES+=usr/share/mk/version_gen.awk
+OLD_FILES+=usr/tests/usr.bin/bmake/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_
svn commit: r278086 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:48:05 2015
New Revision: 278086
URL: https://svnweb.freebsd.org/changeset/base/278086
Log:
- Remove more files when MK_MAIL == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:45:17
2015(r278085)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:48:05
2015(r278086)
@@ -4960,6 +4960,10 @@ OLD_FILES+=usr/share/man/man8/pac.8.gz
.endif
.if ${MK_MAIL} == no
+OLD_FILES+=etc/aliases
+OLD_FILES+=etc/mail.rc
+OLD_FILES+=etc/mail/aliases
+OLD_FILES+=etc/mail/mailer.conf
OLD_FILES+=etc/periodic/daily/130.clean-msgs
OLD_FILES+=usr/bin/Mail
OLD_FILES+=usr/bin/biff
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278085 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:45:17 2015
New Revision: 278085
URL: https://svnweb.freebsd.org/changeset/base/278085
Log:
- Remove more files when MK_LOCALES == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:43:07
2015(r278084)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:45:17
2015(r278085)
@@ -3876,9 +3876,1039 @@ OLD_DIRS+=usr/include/c++/v1
# to be filled in
#.endif
-#.if ${MK_LOCALES} == no
-# to be filled in
-#.endif
+.if ${MK_LOCALES} == no
+OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE
+OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE
+OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES
+OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MONETARY
+OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_NUMERIC
+OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_TIME
+OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_COLLATE
+OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_CTYPE
+OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MESSAGES
+OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MONETARY
+OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_NUMERIC
+OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_TIME
+OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_COLLATE
+OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_CTYPE
+OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MESSAGES
+OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MONETARY
+OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_NUMERIC
+OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_TIME
+OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_COLLATE
+OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_CTYPE
+OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MESSAGES
+OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MONETARY
+OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_NUMERIC
+OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_TIME
+OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_AD.UTF
svn commit: r278084 - head/tools/build/mk
Author: amdmi3 (ports committer) Date: Mon Feb 2 14:43:07 2015 New Revision: 278084 URL: https://svnweb.freebsd.org/changeset/base/278084 Log: - Remove more files when MK_LIBCPLUSPLUS == no MFC after:1 week Reviewed by: ngie Approved by: ngie Differential Revision:D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:40:42 2015(r278083) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:43:07 2015(r278084) @@ -3661,6 +3661,7 @@ OLD_FILES+=usr/include/c++/v1/__function OLD_FILES+=usr/include/c++/v1/__hash_table OLD_FILES+=usr/include/c++/v1/__locale OLD_FILES+=usr/include/c++/v1/__mutex_base +OLD_FILES+=usr/include/c++/v1/__refstring OLD_FILES+=usr/include/c++/v1/__split_buffer OLD_FILES+=usr/include/c++/v1/__sso_allocator OLD_FILES+=usr/include/c++/v1/__std_stream @@ -3704,8 +3705,12 @@ OLD_FILES+=usr/include/c++/v1/cwctype OLD_FILES+=usr/include/c++/v1/cxxabi.h OLD_FILES+=usr/include/c++/v1/deque OLD_FILES+=usr/include/c++/v1/exception +OLD_FILES+=usr/include/c++/v1/experimental/__config OLD_FILES+=usr/include/c++/v1/experimental/dynarray OLD_FILES+=usr/include/c++/v1/experimental/optional +OLD_FILES+=usr/include/c++/v1/experimental/string_view +OLD_FILES+=usr/include/c++/v1/experimental/type_traits +OLD_FILES+=usr/include/c++/v1/experimental/utility OLD_FILES+=usr/include/c++/v1/ext/__hash OLD_FILES+=usr/include/c++/v1/ext/hash_map OLD_FILES+=usr/include/c++/v1/ext/hash_set @@ -3735,6 +3740,7 @@ OLD_FILES+=usr/include/c++/v1/ratio OLD_FILES+=usr/include/c++/v1/regex OLD_FILES+=usr/include/c++/v1/scoped_allocator OLD_FILES+=usr/include/c++/v1/set +OLD_FILES+=usr/include/c++/v1/shared_mutex OLD_FILES+=usr/include/c++/v1/sstream OLD_FILES+=usr/include/c++/v1/stack OLD_FILES+=usr/include/c++/v1/stdexcept @@ -3744,6 +3750,103 @@ OLD_FILES+=usr/include/c++/v1/strstream OLD_FILES+=usr/include/c++/v1/system_error OLD_FILES+=usr/include/c++/v1/tgmath.h OLD_FILES+=usr/include/c++/v1/thread +OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference +OLD_FILES+=usr/include/c++/v1/tr1/__config +OLD_FILES+=usr/include/c++/v1/tr1/__debug +OLD_FILES+=usr/include/c++/v1/tr1/__functional_03 +OLD_FILES+=usr/include/c++/v1/tr1/__functional_base +OLD_FILES+=usr/include/c++/v1/tr1/__functional_base_03 +OLD_FILES+=usr/include/c++/v1/tr1/__hash_table +OLD_FILES+=usr/include/c++/v1/tr1/__locale +OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base +OLD_FILES+=usr/include/c++/v1/tr1/__refstring +OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer +OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator +OLD_FILES+=usr/include/c++/v1/tr1/__std_stream +OLD_FILES+=usr/include/c++/v1/tr1/__tree +OLD_FILES+=usr/include/c++/v1/tr1/__tuple +OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03 +OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max +OLD_FILES+=usr/include/c++/v1/tr1/algorithm +OLD_FILES+=usr/include/c++/v1/tr1/array +OLD_FILES+=usr/include/c++/v1/tr1/atomic +OLD_FILES+=usr/include/c++/v1/tr1/bitset +OLD_FILES+=usr/include/c++/v1/tr1/cassert +OLD_FILES+=usr/include/c++/v1/tr1/ccomplex +OLD_FILES+=usr/include/c++/v1/tr1/cctype +OLD_FILES+=usr/include/c++/v1/tr1/cerrno +OLD_FILES+=usr/include/c++/v1/tr1/cfenv +OLD_FILES+=usr/include/c++/v1/tr1/cfloat +OLD_FILES+=usr/include/c++/v1/tr1/chrono +OLD_FILES+=usr/include/c++/v1/tr1/cinttypes +OLD_FILES+=usr/include/c++/v1/tr1/ciso646 +OLD_FILES+=usr/include/c++/v1/tr1/climits +OLD_FILES+=usr/include/c++/v1/tr1/clocale +OLD_FILES+=usr/include/c++/v1/tr1/cmath +OLD_FILES+=usr/include/c++/v1/tr1/codecvt +OLD_FILES+=usr/include/c++/v1/tr1/complex +OLD_FILES+=usr/include/c++/v1/tr1/complex.h +OLD_FILES+=usr/include/c++/v1/tr1/condition_variable +OLD_FILES+=usr/include/c++/v1/tr1/csetjmp +OLD_FILES+=usr/include/c++/v1/tr1/csignal +OLD_FILES+=usr/include/c++/v1/tr1/cstdarg +OLD_FILES+=usr/include/c++/v1/tr1/cstdbool +OLD_FILES+=usr/include/c++/v1/tr1/cstddef +OLD_FILES+=usr/include/c++/v1/tr1/cstdint +OLD_FILES+=usr/include/c++/v1/tr1/cstdio +OLD_FILES+=usr/include/c++/v1/tr1/cstdlib +OLD_FILES+=usr/include/c++/v1/tr1/cstring +OLD_FILES+=usr/include/c++/v1/tr1/ctgmath +OLD_FILES+=usr/include/c++/v1/tr1/ctime +OLD_FILES+=usr/include/c++/v1/tr1/cwchar +OLD_FILES+=usr/include/c++/v1/tr1/cwctype +OLD_FILES+=usr/include/c++/v1/tr1/deque +OLD_FILES+=usr/include/c++/v1/tr1/exception +OLD_FILES+=usr/include/c++/v1/tr1/forward_list +OLD_FILES+=usr/include/c++/v1/tr1/fstream +OLD_FILES+=usr/include/c++/v1/tr1/functional +OLD_FILES+=usr/include/c++/v1/tr1/future +OLD_FILES+=usr/include/c++/v1/tr1/initializer_list +OLD_FILES+=usr/include/c++/v1/tr1/iomanip +OLD_FILES+=usr/include/c++/v1/tr1/ios +OLD_FILES+=usr/include/c++/v1/tr1/iosfwd +OLD_FILES+=usr/include/c++/v1/tr1/iostream +OLD_FILES+=usr/include/c++/v1/tr1/istream +OLD_FILES+=
svn commit: r278083 - head/tools/build/mk
Author: amdmi3 (ports committer)
Date: Mon Feb 2 14:40:42 2015
New Revision: 278083
URL: https://svnweb.freebsd.org/changeset/base/278083
Log:
- Remove more files when MK_HTML == no
MFC after:1 week
Reviewed by: ngie
Approved by: ngie
Differential Revision:D1600
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:38:47
2015(r278082)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:40:42
2015(r278083)
@@ -2402,9 +2402,76 @@ OLD_FILES+=usr/share/man/man3/hesiod.3.g
OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz
.endif
-#.if ${MK_HTML} == no
-# to be filled in
-#.endif
+.if ${MK_HTML} == no
+OLD_FILES+=usr/share/doc/ncurses/hackguide.html
+OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html
+OLD_FILES+=usr/share/doc/ntp/accopt.html
+OLD_FILES+=usr/share/doc/ntp/assoc.html
+OLD_FILES+=usr/share/doc/ntp/audio.html
+OLD_FILES+=usr/share/doc/ntp/authopt.html
+OLD_FILES+=usr/share/doc/ntp/build.html
+OLD_FILES+=usr/share/doc/ntp/clockopt.html
+OLD_FILES+=usr/share/doc/ntp/config.html
+OLD_FILES+=usr/share/doc/ntp/confopt.html
+OLD_FILES+=usr/share/doc/ntp/copyright.html
+OLD_FILES+=usr/share/doc/ntp/debug.html
+OLD_FILES+=usr/share/doc/ntp/driver1.html
+OLD_FILES+=usr/share/doc/ntp/driver10.html
+OLD_FILES+=usr/share/doc/ntp/driver11.html
+OLD_FILES+=usr/share/doc/ntp/driver12.html
+OLD_FILES+=usr/share/doc/ntp/driver16.html
+OLD_FILES+=usr/share/doc/ntp/driver18.html
+OLD_FILES+=usr/share/doc/ntp/driver19.html
+OLD_FILES+=usr/share/doc/ntp/driver2.html
+OLD_FILES+=usr/share/doc/ntp/driver20.html
+OLD_FILES+=usr/share/doc/ntp/driver22.html
+OLD_FILES+=usr/share/doc/ntp/driver26.html
+OLD_FILES+=usr/share/doc/ntp/driver27.html
+OLD_FILES+=usr/share/doc/ntp/driver28.html
+OLD_FILES+=usr/share/doc/ntp/driver29.html
+OLD_FILES+=usr/share/doc/ntp/driver3.html
+OLD_FILES+=usr/share/doc/ntp/driver30.html
+OLD_FILES+=usr/share/doc/ntp/driver32.html
+OLD_FILES+=usr/share/doc/ntp/driver33.html
+OLD_FILES+=usr/share/doc/ntp/driver34.html
+OLD_FILES+=usr/share/doc/ntp/driver35.html
+OLD_FILES+=usr/share/doc/ntp/driver36.html
+OLD_FILES+=usr/share/doc/ntp/driver37.html
+OLD_FILES+=usr/share/doc/ntp/driver4.html
+OLD_FILES+=usr/share/doc/ntp/driver5.html
+OLD_FILES+=usr/share/doc/ntp/driver6.html
+OLD_FILES+=usr/share/doc/ntp/driver7.html
+OLD_FILES+=usr/share/doc/ntp/driver8.html
+OLD_FILES+=usr/share/doc/ntp/driver9.html
+OLD_FILES+=usr/share/doc/ntp/extern.html
+OLD_FILES+=usr/share/doc/ntp/hints.html
+OLD_FILES+=usr/share/doc/ntp/howto.html
+OLD_FILES+=usr/share/doc/ntp/index.html
+OLD_FILES+=usr/share/doc/ntp/kern.html
+OLD_FILES+=usr/share/doc/ntp/ldisc.html
+OLD_FILES+=usr/share/doc/ntp/measure.html
+OLD_FILES+=usr/share/doc/ntp/miscopt.html
+OLD_FILES+=usr/share/doc/ntp/monopt.html
+OLD_FILES+=usr/share/doc/ntp/mx4200data.html
+OLD_FILES+=usr/share/doc/ntp/notes.html
+OLD_FILES+=usr/share/doc/ntp/ntpd.html
+OLD_FILES+=usr/share/doc/ntp/ntpdate.html
+OLD_FILES+=usr/share/doc/ntp/ntpdc.html
+OLD_FILES+=usr/share/doc/ntp/ntpq.html
+OLD_FILES+=usr/share/doc/ntp/ntptime.html
+OLD_FILES+=usr/share/doc/ntp/ntptrace.html
+OLD_FILES+=usr/share/doc/ntp/parsedata.html
+OLD_FILES+=usr/share/doc/ntp/parsenew.html
+OLD_FILES+=usr/share/doc/ntp/patches.html
+OLD_FILES+=usr/share/doc/ntp/porting.html
+OLD_FILES+=usr/share/doc/ntp/pps.html
+OLD_FILES+=usr/share/doc/ntp/prefer.html
+OLD_FILES+=usr/share/doc/ntp/quick.html
+OLD_FILES+=usr/share/doc/ntp/rdebug.html
+OLD_FILES+=usr/share/doc/ntp/refclock.html
+OLD_FILES+=usr/share/doc/ntp/release.html
+OLD_FILES+=usr/share/doc/ntp/tickadj.html
+.endif
.if ${MK_ICONV} == no
OLD_FILES+=usr/bin/iconv
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278082 - head/tools/build/mk
Author: amdmi3 (ports committer) Date: Mon Feb 2 14:38:47 2015 New Revision: 278082 URL: https://svnweb.freebsd.org/changeset/base/278082 Log: - Remove more files when MK_GROFF == no MFC after:1 week Reviewed by: ngie Approved by: ngie Differential Revision:D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:37:45 2015(r278081) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:38:47 2015(r278082) @@ -1777,6 +1777,76 @@ OLD_FILES+=usr/bin/tfmtodit OLD_FILES+=usr/bin/troff OLD_FILES+=usr/bin/vgrind OLD_FILES+=usr/libexec/vfontedpr +OLD_FILES+=usr/share/dict/eign +OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz +OLD_FILES+=usr/share/doc/papers/bio.ascii.gz +OLD_FILES+=usr/share/doc/papers/contents.ascii.gz +OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz +OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz +OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz +OLD_FILES+=usr/share/doc/papers/jail.ascii.gz +OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz +OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz +OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz +OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz +OLD_FILES+=usr/share/doc/papers/releng.ascii.gz +OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz +OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz +OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz +OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/Title.ascii.gz +OLD_FILES+=usr/share/doc/psd/contents.ascii.gz +OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/Title.ascii.gz +OLD_FILES+=usr/share/doc/smm/contents.ascii.gz +OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz +OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/Title.ascii.gz +OLD_FILES+=usr/share/doc/usd/contents.ascii.gz OLD_FILES+=usr/share/groff_font/devX100-12/CB OLD_FILES+=usr/share/groff_font/devX100-12/CBI OLD_FILES+=usr/share/groff_font/devX100-12/CI ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278081 - head/sbin/ifconfig
Author: vsevolod (ports committer)
Date: Mon Feb 2 14:37:45 2015
New Revision: 278081
URL: https://svnweb.freebsd.org/changeset/base/278081
Log:
Style(9) fixes.
Approved by: bapt, ae
X-MFC-With: r278080
Modified:
head/sbin/ifconfig/af_inet6.c
head/sbin/ifconfig/ifconfig.c
Modified: head/sbin/ifconfig/af_inet6.c
==
--- head/sbin/ifconfig/af_inet6.c Mon Feb 2 13:03:04 2015
(r278080)
+++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 14:37:45 2015
(r278081)
@@ -58,8 +58,8 @@ static const char rcsid[] =
#include "ifconfig.h"
static struct in6_ifreq in6_ridreq;
-static struct in6_aliasreq in6_addreq =
- { .ifra_flags = 0,
+static struct in6_aliasreq in6_addreq =
+ { .ifra_flags = 0,
.ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } };
static int ip6lifetime;
@@ -284,20 +284,23 @@ in6_status(int s __unused, const struct
if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0)
printf("prefer_source ");
- in6_print_scope((uint8_t *)&((struct sockaddr_in6
*)(ifa->ifa_addr))->sin6_addr);
+ in6_print_scope((uint8_t *)&((struct sockaddr_in6 *)
+ (ifa->ifa_addr))->sin6_addr);
if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) {
printf("pltime ");
if (lifetime.ia6t_preferred) {
printf("%s ", lifetime.ia6t_preferred < now.tv_sec
- ? "0" : sec2str(lifetime.ia6t_preferred -
now.tv_sec));
+ ? "0" :
+ sec2str(lifetime.ia6t_preferred - now.tv_sec));
} else
printf("infty ");
printf("vltime ");
if (lifetime.ia6t_expire) {
printf("%s ", lifetime.ia6t_expire < now.tv_sec
- ? "0" : sec2str(lifetime.ia6t_expire -
now.tv_sec));
+ ? "0" :
+ sec2str(lifetime.ia6t_expire - now.tv_sec));
} else
printf("infty ");
}
@@ -372,25 +375,25 @@ in6_getaddr(const char *s, int which)
static int
prefix(void *val, int size)
{
-u_char *name = (u_char *)val;
-int byte, bit, plen = 0;
+ u_char *name = (u_char *)val;
+ int byte, bit, plen = 0;
-for (byte = 0; byte < size; byte++, plen += 8)
-if (name[byte] != 0xff)
-break;
+ for (byte = 0; byte < size; byte++, plen += 8)
+ if (name[byte] != 0xff)
+ break;
if (byte == size)
return (plen);
for (bit = 7; bit != 0; bit--, plen++)
-if (!(name[byte] & (1 << bit)))
-break;
-for (; bit != 0; bit--)
-if (name[byte] & (1 << bit))
-return(0);
-byte++;
-for (; byte < size; byte++)
-if (name[byte])
-return(0);
-return (plen);
+ if (!(name[byte] & (1 << bit)))
+ break;
+ for (; bit != 0; bit--)
+ if (name[byte] & (1 << bit))
+ return(0);
+ byte++;
+ for (; byte < size; byte++)
+ if (name[byte])
+ return(0);
+ return (plen);
}
static char *
@@ -534,7 +537,11 @@ in6_Lopt_cb(const char *optarg __unused)
{
ip6lifetime++; /* print IPv6 address lifetime */
}
-static struct option in6_Lopt = { .opt = "L", .opt_usage = "[-L]", .cb =
in6_Lopt_cb };
+static struct option in6_Lopt = {
+ .opt = "L",
+ .opt_usage = "[-L]",
+ .cb = in6_Lopt_cb
+};
static __constructor void
inet6_ctor(void)
Modified: head/sbin/ifconfig/ifconfig.c
==
--- head/sbin/ifconfig/ifconfig.c Mon Feb 2 13:03:04 2015
(r278080)
+++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 14:37:45 2015
(r278081)
@@ -151,12 +151,14 @@ usage(void)
exit(1);
}
+#define ORDERS_SIZE(x) sizeof(x) / sizeof(x[0])
+
static int
calcorders(struct ifaddrs *ifa, struct ifa_queue *q)
{
- unsigned int ord, af, ifa_ord;
struct ifaddrs *prev;
struct ifa_order_elt *cur;
+ unsigned int ord, af, ifa_ord;
prev = NULL;
cur = NULL;
@@ -164,7 +166,8 @@ calcorders(struct ifaddrs *ifa, struct i
ifa_ord = 0;
while (ifa != NULL) {
- if (prev == NULL || strcmp(ifa->ifa_name, prev->ifa_name) != 0)
{
+ if (prev == NULL ||
+ strcmp(ifa->ifa_name, prev->ifa_name) != 0) {
cur = calloc(1, sizeof(*cur));
if (cur == NULL)
@@ -179,12 +182,12 @@ calcorders(struct ifaddrs *ifa, struct i
svn commit: r278080 - head/sbin/ifconfig
Author: vsevolod (ports committer)
Date: Mon Feb 2 13:03:04 2015
New Revision: 278080
URL: https://svnweb.freebsd.org/changeset/base/278080
Log:
Reorganize the list of addresses associated with an interface and group them
based on the address family. This should help to recognize interfaces with
multiple AF (e.g. ipv4 and ipv6) with many aliases or additional addresses.
The
order of addresses inside a single group is strictly preserved.
Improve the scope_id output for AF_INET6 families, as the
current approach uses hexadecimal string that is basically the ID of an
interface, whilst this information is already depicted by getnameinfo(3) call.
Therefore, now ifconfig just prints the scope of address as it is defined in
2.4 of RFC 2373.
PR: 197270
Approved by: bapt
MFC after:2 weeks
Modified:
head/sbin/ifconfig/af_inet6.c
head/sbin/ifconfig/ifconfig.c
Modified: head/sbin/ifconfig/af_inet6.c
==
--- head/sbin/ifconfig/af_inet6.c Mon Feb 2 12:48:13 2015
(r278079)
+++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 13:03:04 2015
(r278080)
@@ -167,6 +167,33 @@ setip6eui64(const char *cmd, int dummy _
}
static void
+in6_print_scope(uint8_t *a)
+{
+ const char *sname = NULL;
+ uint16_t val;
+
+ val = (a[0] << 4) + ((a[1] & 0xc0) >> 4);
+
+ if ((val & 0xff0) == 0xff0)
+ sname = "Multicast";
+ else {
+ switch(val) {
+ case 0xfe8:
+ sname = "Link";
+ break;
+ case 0xfec:
+ sname = "Site";
+ break;
+ default:
+ sname = "Global";
+ break;
+ }
+ }
+
+ printf("scope: %s ", sname);
+}
+
+static void
in6_status(int s __unused, const struct ifaddrs *ifa)
{
struct sockaddr_in6 *sin, null_sin;
@@ -257,9 +284,7 @@ in6_status(int s __unused, const struct
if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0)
printf("prefer_source ");
- if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id)
- printf("scopeid 0x%x ",
- ((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id);
+ in6_print_scope((uint8_t *)&((struct sockaddr_in6
*)(ifa->ifa_addr))->sin6_addr);
if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) {
printf("pltime ");
Modified: head/sbin/ifconfig/ifconfig.c
==
--- head/sbin/ifconfig/ifconfig.c Mon Feb 2 12:48:13 2015
(r278079)
+++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 13:03:04 2015
(r278080)
@@ -47,6 +47,7 @@ static const char rcsid[] =
#include
#include
#include
+#include
#include
#include
@@ -110,6 +111,15 @@ static void af_other_status(int);
static struct option *opts = NULL;
+struct ifa_order_elt {
+ int if_order;
+ int af_orders[255];
+ struct ifaddrs *ifa;
+ TAILQ_ENTRY(ifa_order_elt) link;
+};
+
+TAILQ_HEAD(ifa_queue, ifa_order_elt);
+
void
opt_register(struct option *p)
{
@@ -141,16 +151,162 @@ usage(void)
exit(1);
}
+static int
+calcorders(struct ifaddrs *ifa, struct ifa_queue *q)
+{
+ unsigned int ord, af, ifa_ord;
+ struct ifaddrs *prev;
+ struct ifa_order_elt *cur;
+
+ prev = NULL;
+ cur = NULL;
+ ord = 0;
+ ifa_ord = 0;
+
+ while (ifa != NULL) {
+ if (prev == NULL || strcmp(ifa->ifa_name, prev->ifa_name) != 0)
{
+ cur = calloc(1, sizeof(*cur));
+
+ if (cur == NULL)
+ return (-1);
+
+ TAILQ_INSERT_TAIL(q, cur, link);
+ cur->if_order = ifa_ord ++;
+ cur->ifa = ifa;
+ ord = 0;
+ }
+
+ if (ifa->ifa_addr) {
+ af = ifa->ifa_addr->sa_family;
+
+ if (af < sizeof(cur->af_orders) /
sizeof(cur->af_orders[0]) &&
+ cur->af_orders[af] == 0)
+ cur->af_orders[af] = ++ord;
+ }
+ prev = ifa;
+ ifa = ifa->ifa_next;
+ }
+
+ return (0);
+}
+
+static int
+cmpifaddrs(struct ifaddrs *a, struct ifaddrs *b, struct ifa_queue *q)
+{
+ int ret;
+ unsigned int af1, af2;
+ struct ifa_order_elt *cur, *e1, *e2;
+
+ e1 = e2 = NULL;
+
+ ret = strcmp(a->ifa_name, b->ifa_name);
+ if (ret != 0) {
+ /* We need to find elements corresponding to these different
names */
+ TAILQ_FOREACH(cur, q, link) {
+
svn commit: r278074 - in head/sys: conf dev/usb
Author: hselasky
Date: Mon Feb 2 11:32:15 2015
New Revision: 278074
URL: https://svnweb.freebsd.org/changeset/base/278074
Log:
Optimise allocation of USB DMA structures. By default don't double map
allocations if only one element should be allocated per page
cache. Make one allocation per element compile time configurable. Fix
a comment while at it.
Suggested by: ian @
MFC after:1 week
Modified:
head/sys/conf/options
head/sys/dev/usb/usb_transfer.c
Modified: head/sys/conf/options
==
--- head/sys/conf/options Mon Feb 2 11:26:52 2015(r278073)
+++ head/sys/conf/options Mon Feb 2 11:32:15 2015(r278074)
@@ -651,6 +651,7 @@ USB_HOST_ALIGN opt_usb.h
USB_REQ_DEBUG opt_usb.h
USB_TEMPLATE opt_usb.h
USB_VERBOSEopt_usb.h
+USB_DMA_SINGLE_ALLOC opt_usb.h
USB_EHCI_BIG_ENDIAN_DESC opt_usb.h
U3G_DEBUG opt_u3g.h
UKBD_DFLT_KEYMAP opt_ukbd.h
Modified: head/sys/dev/usb/usb_transfer.c
==
--- head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:26:52 2015
(r278073)
+++ head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:32:15 2015
(r278074)
@@ -237,7 +237,11 @@ usbd_transfer_setup_sub_malloc(struct us
n_obj = 1;
} else {
/* compute number of objects per page */
+#ifdef USB_DMA_SINGLE_ALLOC
+ n_obj = 1;
+#else
n_obj = (USB_PAGE_SIZE / size);
+#endif
/*
* Compute number of DMA chunks, rounded up
* to nearest one:
@@ -273,15 +277,33 @@ usbd_transfer_setup_sub_malloc(struct us
&parm->curr_xfer->xroot->dma_parent_tag;
}
- if (ppc) {
- *ppc = parm->xfer_page_cache_ptr;
+ if (ppc != NULL) {
+ if (n_obj != 1)
+ *ppc = parm->xfer_page_cache_ptr;
+ else
+ *ppc = parm->dma_page_cache_ptr;
}
r = count; /* set remainder count */
z = n_obj * size; /* set allocation size */
pc = parm->xfer_page_cache_ptr;
pg = parm->dma_page_ptr;
- for (x = 0; x != n_dma_pc; x++) {
+ if (n_obj == 1) {
+ /*
+* Avoid mapping memory twice if only a single object
+* should be allocated per page cache:
+*/
+ for (x = 0; x != n_dma_pc; x++) {
+ if (usb_pc_alloc_mem(parm->dma_page_cache_ptr,
+ pg, z, align)) {
+ return (1); /* failure */
+ }
+ /* Make room for one DMA page cache and "n_dma_pg" pages */
+ parm->dma_page_cache_ptr++;
+ pg += n_dma_pg;
+ }
+ } else {
+ for (x = 0; x != n_dma_pc; x++) {
if (r < n_obj) {
/* compute last remainder */
@@ -294,7 +316,7 @@ usbd_transfer_setup_sub_malloc(struct us
}
/* Set beginning of current buffer */
buf = parm->dma_page_cache_ptr->buffer;
- /* Make room for one DMA page cache and one page */
+ /* Make room for one DMA page cache and "n_dma_pg" pages */
parm->dma_page_cache_ptr++;
pg += n_dma_pg;
@@ -314,6 +336,7 @@ usbd_transfer_setup_sub_malloc(struct us
}
mtx_unlock(pc->tag_parent->mtx);
}
+ }
}
parm->xfer_page_cache_ptr = pc;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278071 - in head/sys/dev/usb: . controller
Author: hselasky
Date: Mon Feb 2 11:06:41 2015
New Revision: 278071
URL: https://svnweb.freebsd.org/changeset/base/278071
Log:
Section 3.2.9 in the XHCI specification about control transfers says
that we should use a normal-TRB if there are more TRBs extending the
data-stage TRB. Add a dedicated state bit to the internal USB transfer
flags to handle this case.
Reported by: Kohji Okuno
MFC after:1 week
Modified:
head/sys/dev/usb/controller/xhci.c
head/sys/dev/usb/usb_core.h
head/sys/dev/usb/usb_transfer.c
Modified: head/sys/dev/usb/controller/xhci.c
==
--- head/sys/dev/usb/controller/xhci.c Mon Feb 2 10:31:35 2015
(r278070)
+++ head/sys/dev/usb/controller/xhci.c Mon Feb 2 11:06:41 2015
(r278071)
@@ -1866,6 +1866,15 @@ restart:
XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_DATA_STAGE);
if (temp->direction == UE_DIR_IN)
dword |= XHCI_TRB_3_DIR_IN |
XHCI_TRB_3_ISP_BIT;
+ /*
+* Section 3.2.9 in the XHCI
+* specification about control
+* transfers says that we should use a
+* normal-TRB if there are more TRBs
+* extending the data-stage
+* TRB. Update the "trb_type".
+*/
+ temp->trb_type = XHCI_TRB_TYPE_NORMAL;
break;
case XHCI_TRB_TYPE_STATUS_STAGE:
dword = XHCI_TRB_3_CHAIN_BIT |
XHCI_TRB_3_CYCLE_BIT |
@@ -2106,7 +2115,8 @@ xhci_setup_generic_chain(struct usb_xfer
mult = 1;
temp.isoc_delta = 0;
temp.isoc_frame = 0;
- temp.trb_type = XHCI_TRB_TYPE_DATA_STAGE;
+ temp.trb_type = xfer->flags_int.control_did_data ?
+ XHCI_TRB_TYPE_NORMAL : XHCI_TRB_TYPE_DATA_STAGE;
} else {
x = 0;
mult = 1;
Modified: head/sys/dev/usb/usb_core.h
==
--- head/sys/dev/usb/usb_core.h Mon Feb 2 10:31:35 2015(r278070)
+++ head/sys/dev/usb/usb_core.h Mon Feb 2 11:06:41 2015(r278071)
@@ -101,6 +101,7 @@ struct usb_xfer_flags_int {
* sent */
uint8_t control_act:1; /* set if control transfer is active */
uint8_t control_stall:1;/* set if control transfer should be
stalled */
+ uint8_t control_did_data:1; /* set if control DATA has been
transferred */
uint8_t short_frames_ok:1; /* filtered version */
uint8_t short_xfer_ok:1;/* filtered version */
Modified: head/sys/dev/usb/usb_transfer.c
==
--- head/sys/dev/usb/usb_transfer.c Mon Feb 2 10:31:35 2015
(r278070)
+++ head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:06:41 2015
(r278071)
@@ -1409,6 +1409,29 @@ usbd_control_transfer_init(struct usb_xf
}
/**
+ * usbd_control_transfer_did_data
+ *
+ * This function returns non-zero if a control endpoint has
+ * transferred the first DATA packet after the SETUP packet.
+ * Else it returns zero.
+ **/
+static uint8_t
+usbd_control_transfer_did_data(struct usb_xfer *xfer)
+{
+ struct usb_device_request req;
+
+ /* SETUP packet is not yet sent */
+ if (xfer->flags_int.control_hdr != 0)
+ return (0);
+
+ /* copy out the USB request header */
+ usbd_copy_out(xfer->frbuffers, 0, &req, sizeof(req));
+
+ /* compare remainder to the initial value */
+ return (xfer->flags_int.control_rem != UGETW(req.wLength));
+}
+
+/**
* usbd_setup_ctrl_transfer
*
* This function handles initialisation of control transfers. Control
@@ -1513,6 +1536,11 @@ usbd_setup_ctrl_transfer(struct usb_xfer
len = (xfer->sumlen - sizeof(struct usb_device_request));
}
+ /* update did data flag */
+
+ xfer->flags_int.control_did_data =
+ usbd_control_transfer_did_data(xfer);
+
/* check if there is a length mismatch */
if (len > xfer->flags_int.control_rem) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278070 - head/sbin
Author: ngie
Date: Mon Feb 2 10:31:35 2015
New Revision: 278070
URL: https://svnweb.freebsd.org/changeset/base/278070
Log:
Remove duplicate MK_ISCSI block and sort the conditional blocks so this error
won't crop up again in the future
Reported by: gjb
MFC after: 1 week
Modified:
head/sbin/Makefile
Modified: head/sbin/Makefile
==
--- head/sbin/Makefile Mon Feb 2 10:00:45 2015(r278069)
+++ head/sbin/Makefile Mon Feb 2 10:31:35 2015(r278070)
@@ -91,6 +91,11 @@ SUBDIR+= hastctl
SUBDIR+= hastd
.endif
+.if ${MK_INET6} != "no"
+SUBDIR+= ping6
+SUBDIR+= rtsol
+.endif
+
.if ${MK_IPFILTER} != "no"
SUBDIR+= ipf
.endif
@@ -114,15 +119,6 @@ SUBDIR+= pfctl
SUBDIR+= pflogd
.endif
-.if ${MK_INET6} != "no"
-SUBDIR+= ping6
-SUBDIR+= rtsol
-.endif
-
-.if ${MK_ISCSI} != "no"
-SUBDIR+= iscontrol
-.endif
-
.if ${MK_QUOTAS} != "no"
SUBDIR+= quotacheck
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r278061 - head/sys/arm/ti/am335x
Author: rpaulo Date: Mon Feb 2 08:01:10 2015 New Revision: 278061 URL: https://svnweb.freebsd.org/changeset/base/278061 Log: am335x_clk_pruss_activate(): use the L3F clock. The DISP DPLL clock is slower and was making the PRU programs slower on FreeBSD than on Linux. Submitted by: Manuel Stuehn MFC after:1 week Modified: head/sys/arm/ti/am335x/am335x_prcm.c Modified: head/sys/arm/ti/am335x/am335x_prcm.c == --- head/sys/arm/ti/am335x/am335x_prcm.cMon Feb 2 07:42:03 2015 (r278060) +++ head/sys/arm/ti/am335x/am335x_prcm.cMon Feb 2 08:01:10 2015 (r278061) @@ -502,7 +502,7 @@ am335x_clk_gpio_activate(struct ti_clock /* set *_CLKCTRL register MODULEMODE[1:0] to enable(2) */ /* set *_CLKCTRL register OPTFCLKEN_GPIO_1_G DBCLK[18] to FCLK_EN(1) */ prcm_write_4(clk_details->clkctrl_reg, 2 | (1 << 18)); - while ((prcm_read_4(clk_details->clkctrl_reg) & + while ((prcm_read_4(clk_details->clkctrl_reg) & (3 | (1 << 18) )) != (2 | (1 << 18))) DELAY(10); @@ -724,11 +724,11 @@ am335x_clk_lcdc_activate(struct ti_clock prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x4); /* Make sure it's in bypass mode */ - while (!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) + while (!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) & (1 << 8))) DELAY(10); - /* + /* * For now set frequency to 99*SYSFREQ/8 which is twice as * HDMI 1080p pixel clock (minimum LCDC freq divisor is 2) */ @@ -738,7 +738,7 @@ am335x_clk_lcdc_activate(struct ti_clock prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x7); int timeout = 1; - while ((!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) + while ((!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) & (1 << 0))) && timeout--) DELAY(10); @@ -786,9 +786,9 @@ am335x_clk_pruss_activate(struct ti_cloc while ((prcm_read_4(CM_PER_PRUSS_CLKSTCTRL) & (1<<6)) == 0) DELAY(10); - /* Select DISP DPLL as OCP clock */ - prcm_write_4(CLKSEL_PRUSS_OCP_CLK, 1); - while ((prcm_read_4(CLKSEL_PRUSS_OCP_CLK) & 0x3) != 1) + /* Select L3F as OCP clock */ + prcm_write_4(CLKSEL_PRUSS_OCP_CLK, 0); + while ((prcm_read_4(CLKSEL_PRUSS_OCP_CLK) & 0x3) != 0) DELAY(10); /* Clear the RESET bit */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
