Date: Mon, 19 Oct 2015 11:51:11 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r289573 - in projects/collation: . bin/dd bin/dd/tests bin/ps bin/sh/tests bin/test/tests cddl cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolar... Message-ID: <201510191151.t9JBpBiE069189@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Oct 19 11:51:10 2015 New Revision: 289573 URL: https://svnweb.freebsd.org/changeset/base/289573 Log: Merge from head Added: projects/collation/bin/dd/tests/ - copied from r289571, head/bin/dd/tests/ projects/collation/contrib/llvm/patches/patch-09-clang-r250657-openmp.diff - copied unchanged from r289571, head/contrib/llvm/patches/patch-09-clang-r250657-openmp.diff projects/collation/contrib/wpa/patches/openssl-0.9.8zf-tls-extensions.patch - copied unchanged from r289571, head/contrib/wpa/patches/openssl-0.9.8zf-tls-extensions.patch projects/collation/contrib/wpa/src/crypto/sha384-prf.c - copied unchanged from r289571, head/contrib/wpa/src/crypto/sha384-prf.c projects/collation/contrib/wpa/src/fst/ - copied from r289571, head/contrib/wpa/src/fst/ projects/collation/contrib/wpa/wpa_supplicant/eapol_test.py - copied unchanged from r289571, head/contrib/wpa/wpa_supplicant/eapol_test.py projects/collation/contrib/wpa/wpa_supplicant/p2p_supplicant_sd.c - copied unchanged from r289571, head/contrib/wpa/wpa_supplicant/p2p_supplicant_sd.c projects/collation/etc/ntp/ - copied from r289571, head/etc/ntp/ projects/collation/sbin/newfs_msdos/mkfs_msdos.c - copied unchanged from r289571, head/sbin/newfs_msdos/mkfs_msdos.c projects/collation/sbin/newfs_msdos/mkfs_msdos.h - copied unchanged from r289571, head/sbin/newfs_msdos/mkfs_msdos.h projects/collation/share/man/man9/bitset.9 - copied unchanged from r289571, head/share/man/man9/bitset.9 projects/collation/sys/arm/arm/intrng.c - copied unchanged from r289571, head/sys/arm/arm/intrng.c projects/collation/sys/arm/arm/pic_if.m - copied unchanged from r289571, head/sys/arm/arm/pic_if.m projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/edonr_zfs.c - copied unchanged from r289571, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/edonr_zfs.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/skein_zfs.c - copied unchanged from r289571, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/skein_zfs.c projects/collation/sys/dev/vnic/ - copied from r289571, head/sys/dev/vnic/ projects/collation/sys/mips/conf/ERL - copied unchanged from r289571, head/sys/mips/conf/ERL projects/collation/sys/netinet/tcp_pcap.c - copied unchanged from r289571, head/sys/netinet/tcp_pcap.c projects/collation/sys/netinet/tcp_pcap.h - copied unchanged from r289571, head/sys/netinet/tcp_pcap.h projects/collation/tests/sys/acl/ - copied from r289571, head/tests/sys/acl/ projects/collation/tests/sys/posixshm/ - copied from r289571, head/tests/sys/posixshm/ projects/collation/tests/sys/vfs/ - copied from r289571, head/tests/sys/vfs/ projects/collation/tools/build/options/WITHOUT_LLDB - copied unchanged from r289571, head/tools/build/options/WITHOUT_LLDB Deleted: projects/collation/contrib/wpa/src/crypto/crypto_cryptoapi.c projects/collation/contrib/wpa/src/crypto/tls_schannel.c projects/collation/gnu/usr.bin/cc/c++filt/ projects/collation/gnu/usr.bin/cc/collect2/ projects/collation/gnu/usr.bin/cc/protoize/ projects/collation/tools/regression/acltools/ projects/collation/tools/regression/posixshm/ projects/collation/tools/regression/vfs/ projects/collation/tools/test/posixshm/ Modified: projects/collation/Makefile projects/collation/Makefile.inc1 projects/collation/ObsoleteFiles.inc projects/collation/UPDATING projects/collation/bin/dd/Makefile projects/collation/bin/ps/Makefile projects/collation/bin/sh/tests/Makefile projects/collation/bin/test/tests/legacy_test.sh projects/collation/cddl/Makefile projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/collation/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/collation/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c projects/collation/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/collation/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/collation/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/collation/cddl/lib/libzfs/Makefile projects/collation/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/collation/contrib/netbsd-tests/bin/dd/t_dd.sh projects/collation/contrib/unbound/doc/unbound.conf.5.in projects/collation/contrib/wpa/hostapd/ChangeLog projects/collation/contrib/wpa/hostapd/config_file.c projects/collation/contrib/wpa/hostapd/config_file.h projects/collation/contrib/wpa/hostapd/ctrl_iface.c projects/collation/contrib/wpa/hostapd/defconfig projects/collation/contrib/wpa/hostapd/hlr_auc_gw.c projects/collation/contrib/wpa/hostapd/hlr_auc_gw.milenage_db projects/collation/contrib/wpa/hostapd/hostapd.conf projects/collation/contrib/wpa/hostapd/hostapd_cli.c projects/collation/contrib/wpa/hostapd/main.c projects/collation/contrib/wpa/hs20/client/Makefile projects/collation/contrib/wpa/hs20/client/osu_client.c projects/collation/contrib/wpa/hs20/client/spp_client.c projects/collation/contrib/wpa/src/ap/accounting.c projects/collation/contrib/wpa/src/ap/acs.c projects/collation/contrib/wpa/src/ap/ap_config.c projects/collation/contrib/wpa/src/ap/ap_config.h projects/collation/contrib/wpa/src/ap/ap_drv_ops.c projects/collation/contrib/wpa/src/ap/ap_drv_ops.h projects/collation/contrib/wpa/src/ap/ap_list.c projects/collation/contrib/wpa/src/ap/ap_list.h projects/collation/contrib/wpa/src/ap/authsrv.c projects/collation/contrib/wpa/src/ap/beacon.c projects/collation/contrib/wpa/src/ap/beacon.h projects/collation/contrib/wpa/src/ap/ctrl_iface_ap.c projects/collation/contrib/wpa/src/ap/dfs.c projects/collation/contrib/wpa/src/ap/drv_callbacks.c projects/collation/contrib/wpa/src/ap/eap_user_db.c projects/collation/contrib/wpa/src/ap/hostapd.c projects/collation/contrib/wpa/src/ap/hostapd.h projects/collation/contrib/wpa/src/ap/hw_features.c projects/collation/contrib/wpa/src/ap/hw_features.h projects/collation/contrib/wpa/src/ap/ieee802_11.c projects/collation/contrib/wpa/src/ap/ieee802_11.h projects/collation/contrib/wpa/src/ap/ieee802_11_auth.c projects/collation/contrib/wpa/src/ap/ieee802_11_auth.h projects/collation/contrib/wpa/src/ap/ieee802_11_ht.c projects/collation/contrib/wpa/src/ap/ieee802_11_vht.c projects/collation/contrib/wpa/src/ap/ieee802_1x.c projects/collation/contrib/wpa/src/ap/ieee802_1x.h projects/collation/contrib/wpa/src/ap/ndisc_snoop.c projects/collation/contrib/wpa/src/ap/sta_info.c projects/collation/contrib/wpa/src/ap/sta_info.h projects/collation/contrib/wpa/src/ap/utils.c projects/collation/contrib/wpa/src/ap/vlan_init.c projects/collation/contrib/wpa/src/ap/vlan_init.h projects/collation/contrib/wpa/src/ap/vlan_util.c projects/collation/contrib/wpa/src/ap/wmm.c projects/collation/contrib/wpa/src/ap/wpa_auth.c projects/collation/contrib/wpa/src/ap/wpa_auth.h projects/collation/contrib/wpa/src/ap/wpa_auth_ft.c projects/collation/contrib/wpa/src/ap/wpa_auth_glue.c projects/collation/contrib/wpa/src/ap/wpa_auth_i.h projects/collation/contrib/wpa/src/ap/wpa_auth_ie.c projects/collation/contrib/wpa/src/ap/wps_hostapd.c projects/collation/contrib/wpa/src/ap/x_snoop.c projects/collation/contrib/wpa/src/common/common_module_tests.c projects/collation/contrib/wpa/src/common/defs.h projects/collation/contrib/wpa/src/common/hw_features_common.c projects/collation/contrib/wpa/src/common/hw_features_common.h projects/collation/contrib/wpa/src/common/ieee802_11_common.c projects/collation/contrib/wpa/src/common/ieee802_11_common.h projects/collation/contrib/wpa/src/common/ieee802_11_defs.h projects/collation/contrib/wpa/src/common/privsep_commands.h projects/collation/contrib/wpa/src/common/qca-vendor.h projects/collation/contrib/wpa/src/common/sae.c projects/collation/contrib/wpa/src/common/sae.h projects/collation/contrib/wpa/src/common/version.h projects/collation/contrib/wpa/src/common/wpa_common.c projects/collation/contrib/wpa/src/common/wpa_common.h projects/collation/contrib/wpa/src/common/wpa_ctrl.c projects/collation/contrib/wpa/src/common/wpa_ctrl.h projects/collation/contrib/wpa/src/crypto/crypto.h projects/collation/contrib/wpa/src/crypto/crypto_module_tests.c projects/collation/contrib/wpa/src/crypto/crypto_openssl.c projects/collation/contrib/wpa/src/crypto/dh_groups.c projects/collation/contrib/wpa/src/crypto/fips_prf_openssl.c projects/collation/contrib/wpa/src/crypto/ms_funcs.c projects/collation/contrib/wpa/src/crypto/ms_funcs.h projects/collation/contrib/wpa/src/crypto/random.c projects/collation/contrib/wpa/src/crypto/sha1-tlsprf.c projects/collation/contrib/wpa/src/crypto/sha1-tprf.c projects/collation/contrib/wpa/src/crypto/sha256-kdf.c projects/collation/contrib/wpa/src/crypto/sha384.h projects/collation/contrib/wpa/src/crypto/tls.h projects/collation/contrib/wpa/src/crypto/tls_gnutls.c projects/collation/contrib/wpa/src/crypto/tls_internal.c projects/collation/contrib/wpa/src/crypto/tls_none.c projects/collation/contrib/wpa/src/crypto/tls_openssl.c projects/collation/contrib/wpa/src/drivers/driver.h projects/collation/contrib/wpa/src/drivers/driver_bsd.c projects/collation/contrib/wpa/src/drivers/driver_ndis.c projects/collation/contrib/wpa/src/drivers/driver_nl80211.h projects/collation/contrib/wpa/src/drivers/driver_nl80211_android.c projects/collation/contrib/wpa/src/drivers/driver_nl80211_capa.c projects/collation/contrib/wpa/src/drivers/driver_nl80211_event.c projects/collation/contrib/wpa/src/drivers/driver_nl80211_scan.c projects/collation/contrib/wpa/src/drivers/driver_privsep.c projects/collation/contrib/wpa/src/drivers/drivers.c projects/collation/contrib/wpa/src/eap_common/eap_common.c projects/collation/contrib/wpa/src/eap_common/eap_fast_common.c projects/collation/contrib/wpa/src/eap_common/eap_pwd_common.c projects/collation/contrib/wpa/src/eap_common/eap_pwd_common.h projects/collation/contrib/wpa/src/eap_common/eap_sake_common.c projects/collation/contrib/wpa/src/eap_common/ikev2_common.c projects/collation/contrib/wpa/src/eap_peer/eap.c projects/collation/contrib/wpa/src/eap_peer/eap.h projects/collation/contrib/wpa/src/eap_peer/eap_aka.c projects/collation/contrib/wpa/src/eap_peer/eap_eke.c projects/collation/contrib/wpa/src/eap_peer/eap_fast.c projects/collation/contrib/wpa/src/eap_peer/eap_gpsk.c projects/collation/contrib/wpa/src/eap_peer/eap_i.h projects/collation/contrib/wpa/src/eap_peer/eap_mschapv2.c projects/collation/contrib/wpa/src/eap_peer/eap_pax.c projects/collation/contrib/wpa/src/eap_peer/eap_peap.c projects/collation/contrib/wpa/src/eap_peer/eap_pwd.c projects/collation/contrib/wpa/src/eap_peer/eap_sake.c projects/collation/contrib/wpa/src/eap_peer/eap_sim.c projects/collation/contrib/wpa/src/eap_peer/eap_tls.c projects/collation/contrib/wpa/src/eap_peer/eap_tls_common.c projects/collation/contrib/wpa/src/eap_peer/eap_tls_common.h projects/collation/contrib/wpa/src/eap_peer/eap_ttls.c projects/collation/contrib/wpa/src/eap_peer/eap_wsc.c projects/collation/contrib/wpa/src/eap_server/eap.h projects/collation/contrib/wpa/src/eap_server/eap_i.h projects/collation/contrib/wpa/src/eap_server/eap_server.c projects/collation/contrib/wpa/src/eap_server/eap_server_eke.c projects/collation/contrib/wpa/src/eap_server/eap_server_fast.c projects/collation/contrib/wpa/src/eap_server/eap_server_mschapv2.c projects/collation/contrib/wpa/src/eap_server/eap_server_peap.c projects/collation/contrib/wpa/src/eap_server/eap_server_pwd.c projects/collation/contrib/wpa/src/eap_server/eap_server_tls.c projects/collation/contrib/wpa/src/eap_server/eap_server_tls_common.c projects/collation/contrib/wpa/src/eap_server/eap_server_ttls.c projects/collation/contrib/wpa/src/eap_server/eap_tls_common.h projects/collation/contrib/wpa/src/eapol_auth/eapol_auth_sm.c projects/collation/contrib/wpa/src/eapol_auth/eapol_auth_sm.h projects/collation/contrib/wpa/src/eapol_supp/eapol_supp_sm.c projects/collation/contrib/wpa/src/p2p/p2p.c projects/collation/contrib/wpa/src/p2p/p2p.h projects/collation/contrib/wpa/src/p2p/p2p_build.c projects/collation/contrib/wpa/src/p2p/p2p_dev_disc.c projects/collation/contrib/wpa/src/p2p/p2p_go_neg.c projects/collation/contrib/wpa/src/p2p/p2p_group.c projects/collation/contrib/wpa/src/p2p/p2p_i.h projects/collation/contrib/wpa/src/p2p/p2p_invitation.c projects/collation/contrib/wpa/src/p2p/p2p_parse.c projects/collation/contrib/wpa/src/p2p/p2p_pd.c projects/collation/contrib/wpa/src/p2p/p2p_utils.c projects/collation/contrib/wpa/src/radius/radius.c projects/collation/contrib/wpa/src/radius/radius_das.c projects/collation/contrib/wpa/src/radius/radius_server.c projects/collation/contrib/wpa/src/radius/radius_server.h projects/collation/contrib/wpa/src/rsn_supp/tdls.c projects/collation/contrib/wpa/src/rsn_supp/wpa.c projects/collation/contrib/wpa/src/rsn_supp/wpa_ft.c projects/collation/contrib/wpa/src/rsn_supp/wpa_ie.c projects/collation/contrib/wpa/src/rsn_supp/wpa_ie.h projects/collation/contrib/wpa/src/tls/libtommath.c projects/collation/contrib/wpa/src/tls/tlsv1_client.c projects/collation/contrib/wpa/src/tls/tlsv1_client.h projects/collation/contrib/wpa/src/tls/tlsv1_server.c projects/collation/contrib/wpa/src/tls/tlsv1_server.h projects/collation/contrib/wpa/src/tls/x509v3.c projects/collation/contrib/wpa/src/utils/browser-wpadebug.c projects/collation/contrib/wpa/src/utils/common.c projects/collation/contrib/wpa/src/utils/common.h projects/collation/contrib/wpa/src/utils/eloop.c projects/collation/contrib/wpa/src/utils/http_curl.c projects/collation/contrib/wpa/src/utils/includes.h projects/collation/contrib/wpa/src/utils/os.h projects/collation/contrib/wpa/src/utils/os_internal.c projects/collation/contrib/wpa/src/utils/os_none.c projects/collation/contrib/wpa/src/utils/os_unix.c projects/collation/contrib/wpa/src/utils/os_win32.c projects/collation/contrib/wpa/src/utils/radiotap.c projects/collation/contrib/wpa/src/utils/utils_module_tests.c projects/collation/contrib/wpa/src/utils/wpa_debug.c projects/collation/contrib/wpa/src/utils/wpa_debug.h projects/collation/contrib/wpa/src/utils/wpabuf.c projects/collation/contrib/wpa/src/wps/http_client.c projects/collation/contrib/wpa/src/wps/http_server.c projects/collation/contrib/wpa/src/wps/httpread.c projects/collation/contrib/wpa/src/wps/ndef.c projects/collation/contrib/wpa/src/wps/wps.c projects/collation/contrib/wpa/src/wps/wps.h projects/collation/contrib/wpa/src/wps/wps_attr_parse.c projects/collation/contrib/wpa/src/wps/wps_attr_parse.h projects/collation/contrib/wpa/src/wps/wps_common.c projects/collation/contrib/wpa/src/wps/wps_defs.h projects/collation/contrib/wpa/src/wps/wps_enrollee.c projects/collation/contrib/wpa/src/wps/wps_er.c projects/collation/contrib/wpa/src/wps/wps_er_ssdp.c projects/collation/contrib/wpa/src/wps/wps_module_tests.c projects/collation/contrib/wpa/src/wps/wps_registrar.c projects/collation/contrib/wpa/src/wps/wps_upnp.c projects/collation/contrib/wpa/src/wps/wps_upnp_ap.c projects/collation/contrib/wpa/src/wps/wps_upnp_event.c projects/collation/contrib/wpa/src/wps/wps_upnp_ssdp.c projects/collation/contrib/wpa/src/wps/wps_upnp_web.c projects/collation/contrib/wpa/src/wps/wps_validate.c projects/collation/contrib/wpa/wpa_supplicant/ChangeLog projects/collation/contrib/wpa/wpa_supplicant/ap.c projects/collation/contrib/wpa/wpa_supplicant/ap.h projects/collation/contrib/wpa/wpa_supplicant/bss.c projects/collation/contrib/wpa/wpa_supplicant/bss.h projects/collation/contrib/wpa/wpa_supplicant/config.c projects/collation/contrib/wpa/wpa_supplicant/config.h projects/collation/contrib/wpa/wpa_supplicant/config_file.c projects/collation/contrib/wpa/wpa_supplicant/config_ssid.h projects/collation/contrib/wpa/wpa_supplicant/ctrl_iface.c projects/collation/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c projects/collation/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c projects/collation/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new.c projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new.h projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.c projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.h projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_wps.c projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_new_introspect.c projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_old.c projects/collation/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.c projects/collation/contrib/wpa/wpa_supplicant/defconfig projects/collation/contrib/wpa/wpa_supplicant/driver_i.h projects/collation/contrib/wpa/wpa_supplicant/eapol_test.c projects/collation/contrib/wpa/wpa_supplicant/events.c projects/collation/contrib/wpa/wpa_supplicant/hs20_supplicant.c projects/collation/contrib/wpa/wpa_supplicant/ibss_rsn.c projects/collation/contrib/wpa/wpa_supplicant/interworking.c projects/collation/contrib/wpa/wpa_supplicant/main.c projects/collation/contrib/wpa/wpa_supplicant/mesh.c projects/collation/contrib/wpa/wpa_supplicant/mesh_mpm.c projects/collation/contrib/wpa/wpa_supplicant/mesh_rsn.c projects/collation/contrib/wpa/wpa_supplicant/notify.c projects/collation/contrib/wpa/wpa_supplicant/notify.h projects/collation/contrib/wpa/wpa_supplicant/p2p_supplicant.c projects/collation/contrib/wpa/wpa_supplicant/p2p_supplicant.h projects/collation/contrib/wpa/wpa_supplicant/preauth_test.c projects/collation/contrib/wpa/wpa_supplicant/scan.c projects/collation/contrib/wpa/wpa_supplicant/sme.c projects/collation/contrib/wpa/wpa_supplicant/wpa_cli.c projects/collation/contrib/wpa/wpa_supplicant/wpa_priv.c projects/collation/contrib/wpa/wpa_supplicant/wpa_supplicant.c projects/collation/contrib/wpa/wpa_supplicant/wpa_supplicant.conf projects/collation/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h projects/collation/contrib/wpa/wpa_supplicant/wpas_glue.c projects/collation/contrib/wpa/wpa_supplicant/wpas_glue.h projects/collation/contrib/wpa/wpa_supplicant/wps_supplicant.c projects/collation/contrib/wpa/wpa_supplicant/wps_supplicant.h projects/collation/etc/Makefile projects/collation/etc/mtree/BSD.debug.dist projects/collation/etc/mtree/BSD.tests.dist projects/collation/etc/mtree/BSD.usr.dist projects/collation/etc/mtree/BSD.var.dist projects/collation/etc/ntp.conf projects/collation/etc/periodic/Makefile projects/collation/gnu/Makefile projects/collation/gnu/lib/Makefile projects/collation/gnu/usr.bin/binutils/ld/genscripts.sh projects/collation/gnu/usr.bin/cc/Makefile projects/collation/gnu/usr.bin/groff/Makefile projects/collation/gnu/usr.bin/rcs/Makefile projects/collation/include/Makefile projects/collation/include/resolv.h projects/collation/lib/Makefile projects/collation/lib/clang/clang.build.mk projects/collation/lib/clang/include/clang/Config/config.h projects/collation/lib/clang/include/llvm/Config/config.h projects/collation/lib/libc/resolv/res_init.c projects/collation/lib/libc/resolv/res_state.c projects/collation/lib/libc/string/ffs.3 projects/collation/lib/libcam/camlib.c projects/collation/lib/libfetch/file.c projects/collation/lib/libfetch/http.c projects/collation/lib/libiconv_modules/Makefile projects/collation/lib/libpmc/libpmc.c projects/collation/lib/libxo/Makefile projects/collation/lib/libxo/tests/Makefile projects/collation/lib/libxo/tests/encoder/Makefile projects/collation/libexec/rtld-elf/map_object.c projects/collation/release/Makefile projects/collation/release/Makefile.mirrors projects/collation/release/Makefile.vm projects/collation/release/release.sh projects/collation/rescue/rescue/Makefile projects/collation/sbin/mount/mount.conf.8 projects/collation/sbin/newfs_msdos/Makefile projects/collation/sbin/newfs_msdos/newfs_msdos.c projects/collation/sbin/savecore/Makefile projects/collation/secure/Makefile projects/collation/secure/libexec/Makefile projects/collation/secure/usr.bin/Makefile projects/collation/secure/usr.sbin/Makefile projects/collation/share/Makefile projects/collation/share/doc/Makefile projects/collation/share/doc/legal/Makefile projects/collation/share/doc/legal/intel_ipw/Makefile projects/collation/share/doc/legal/intel_iwi/Makefile projects/collation/share/doc/legal/intel_iwn/Makefile projects/collation/share/doc/legal/intel_wpi/Makefile projects/collation/share/doc/legal/realtek/Makefile projects/collation/share/doc/papers/Makefile projects/collation/share/doc/psd/Makefile projects/collation/share/doc/smm/Makefile projects/collation/share/doc/usd/Makefile projects/collation/share/examples/Makefile projects/collation/share/i18n/Makefile projects/collation/share/i18n/csmapper/Makefile projects/collation/share/i18n/esdb/Makefile projects/collation/share/man/Makefile projects/collation/share/man/man3/bitstring.3 projects/collation/share/man/man4/ipw.4 projects/collation/share/man/man4/ipwfw.4 projects/collation/share/man/man4/iwi.4 projects/collation/share/man/man4/iwifw.4 projects/collation/share/man/man4/rsu.4 projects/collation/share/man/man4/urtwn.4 projects/collation/share/man/man4/urtwnfw.4 projects/collation/share/man/man4/wpi.4 projects/collation/share/man/man5/resolver.5 projects/collation/share/man/man9/Makefile projects/collation/share/mk/bsd.confs.mk projects/collation/share/mk/bsd.doc.mk projects/collation/share/mk/bsd.files.mk projects/collation/share/mk/bsd.incs.mk projects/collation/share/mk/bsd.info.mk projects/collation/share/mk/bsd.lib.mk projects/collation/share/mk/bsd.man.mk projects/collation/share/mk/bsd.prog.mk projects/collation/share/mk/bsd.progs.mk projects/collation/share/mk/bsd.subdir.mk projects/collation/share/mk/bsd.sys.mk projects/collation/share/mk/src.libnames.mk projects/collation/share/mk/sys.mk projects/collation/share/syscons/Makefile projects/collation/share/zoneinfo/Makefile projects/collation/sys/arm/allwinner/a20/a20_mp.c projects/collation/sys/arm/altera/socfpga/socfpga_mp.c projects/collation/sys/arm/amlogic/aml8726/aml8726_mp.c projects/collation/sys/arm/annapurna/alpine/alpine_machdep_mp.c projects/collation/sys/arm/annapurna/alpine/common.c projects/collation/sys/arm/arm/bcopyinout.S projects/collation/sys/arm/arm/bcopyinout_xscale.S projects/collation/sys/arm/arm/copystr.S projects/collation/sys/arm/arm/fusu.S projects/collation/sys/arm/arm/genassym.c projects/collation/sys/arm/arm/gic.c projects/collation/sys/arm/arm/mp_machdep.c projects/collation/sys/arm/arm/nexus.c projects/collation/sys/arm/conf/BEAGLEBONE projects/collation/sys/arm/conf/IMX6 projects/collation/sys/arm/conf/PANDABOARD projects/collation/sys/arm/freescale/imx/imx6_machdep.c projects/collation/sys/arm/freescale/imx/imx6_mp.c projects/collation/sys/arm/freescale/imx/imx_gpio.c projects/collation/sys/arm/include/fdt.h projects/collation/sys/arm/include/intr.h projects/collation/sys/arm/include/param.h projects/collation/sys/arm/include/smp.h projects/collation/sys/arm/mv/std-pj4b.mv projects/collation/sys/arm/qemu/virt_common.c projects/collation/sys/arm/qemu/virt_mp.c projects/collation/sys/arm/rockchip/rk30xx_mp.c projects/collation/sys/arm/samsung/exynos/exynos5_mp.c projects/collation/sys/arm/ti/omap4/omap4_mp.c projects/collation/sys/arm/ti/omap4/std.omap4 projects/collation/sys/arm/ti/ti_common.c projects/collation/sys/arm/xilinx/zy7_mp.c projects/collation/sys/arm64/arm64/copyinout.S projects/collation/sys/arm64/arm64/genassym.c projects/collation/sys/arm64/arm64/locore.S projects/collation/sys/arm64/arm64/machdep.c projects/collation/sys/arm64/arm64/support.S projects/collation/sys/arm64/conf/GENERIC projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfs_fletcher.h projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zrlock.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/collation/sys/conf/NOTES projects/collation/sys/conf/dtb.mk projects/collation/sys/conf/files projects/collation/sys/conf/files.arm projects/collation/sys/conf/files.arm64 projects/collation/sys/conf/kern.post.mk projects/collation/sys/conf/kmod.mk projects/collation/sys/conf/options projects/collation/sys/conf/options.arm projects/collation/sys/contrib/ipfilter/netinet/ip_state.c projects/collation/sys/dev/cxgbe/iw_cxgbe/cm.c projects/collation/sys/dev/cxgbe/t4_main.c projects/collation/sys/dev/drm2/i915/intel_dp.c projects/collation/sys/dev/drm2/i915/intel_iic.c projects/collation/sys/dev/hwpmc/pmc_events.h projects/collation/sys/dev/mpr/mpr.c projects/collation/sys/dev/mpr/mprvar.h projects/collation/sys/dev/mps/mps.c projects/collation/sys/dev/mps/mpsvar.h projects/collation/sys/dev/ntb/if_ntb/if_ntb.c projects/collation/sys/dev/ntb/ntb_hw/ntb_hw.c projects/collation/sys/dev/ntb/ntb_hw/ntb_hw.h projects/collation/sys/dev/ntb/ntb_hw/ntb_regs.h projects/collation/sys/dev/otus/if_otus.c projects/collation/sys/dev/pci/pci.c projects/collation/sys/dev/pci/pci_pci.c projects/collation/sys/dev/pci/pcib_if.m projects/collation/sys/dev/sdhci/sdhci.c projects/collation/sys/dev/sdhci/sdhci.h projects/collation/sys/dev/sdhci/sdhci_pci.c projects/collation/sys/dev/usb/controller/xhci_pci.c projects/collation/sys/kern/imgact_elf.c projects/collation/sys/kern/kern_fork.c projects/collation/sys/kern/uipc_mbuf.c projects/collation/sys/kern/vfs_bio.c projects/collation/sys/kern/vfs_mountroot.c projects/collation/sys/mips/atheros/if_arge.c projects/collation/sys/mips/atheros/if_argevar.h projects/collation/sys/mips/conf/AR933X_BASE projects/collation/sys/mips/conf/TP-MR3020 projects/collation/sys/mips/conf/TP-MR3020.hints projects/collation/sys/modules/cloudabi64/Makefile projects/collation/sys/modules/cxgbe/if_cxgbe/Makefile projects/collation/sys/net/if_lagg.c projects/collation/sys/net/pfvar.h projects/collation/sys/net/route.c projects/collation/sys/net/route.h projects/collation/sys/netinet/in.c projects/collation/sys/netinet/in_rmx.c projects/collation/sys/netinet/in_var.h projects/collation/sys/netinet/sctp_auth.c projects/collation/sys/netinet/sctp_input.c projects/collation/sys/netinet/sctp_output.c projects/collation/sys/netinet/sctp_pcb.c projects/collation/sys/netinet/sctp_usrreq.c projects/collation/sys/netinet/sctputil.c projects/collation/sys/netinet/tcp.h projects/collation/sys/netinet/tcp_input.c projects/collation/sys/netinet/tcp_output.c projects/collation/sys/netinet/tcp_subr.c projects/collation/sys/netinet/tcp_timer.c projects/collation/sys/netinet/tcp_usrreq.c projects/collation/sys/netinet/tcp_var.h projects/collation/sys/netpfil/pf/pf.c projects/collation/sys/netpfil/pf/pf_ioctl.c projects/collation/sys/netpfil/pf/pf_norm.c projects/collation/sys/ofed/include/linux/dma-mapping.h projects/collation/sys/ofed/include/linux/math64.h projects/collation/sys/ofed/include/linux/moduleparam.h projects/collation/sys/ofed/include/linux/scatterlist.h projects/collation/sys/ofed/include/linux/sched.h projects/collation/sys/ofed/include/linux/uaccess.h projects/collation/sys/ofed/include/linux/wait.h projects/collation/sys/ofed/include/linux/workqueue.h projects/collation/sys/sys/mbuf.h projects/collation/sys/sys/param.h projects/collation/sys/tools/fw_stub.awk projects/collation/sys/ufs/ffs/ffs_alloc.c projects/collation/sys/vm/vm_init.c projects/collation/sys/vm/vm_pageout.c projects/collation/sys/x86/x86/busdma_bounce.c projects/collation/tests/Makefile projects/collation/tests/sys/Makefile projects/collation/tests/sys/pjdfstest/Makefile projects/collation/tests/sys/pjdfstest/tests/Makefile projects/collation/tools/regression/lib/msun/test-fenv.c projects/collation/usr.bin/iscsictl/Makefile projects/collation/usr.bin/iscsictl/iscsictl.8 projects/collation/usr.bin/iscsictl/iscsictl.c projects/collation/usr.bin/ldd/ldd.c projects/collation/usr.bin/mkimg/ebr.c projects/collation/usr.bin/mkimg/mbr.c projects/collation/usr.bin/mkimg/scheme.c projects/collation/usr.bin/mkimg/scheme.h projects/collation/usr.bin/wc/Makefile projects/collation/usr.bin/xo/Makefile projects/collation/usr.sbin/freebsd-update/freebsd-update.sh projects/collation/usr.sbin/tzsetup/tzsetup.c projects/collation/usr.sbin/wpa/Makefile.crypto projects/collation/usr.sbin/wpa/hostapd/Makefile projects/collation/usr.sbin/wpa/wpa_supplicant/Makefile Directory Properties: projects/collation/ (props changed) projects/collation/cddl/ (props changed) projects/collation/cddl/contrib/opensolaris/ (props changed) projects/collation/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/collation/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/collation/contrib/llvm/ (props changed) projects/collation/contrib/llvm/tools/clang/ (props changed) projects/collation/contrib/unbound/ (props changed) projects/collation/contrib/wpa/ (props changed) projects/collation/gnu/lib/ (props changed) projects/collation/gnu/usr.bin/binutils/ (props changed) projects/collation/include/ (props changed) projects/collation/lib/libc/ (props changed) projects/collation/sbin/ (props changed) projects/collation/share/ (props changed) projects/collation/share/man/man4/ (props changed) projects/collation/share/zoneinfo/ (props changed) projects/collation/sys/ (props changed) projects/collation/sys/cddl/contrib/opensolaris/ (props changed) projects/collation/sys/conf/ (props changed) projects/collation/sys/contrib/ipfilter/ (props changed) projects/collation/usr.bin/mkimg/ (props changed) Modified: projects/collation/Makefile ============================================================================== --- projects/collation/Makefile Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/Makefile Mon Oct 19 11:51:10 2015 (r289573) @@ -243,14 +243,8 @@ cleanworld: # Handle the user-driven targets, using the source relative mk files. # -.if !(!empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n") -# skip this for -n to avoid changing previous behavior of -# 'make -n buildworld' etc. Using -n -n will run it. -${TGTS}: .MAKE tinderbox toolchains kernel-toolchains: .MAKE -.endif - -${TGTS}: +${TGTS}: .PHONY .MAKE ${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET} # The historic default "all" target creates files which may cause stale @@ -259,9 +253,9 @@ ${TGTS}: # if they want the historic behavior. .MAIN: _guard -_guard: +_guard: .PHONY @echo - @echo "Explicit target required (use \"all\" for historic behavior)" + @echo "Explicit target required. Likely \"${SUBDIR_OVERRIDE:Dall:Ubuildworld}\" is wanted. See build(7)." @echo @false Modified: projects/collation/Makefile.inc1 ============================================================================== --- projects/collation/Makefile.inc1 Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/Makefile.inc1 Mon Oct 19 11:51:10 2015 (r289573) @@ -50,16 +50,23 @@ .include <bsd.arch.inc.mk> .include <bsd.compiler.mk> -# We must do lib/ and libexec/ before bin/, because if installworld -# installs a new /bin/sh, the 'make' command will *immediately* -# use that new version. And the new (dynamically-linked) /bin/sh -# will expect to find appropriate libraries in /lib and /libexec. -# +# We must do lib/ and libexec/ before bin/ in case of a mid-install error to +# keep the users system reasonably usable. For static->dynamic root upgrades, +# we don't want to install a dynamic binary without rtld and the needed +# libraries. More commonly, for dynamic root, we don't want to install a +# binary that requires a newer library version that hasn't been installed yet. +# This ordering is not a guarantee though. The only guarantee of a working +# system here would require fine-grained ordering of all components based +# on their dependencies. SRCDIR?= ${.CURDIR} .if defined(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else SUBDIR= lib libexec +.if make(install*) +# Ensure libraries are installed before progressing. +SUBDIR+=.WAIT +.endif SUBDIR+=bin .if ${MK_CDDL} != "no" SUBDIR+=cddl @@ -85,10 +92,6 @@ SUBDIR+= tests .if ${MK_OFED} != "no" SUBDIR+=contrib/ofed .endif -# -# We must do etc/ last for install/distribute to work. -# -SUBDIR+=etc # Local directories are last, since it is nice to at least get the base # system rebuilt before you do them. @@ -112,6 +115,15 @@ SUBDIR+= ${_DIR} .endfor .endif +# We must do etc/ last as it hooks into building the man whatis file +# by calling 'makedb' in share/man. This is only relevant for +# install/distribute so they build the whatis file after every manpage is +# installed. +.if make(install*) +SUBDIR+=.WAIT +.endif +SUBDIR+=etc + .if defined(NOCLEAN) NO_CLEAN= ${NOCLEAN} .endif @@ -136,14 +148,17 @@ OSRELDATE!= awk '/^\#define[[:space:]]*_ .else OSRELDATE= 0 .endif +.export OSRELDATE .endif +# Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. .if !defined(VERSION) REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ ${SRCDIR}/sys/sys/param.h VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE} +.export VERSION .endif KNOWN_ARCHES?= aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 @@ -252,7 +267,6 @@ CROSSENV+= ${TARGET_CFLAGS} BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ - VERSION="${VERSION}" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile BSARGS= DESTDIR= \ @@ -289,8 +303,7 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE # kernel-tools stage KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${BPATH}:${PATH} \ - WORLDTMP=${WORLDTMP} \ - VERSION="${VERSION}" + WORLDTMP=${WORLDTMP} KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \ ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ DESTDIR= \ @@ -303,7 +316,6 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOB # world stage WMAKEENV= ${CROSSENV} \ _LDSCRIPTROOT= \ - VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} @@ -313,10 +325,6 @@ HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MT HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif -.if ${MK_CDDL} == "no" -WMAKEENV+= MK_CTF=no -.endif - .if defined(CROSS_TOOLCHAIN) LOCALBASE?= /usr/local .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" @@ -446,7 +454,6 @@ LIB32FLAGS+= --sysroot=${WORLDTMP} # Yes, the flags are redundant. LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ _LDSCRIPTROOT=${LIB32TMP} \ - VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ LIBDIR=/usr/lib32 \ @@ -557,6 +564,11 @@ _worldtmp: mkdir -p ${WORLDTMP}${TESTSBASE} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ -p ${WORLDTMP}${TESTSBASE} >/dev/null +.if ${MK_DEBUG_FILES} != "no" + mkdir -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ + -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} >/dev/null +.endif .endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null @@ -579,9 +591,9 @@ _cleanobj: @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} + ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR} .if defined(LIB32TMP) - ${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/} + ${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR} .endif .endif _obj: @@ -589,7 +601,7 @@ _obj: @echo "--------------------------------------------------------------" @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${WMAKE} par-obj + ${_+_}cd ${.CURDIR}; ${WMAKE} obj _build-tools: @echo @echo "--------------------------------------------------------------" @@ -608,7 +620,8 @@ _includes: @echo "--------------------------------------------------------------" @echo ">>> stage 4.1: building includes" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks par-includes + ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks buildincludes + ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks installincludes _libraries: @echo @echo "--------------------------------------------------------------" @@ -622,7 +635,7 @@ _depend: @echo "--------------------------------------------------------------" @echo ">>> stage 4.3: make dependencies" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${WMAKE} par-depend + ${_+_}cd ${.CURDIR}; ${WMAKE} depend everything: @echo @echo "--------------------------------------------------------------" @@ -731,7 +744,7 @@ buildworld_epilogue: # to quote multiword values. # buildenvvars: - @echo ${WMAKEENV:Q} + @echo ${WMAKEENV:Q} ${.MAKE.EXPORTED:@v@$v=\"${$v}\"@} .if ${.TARGETS:Mbuildenv} .if ${.MAKEFLAGS:M-j} @@ -815,7 +828,7 @@ _zoneinfo= zic tzsetup ITOOLS= [ awk cap_mkdb cat chflags chmod chown cmp cp \ date echo egrep find grep id install ${_install-info} \ - ln lockf make mkdir mtree mv pwd_mkdb \ + ln make mkdir mtree mv pwd_mkdb \ rm sed services_mkdb sh strip sysctl test true uname wc ${_zoneinfo} \ ${LOCAL_ITOOLS} @@ -892,6 +905,10 @@ distributeworld installworld: _installch -mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null +.if ${MK_DEBUG_FILES} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null +.endif .endif .if defined(NO_ROOT) ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \ @@ -1054,7 +1071,7 @@ INSTALLKERNEL= ${_kernel} .endif .endfor -buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE +buildkernel ${WMAKE_TGTS:N_worldtmp:Nbuild32} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY # # buildkernel @@ -1485,7 +1502,7 @@ build-tools: .MAKE # # kernel-tools: Build kernel-building tools # -kernel-tools: .MAKE +kernel-tools: mkdir -p ${MAKEOBJDIRPREFIX}/usr mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${MAKEOBJDIRPREFIX}/usr >/dev/null @@ -1566,7 +1583,6 @@ cross-tools: .MAKE NXBENV= MAKEOBJDIRPREFIX=${OBJTREE}/nxb \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ - VERSION="${VERSION}" \ PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin NXBMAKE= ${NXBENV} ${MAKE} \ TBLGEN=${OBJTREE}/nxb-bin/usr/bin/tblgen \ @@ -1585,7 +1601,7 @@ NXBMAKE= ${NXBENV} ${MAKE} \ # For non-clang enabled targets that are still using the in tree gcc # we must build a gperf binary for one instance of its Makefiles. On # clang-enabled systems, the gperf binary is obsolete. -native-xtools: .MAKE +native-xtools: .if ${MK_GCC_BOOTSTRAP} != "no" mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin ${_+_}@${ECHODIR} "===> ${_gperf} (obj,depend,all,install)"; \ @@ -1931,22 +1947,18 @@ _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} -.for __target in all clean cleandepend cleandir depend includes obj -.for entry in ${SUBDIR} -${entry}.${__target}__D: .PHONY .MAKE - ${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ - ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \ - edir=${entry}.${MACHINE_ARCH}; \ - cd ${.CURDIR}/$${edir}; \ - else \ - ${ECHODIR} "===> ${DIRPRFX}${entry} (${__target})"; \ - edir=${entry}; \ - cd ${.CURDIR}/$${edir}; \ - fi; \ - ${MAKE} ${__target} DIRPRFX=${DIRPRFX}$${edir}/ -.endfor -par-${__target}: ${SUBDIR:S/$/.${__target}__D/} -.endfor +# Enable SUBDIR_PARALLEL when not calling 'make all', unless called as +# 'par-all'. This is because it is unlikely that running 'make all' from +# the top-level, especially with a SUBDIR_OVERRIDE or LOCAL_DIRS set, +# will have a reliable build if SUBDIRs are built in parallel. This is +# safe for the world stage of buildworld though since it has already +# built libraries in a proper order and installed includes into WORLDTMP. +# Special handling is done for SUBDIR ordering for 'install*' to avoid +# trashing a system if it crashes mid-install. +par-all: all .PHONY +.if !make(all) +SUBDIR_PARALLEL= +.endif .include <bsd.subdir.mk> @@ -1988,6 +2000,13 @@ delete-old-files: chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ rm ${RM_I} "${DESTDIR}/$${file}" <&3; \ fi; \ + for ext in debug symbols; do \ + if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \ + "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \ + <&3; \ + fi; \ + done; \ done # Remove catpages without corresponding manpages. @exec 3<&0; \ @@ -2010,6 +2029,11 @@ check-old-files: if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ + for ext in debug symbols; do \ + if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \ + fi; \ + done; \ done # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -2242,7 +2266,9 @@ _xi-cross-tools: .endfor _xi-includes: - ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \ + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 buildincludes \ + DESTDIR=${XDDESTDIR} + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 installincludes \ DESTDIR=${XDDESTDIR} _xi-libraries: Modified: projects/collation/ObsoleteFiles.inc ============================================================================== --- projects/collation/ObsoleteFiles.inc Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/ObsoleteFiles.inc Mon Oct 19 11:51:10 2015 (r289573) @@ -97,6 +97,410 @@ OLD_FILES+=usr/bin/colldef OLD_FILES+=usr/share/man/man1/colldef.1.gz OLD_FILES+=usr/bin/mklocale OLD_FILES+=usr/share/man/man1/mklocale.1.gz +# 20151015: test symbols moved to /usr/lib/debug +OLD_DIRS+=usr/tests/lib/atf/libatf-c++/.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/atf_c++_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/build_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/check_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/config_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/macros_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/tests_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/utils_test.debug +OLD_DIRS+=usr/tests/lib/atf/libatf-c++/detail/.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/application_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/env_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/exceptions_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/fs_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/process_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/sanity_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/text_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/version_helper.debug +OLD_DIRS+=usr/tests/lib/atf/libatf-c/.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/atf_c_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/build_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/check_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/config_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/error_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/macros_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tc_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tp_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/utils_test.debug +OLD_DIRS+=usr/tests/lib/atf/libatf-c/detail/.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/dynstr_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/env_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/fs_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/list_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/map_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_helpers.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/sanity_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/text_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/user_test.debug +OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/version_helper.debug +OLD_DIRS+=usr/tests/lib/atf/test-programs/.debug +OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/c_helpers.debug +OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/cpp_helpers.debug +OLD_DIRS+=usr/tests/lib/libc/c063/.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/faccessat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchmodat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchownat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/fexecve.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/fstatat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/linkat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkdirat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkfifoat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/mknodat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/openat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/readlinkat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/renameat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/symlinkat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/unlinkat.debug +OLD_FILES+=usr/tests/lib/libc/c063/.debug/utimensat.debug +OLD_DIRS+=usr/tests/lib/libc/db/.debug +OLD_FILES+=usr/tests/lib/libc/db/.debug/h_db.debug +OLD_DIRS+=usr/tests/lib/libc/gen/.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/alarm_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/arc4random_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/assert_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/basedirname_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/dir_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/floatunditf_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/fnmatch_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify2_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetmask_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetround_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/ftok_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/getcwd_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/getgrent_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/glob_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/humanize_number_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/isnan_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/nice_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/pause_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/raise_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/realpath_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/setdomainname_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/sethostname_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/sleep_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/syslog_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/time_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/ttyname_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/.debug/vis_test.debug +OLD_DIRS+=usr/tests/lib/libc/gen/execve/.debug +OLD_FILES+=usr/tests/lib/libc/gen/execve/.debug/execve_test.debug +OLD_DIRS+=usr/tests/lib/libc/gen/posix_spawn/.debug +OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/fileactions_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_fileactions.debug +OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawn.debug +OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawnattr.debug +OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawn_test.debug +OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawnattr_test.debug +OLD_DIRS+=usr/tests/lib/libc/hash/.debug +OLD_FILES+=usr/tests/lib/libc/hash/.debug/h_hash.debug +OLD_FILES+=usr/tests/lib/libc/hash/.debug/sha2_test.debug +OLD_DIRS+=usr/tests/lib/libc/inet/.debug +OLD_FILES+=usr/tests/lib/libc/inet/.debug/inet_network_test.debug +OLD_DIRS+=usr/tests/lib/libc/locale/.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/io_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbrtowc_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbsnrtowcs_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbstowcs_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbtowc_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcscspn_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcspbrk_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcsspn_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcstod_test.debug +OLD_FILES+=usr/tests/lib/libc/locale/.debug/wctomb_test.debug +OLD_DIRS+=usr/tests/lib/libc/net/.debug +OLD_FILES+=usr/tests/lib/libc/net/.debug/ether_aton_test.debug +OLD_FILES+=usr/tests/lib/libc/net/.debug/getprotoent_test.debug +OLD_FILES+=usr/tests/lib/libc/net/.debug/h_dns_server.debug +OLD_FILES+=usr/tests/lib/libc/net/.debug/h_nsd_recurse.debug +OLD_FILES+=usr/tests/lib/libc/net/.debug/h_protoent.debug +OLD_FILES+=usr/tests/lib/libc/net/.debug/h_servent.debug +OLD_DIRS+=usr/tests/lib/libc/regex/.debug +OLD_FILES+=usr/tests/lib/libc/regex/.debug/exhaust_test.debug +OLD_FILES+=usr/tests/lib/libc/regex/.debug/h_regex.debug +OLD_FILES+=usr/tests/lib/libc/regex/.debug/regex_att_test.debug +OLD_DIRS+=usr/tests/lib/libc/ssp/.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_fgets.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_getcwd.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_gets.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memcpy.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memmove.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memset.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_raw.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_read.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_readlink.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_snprintf.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_sprintf.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpcpy.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpncpy.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcat.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcpy.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncat.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncpy.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsnprintf.debug +OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsprintf.debug +OLD_DIRS+=usr/tests/lib/libc/stdio/.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/clearerr_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fflush_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen2_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fopen_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fputc_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/mktemp_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/popen_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/printf_test.debug +OLD_FILES+=usr/tests/lib/libc/stdio/.debug/scanf_test.debug +OLD_DIRS+=usr/tests/lib/libc/stdlib/.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/abs_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/atoi_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/div_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/exit_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/getenv_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt_long.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/hsearch_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/posix_memalign_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/random_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtod_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtol_test.debug +OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/system_test.debug +OLD_DIRS+=usr/tests/lib/libc/string/.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/memchr.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/memcpy.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/memmem.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/memset.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strcat.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strchr.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strcmp.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strcpy.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strcspn.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strerror.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strlen.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strpbrk.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strrchr.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/strspn.debug +OLD_FILES+=usr/tests/lib/libc/string/.debug/swab.debug +OLD_DIRS+=usr/tests/lib/libc/sys/.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/access_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/chroot_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/clock_gettime_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/connect_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/dup_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/fsync_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/getcontext_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/getgroups_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/getitimer_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/getlogin_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/getpid_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/getrusage_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/getsid_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/gettimeofday_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/issetugid_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/kevent_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/kill_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/link_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/listen_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/mincore_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkdir_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkfifo_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/mknod_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/mlock_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/mmap_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/mprotect_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgctl_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgget_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgrcv_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgsnd_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/msync_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/nanosleep_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe2_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/poll_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/revoke_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/select_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/setrlimit_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/setuid_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigaction_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigqueue_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigtimedwait_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/socketpair_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/stat_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/timer_create_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/truncate_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/ucontext_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/umask_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/unlink_test.debug +OLD_FILES+=usr/tests/lib/libc/sys/.debug/write_test.debug +OLD_DIRS+=usr/tests/lib/libc/termios/.debug +OLD_FILES+=usr/tests/lib/libc/termios/.debug/tcsetpgrp_test.debug +OLD_DIRS+=usr/tests/lib/libc/tls/.debug +OLD_FILES+=usr/tests/lib/libc/tls/.debug/h_tls_dlopen.so.debug +OLD_FILES+=usr/tests/lib/libc/tls/.debug/libh_tls_dynamic.so.1.debug +OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dlopen_test.debug +OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dynamic_test.debug +OLD_DIRS+=usr/tests/lib/libc/ttyio/.debug +OLD_FILES+=usr/tests/lib/libc/ttyio/.debug/ttyio_test.debug +OLD_DIRS+=usr/tests/lib/libcrypt/.debug +OLD_FILES+=usr/tests/lib/libcrypt/.debug/crypt_tests.debug +OLD_DIRS+=usr/tests/lib/libmp/.debug +OLD_FILES+=usr/tests/lib/libmp/.debug/legacy_test.debug +OLD_DIRS+=usr/tests/lib/libnv/.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/dnv_tests.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/nv_array_tests.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/nv_tests.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_add_test.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_exists_test.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_free_test.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_get_test.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_move_test.debug +OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_send_recv_test.debug +OLD_DIRS+=usr/tests/lib/libpam/.debug +OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_ctype.debug +OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readlinev.debug +OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readword.debug +OLD_DIRS+=usr/tests/lib/libproc/.debug +OLD_FILES+=usr/tests/lib/libproc/.debug/proc_test.debug +OLD_FILES+=usr/tests/lib/libproc/.debug/target_prog.debug +OLD_DIRS+=usr/tests/lib/librt/.debug +OLD_FILES+=usr/tests/lib/librt/.debug/sched_test.debug +OLD_FILES+=usr/tests/lib/librt/.debug/sem_test.debug +OLD_DIRS+=usr/tests/lib/libthr/.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/barrier_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/cond_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/condwait_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/detach_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/equal_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/fork_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/fpu_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/h_atexit.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/h_cancel.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/h_exit.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/h_resolv.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/join_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/kill_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/mutex_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/once_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/preempt_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/rwlock_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/sem_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/siglongjmp_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/sigmask_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/sigsuspend_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/sleep_test.debug +OLD_FILES+=usr/tests/lib/libthr/.debug/swapcontext_test.debug +OLD_DIRS+=usr/tests/lib/libthr/dlopen/.debug +OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/dlopen_test.debug +OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/h_pthread_dlopen.so.1.debug +OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/main_pthread_create_test.debug +OLD_DIRS+=usr/tests/lib/libutil/.debug +OLD_FILES+=usr/tests/lib/libutil/.debug/flopen_test.debug +OLD_FILES+=usr/tests/lib/libutil/.debug/grp_test.debug +OLD_FILES+=usr/tests/lib/libutil/.debug/humanize_number_test.debug +OLD_FILES+=usr/tests/lib/libutil/.debug/pidfile_test.debug +OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain-nodomain_test.debug +OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain_test.debug +OLD_DIRS+=usr/tests/lib/libxo/.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/libenc_test.so.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_01.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_02.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_03.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_04.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_05.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_06.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_07.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_08.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_09.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_10.debug +OLD_FILES+=usr/tests/lib/libxo/.debug/test_11.debug +OLD_DIRS+=usr/tests/lib/msun/.debug +OLD_FILES+=usr/tests/lib/msun/.debug/acos_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/asin_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/atan_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/cbrt_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/ceil_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/cos_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/cosh_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/erf_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/exp_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/fmod_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/infinity_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/ldexp_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/log_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/pow_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/precision_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/round_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/scalbn_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/sin_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/sinh_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/sqrt_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/tan_test.debug +OLD_FILES+=usr/tests/lib/msun/.debug/tanh_test.debug +OLD_DIRS+=usr/tests/libexec/rtld-elf/.debug +OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/ld_library_pathfds.debug +OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/libpythagoras.so.0.debug +OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/target.debug +OLD_DIRS+=usr/tests/sbin/devd/.debug +OLD_FILES+=usr/tests/sbin/devd/.debug/client_test.debug +OLD_DIRS+=usr/tests/sbin/dhclient/.debug +OLD_FILES+=usr/tests/sbin/dhclient/.debug/option-domain-search_test.debug +OLD_DIRS+=usr/tests/share/examples/tests/atf/.debug +OLD_FILES+=usr/tests/share/examples/tests/atf/.debug/printf_test.debug +OLD_DIRS+=usr/tests/share/examples/tests/plain/.debug +OLD_FILES+=usr/tests/share/examples/tests/plain/.debug/printf_test.debug +OLD_DIRS+=usr/tests/sys/aio/.debug +OLD_FILES+=usr/tests/sys/aio/.debug/aio_kqueue_test.debug +OLD_FILES+=usr/tests/sys/aio/.debug/aio_test.debug +OLD_FILES+=usr/tests/sys/aio/.debug/lio_kqueue_test.debug +OLD_DIRS+=usr/tests/sys/fifo/.debug +OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_create.debug +OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_io.debug +OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_misc.debug +OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_open.debug +OLD_DIRS+=usr/tests/sys/file/.debug +OLD_FILES+=usr/tests/sys/file/.debug/closefrom_test.debug +OLD_FILES+=usr/tests/sys/file/.debug/dup_test.debug +OLD_FILES+=usr/tests/sys/file/.debug/fcntlflags_test.debug +OLD_FILES+=usr/tests/sys/file/.debug/flock_helper.debug +OLD_FILES+=usr/tests/sys/file/.debug/ftruncate_test.debug +OLD_FILES+=usr/tests/sys/file/.debug/newfileops_on_fork_test.debug +OLD_DIRS+=usr/tests/sys/kern/.debug +OLD_FILES+=usr/tests/sys/kern/.debug/kern_descrip_test.debug +OLD_FILES+=usr/tests/sys/kern/.debug/ptrace_test.debug +OLD_FILES+=usr/tests/sys/kern/.debug/unix_seqpacket_test.debug +OLD_DIRS+=usr/tests/sys/kern/execve/.debug +OLD_FILES+=usr/tests/sys/kern/execve/.debug/execve_helper.debug +OLD_FILES+=usr/tests/sys/kern/execve/.debug/good_aout.debug +OLD_DIRS+=usr/tests/sys/kqueue/.debug +OLD_FILES+=usr/tests/sys/kqueue/.debug/kqtest.debug +OLD_DIRS+=usr/tests/sys/mqueue/.debug +OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest1.debug +OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest2.debug +OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest3.debug +OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest4.debug +OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest5.debug +OLD_DIRS+=usr/tests/sys/netinet/.debug +OLD_FILES+=usr/tests/sys/netinet/.debug/udp_dontroute.debug +OLD_DIRS+=usr/tests/sys/pjdfstest/.debug +OLD_FILES+=usr/tests/sys/pjdfstest/.debug/pjdfstest.debug +OLD_DIRS+=usr/tests/sys/vm/.debug +OLD_FILES+=usr/tests/sys/vm/.debug/mmap_test.debug +# 20151015: Rename files due to file-installed-as-dir bug +OLD_FILES+=usr/share/doc/legal/realtek +OLD_FILES+=usr/share/doc/legal/realtek/LICENSE +OLD_DIRS+=usr/share/doc/legal/realtek +OLD_DIRS+=usr/share/doc/legal/intel_ipw +OLD_FILES+=usr/share/doc/legal/intel_ipw/LICENSE +OLD_FILES+=usr/share/doc/legal/intel_iwn +OLD_FILES+=usr/share/doc/legal/intel_iwn/LICENSE +OLD_DIRS+=usr/share/doc/legal/intel_iwn +OLD_DIRS+=usr/share/doc/legal/intel_iwi +OLD_FILES+=usr/share/doc/legal/intel_iwi/LICENSE +OLD_DIRS+=usr/share/doc/legal/intel_wpi +OLD_FILES+=usr/share/doc/legal/intel_wpi/LICENSE # 20151006: new libc++ import OLD_FILES+=usr/include/c++/__tuple_03 # 20151006: new clang import which bumps version from 3.6.1 to 3.7.0. Modified: projects/collation/UPDATING ============================================================================== --- projects/collation/UPDATING Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/UPDATING Mon Oct 19 11:51:10 2015 (r289573) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151017: + The build previously allowed using 'make -n' to not recurse into + sub-directories while showing what commands would be executed, and + 'make -n -n' to recursively show commands. Now 'make -n' will recurse + and 'make -N' will not. + 20151012: If you specify SENDMAIL_MC or SENDMAIL_CF in make.conf, mergemaster and etcupdate will now use this file. A custom sendmail.cf is now Modified: projects/collation/bin/dd/Makefile ============================================================================== --- projects/collation/bin/dd/Makefile Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/bin/dd/Makefile Mon Oct 19 11:51:10 2015 (r289573) @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <src.opts.mk> + PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c @@ -24,4 +26,8 @@ test: ${PROG} gen .endfor @rm -f gen +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: projects/collation/bin/ps/Makefile ============================================================================== --- projects/collation/bin/ps/Makefile Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/bin/ps/Makefile Mon Oct 19 11:51:10 2015 (r289573) @@ -11,6 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -LIBADD= m kvm jail xo util +LIBADD= m kvm jail xo .include <bsd.prog.mk> Modified: projects/collation/bin/sh/tests/Makefile ============================================================================== --- projects/collation/bin/sh/tests/Makefile Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/bin/sh/tests/Makefile Mon Oct 19 11:51:10 2015 (r289573) @@ -10,4 +10,6 @@ TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e +SUBDIR_PARALLEL= + .include <bsd.test.mk> Modified: projects/collation/bin/test/tests/legacy_test.sh ============================================================================== --- projects/collation/bin/test/tests/legacy_test.sh Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/bin/test/tests/legacy_test.sh Mon Oct 19 11:51:10 2015 (r289573) @@ -2,7 +2,7 @@ #- # Copyright (c) June 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. -# All rights reserved. +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,7 +31,7 @@ # $FreeBSD$ # force a specified test program, e.g. `env test=/bin/test sh regress.sh' -: ${test=test} +: ${test=test} t () { @@ -54,13 +54,13 @@ t () count=0 echo "1..130" -t 0 'b = b' -t 0 'b == b' -t 1 'b != b' -t 0 '\( b = b \)' -t 0 '\( b == b \)' -t 1 '! \( b = b \)' -t 1 '! \( b == b \)' +t 0 'b = b' +t 0 'b == b' +t 1 'b != b' +t 0 '\( b = b \)' +t 0 '\( b == b \)' +t 1 '! \( b = b \)' +t 1 '! \( b == b \)' t 1 '! -f /etc/passwd' t 0 '-h = -h' Modified: projects/collation/cddl/Makefile ============================================================================== --- projects/collation/cddl/Makefile Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/cddl/Makefile Mon Oct 19 11:51:10 2015 (r289573) @@ -2,10 +2,13 @@ .include <src.opts.mk> -SUBDIR= lib sbin usr.bin usr.sbin +SUBDIR= lib .WAIT \ + sbin usr.bin usr.sbin .if ${MK_TESTS} != "no" SUBDIR+=tests .endif +SUBDIR_PARALLEL= + .include <bsd.subdir.mk> Modified: projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Oct 19 11:46:48 2015 (r289572) +++ projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Oct 19 11:51:10 2015 (r289573) @@ -18,7 +18,7 @@ .\" information: Portions Copyright [yyyy] [name of copyright owner] .\" .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. -.\" Copyright (c) 2014 by Delphix. All rights reserved. +.\" Copyright (c) 2011, 2014 by Delphix. All rights reserved. .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd@FreeBSD.org> .\" Copyright (c) 2012, Glen Barber <gjb@FreeBSD.org> .\" Copyright (c) 2012, Bryan Drewery <bdrewery@FreeBSD.org> @@ -117,7 +117,7 @@ .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm .Cm set -.Ar property Ns = Ns Ar value +.Ar property Ns = Ns Ar value Oc ... .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ... .Nm .Cm get @@ -189,17 +189,25 @@ .Op Fl i Ar snapshot Ns | Ns bookmark .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm +.Cm send +.Op Fl Penv +.Fl t Ar receive_resume_token +.Nm .Cm receive Ns | Ns Cm recv -.Op Fl vnFu +.Op Fl vnsFu .Op Fl o Sy origin Ns = Ns Ar snapshot .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm .Cm receive Ns | Ns Cm recv -.Op Fl vnFu +.Op Fl vnsFu .Op Fl d | e .Op Fl o Sy origin Ns = Ns Ar snapshot .Ar filesystem .Nm +.Cm receive Ns | Ns Cm recv +.Fl A +.Ar filesystem Ns | Ns Ar volume +.Nm .Cm allow .Ar filesystem Ns | Ns Ar volume .Nm @@ -597,6 +605,13 @@ For cloned file systems or volumes, the created. See also the .Sy clones property. +.It Sy receive_resume_token +For filesystems or volumes which have saved partially-completed state from +.Sy zfs receive -s , +this opaque token can be provided to +.Sy zfs send -t +to resume and complete the +.Sy zfs receive . .It Sy referenced The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it @@ -2106,14 +2121,14 @@ option, but sorts by property in descend .It Xo .Nm .Cm set -.Ar property Ns = Ns Ar value +.Ar property Ns = Ns Ar value Oc ... .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Xc .Pp -Sets the property to the given value for each dataset. Only some properties can -be edited. See the "Properties" section for more information on what properties -can be set and acceptable values. Numeric values can be specified as exact -values, or in a human-readable form with a suffix of +Sets the property or list of properties to the given value(s) for each dataset. +Only some properties can be edited. See the "Properties" section for more +information on what properties can be set and acceptable values. Numeric values +can be specified as exact values, or in a human-readable form with a suffix of .Sy B , K , M , G , T , P , E , Z (for bytes, kilobytes, megabytes, gigabytes, terabytes, petabytes, exabytes, or zettabytes, respectively). User properties can be set on snapshots. For more @@ -2630,6 +2645,9 @@ useful in conjunction with the or .Fl P flags to determine what data will be sent. +In this case, the verbose output will be written to +standard output (contrast with a non-dry-run, where the stream is written +to standard output and the verbose output goes to standard error). .It Fl P Print machine-parsable verbose information about the stream package generated. .It Fl v @@ -2711,15 +2729,28 @@ feature. .El .It Xo .Nm +.Cm send +.Op Fl Penv +.Fl t +.Ar receive_resume_token +.Xc +Creates a send stream which resumes an interrupted receive. The +.Ar receive_resume_token +is the value of this property on the filesystem +or volume that was being received into. See the documentation for +.Sy zfs receive -s +for more details. +.It Xo +.Nm .Cm receive Ns | Ns Cm recv -.Op Fl vnFu +.Op Fl vnsFu .Op Fl o Sy origin Ns = Ns Ar snapshot .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Xc .It Xo .Nm .Cm receive Ns | Ns Cm recv -.Op Fl vnFu +.Op Fl vnsFu .Op Fl d | e .Op Fl o Sy origin Ns = Ns Ar snapshot .Ar filesystem @@ -2816,9 +2847,42 @@ performing the receive operation. If rec stream (for example, one generated by .Qq Nm Cm send Fl R Bro Fl i | Fl I Brc ) , destroy snapshots and file systems that do not exist on the sending side. +.It Fl s +If the receive is interrupted, save the partially received state, rather +than deleting it. Interruption may be due to premature termination of +the stream +.Po e.g. due to network failure or failure of the remote system +if the stream is being read over a network connection +.Pc , +a checksum error in the stream, termination of the +.Nm zfs Cm receive *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510191151.t9JBpBiE069189>