Date: Fri, 16 Oct 2015 08:06:29 +0000 (UTC) From: Alan Cox <alc@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289413 - in user/alc/PQ_LAUNDRY: . bin/sh/tests cddl cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zstreamdump cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/o... Message-ID: <201510160806.t9G86TDH037318@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: alc Date: Fri Oct 16 08:06:28 2015 New Revision: 289413 URL: https://svnweb.freebsd.org/changeset/base/289413 Log: MFH r289412 Added: user/alc/PQ_LAUNDRY/sbin/newfs_msdos/mkfs_msdos.c - copied unchanged from r289412, head/sbin/newfs_msdos/mkfs_msdos.c user/alc/PQ_LAUNDRY/sbin/newfs_msdos/mkfs_msdos.h - copied unchanged from r289412, head/sbin/newfs_msdos/mkfs_msdos.h Deleted: user/alc/PQ_LAUNDRY/gnu/usr.bin/cc/c++filt/ user/alc/PQ_LAUNDRY/gnu/usr.bin/cc/collect2/ user/alc/PQ_LAUNDRY/gnu/usr.bin/cc/protoize/ Modified: user/alc/PQ_LAUNDRY/Makefile user/alc/PQ_LAUNDRY/Makefile.inc1 user/alc/PQ_LAUNDRY/ObsoleteFiles.inc user/alc/PQ_LAUNDRY/bin/sh/tests/Makefile user/alc/PQ_LAUNDRY/cddl/Makefile user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h user/alc/PQ_LAUNDRY/cddl/lib/libzfs/Makefile user/alc/PQ_LAUNDRY/etc/mtree/BSD.usr.dist user/alc/PQ_LAUNDRY/etc/periodic/Makefile user/alc/PQ_LAUNDRY/gnu/Makefile user/alc/PQ_LAUNDRY/gnu/lib/Makefile user/alc/PQ_LAUNDRY/gnu/usr.bin/binutils/ld/genscripts.sh user/alc/PQ_LAUNDRY/gnu/usr.bin/cc/Makefile user/alc/PQ_LAUNDRY/gnu/usr.bin/groff/Makefile user/alc/PQ_LAUNDRY/gnu/usr.bin/rcs/Makefile user/alc/PQ_LAUNDRY/include/Makefile user/alc/PQ_LAUNDRY/lib/Makefile user/alc/PQ_LAUNDRY/lib/libiconv_modules/Makefile user/alc/PQ_LAUNDRY/sbin/newfs_msdos/Makefile user/alc/PQ_LAUNDRY/sbin/newfs_msdos/newfs_msdos.c user/alc/PQ_LAUNDRY/secure/Makefile user/alc/PQ_LAUNDRY/secure/libexec/Makefile user/alc/PQ_LAUNDRY/secure/usr.bin/Makefile user/alc/PQ_LAUNDRY/secure/usr.sbin/Makefile user/alc/PQ_LAUNDRY/share/Makefile user/alc/PQ_LAUNDRY/share/doc/Makefile user/alc/PQ_LAUNDRY/share/doc/legal/Makefile user/alc/PQ_LAUNDRY/share/doc/legal/intel_ipw/Makefile user/alc/PQ_LAUNDRY/share/doc/legal/intel_iwi/Makefile user/alc/PQ_LAUNDRY/share/doc/legal/intel_iwn/Makefile user/alc/PQ_LAUNDRY/share/doc/legal/intel_wpi/Makefile user/alc/PQ_LAUNDRY/share/doc/legal/realtek/Makefile user/alc/PQ_LAUNDRY/share/doc/papers/Makefile user/alc/PQ_LAUNDRY/share/doc/psd/Makefile user/alc/PQ_LAUNDRY/share/doc/smm/Makefile user/alc/PQ_LAUNDRY/share/doc/usd/Makefile user/alc/PQ_LAUNDRY/share/examples/Makefile user/alc/PQ_LAUNDRY/share/i18n/Makefile user/alc/PQ_LAUNDRY/share/i18n/csmapper/Makefile user/alc/PQ_LAUNDRY/share/i18n/esdb/Makefile user/alc/PQ_LAUNDRY/share/man/Makefile user/alc/PQ_LAUNDRY/share/man/man4/ipw.4 user/alc/PQ_LAUNDRY/share/man/man4/ipwfw.4 user/alc/PQ_LAUNDRY/share/man/man4/iwi.4 user/alc/PQ_LAUNDRY/share/man/man4/iwifw.4 user/alc/PQ_LAUNDRY/share/man/man4/rsu.4 user/alc/PQ_LAUNDRY/share/man/man4/urtwn.4 user/alc/PQ_LAUNDRY/share/man/man4/urtwnfw.4 user/alc/PQ_LAUNDRY/share/man/man4/wpi.4 user/alc/PQ_LAUNDRY/share/mk/bsd.confs.mk user/alc/PQ_LAUNDRY/share/mk/bsd.doc.mk user/alc/PQ_LAUNDRY/share/mk/bsd.files.mk user/alc/PQ_LAUNDRY/share/mk/bsd.incs.mk user/alc/PQ_LAUNDRY/share/mk/bsd.info.mk user/alc/PQ_LAUNDRY/share/mk/bsd.lib.mk user/alc/PQ_LAUNDRY/share/mk/bsd.man.mk user/alc/PQ_LAUNDRY/share/mk/bsd.prog.mk user/alc/PQ_LAUNDRY/share/syscons/Makefile user/alc/PQ_LAUNDRY/sys/arm/arm/bcopyinout.S user/alc/PQ_LAUNDRY/sys/arm/arm/bcopyinout_xscale.S user/alc/PQ_LAUNDRY/sys/arm/arm/copystr.S user/alc/PQ_LAUNDRY/sys/arm/arm/fusu.S user/alc/PQ_LAUNDRY/sys/arm/arm/genassym.c user/alc/PQ_LAUNDRY/sys/arm/include/param.h user/alc/PQ_LAUNDRY/sys/arm64/arm64/support.S user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h user/alc/PQ_LAUNDRY/sys/dev/cxgbe/t4_main.c user/alc/PQ_LAUNDRY/sys/dev/ntb/if_ntb/if_ntb.c user/alc/PQ_LAUNDRY/sys/dev/ntb/ntb_hw/ntb_hw.c user/alc/PQ_LAUNDRY/sys/dev/ntb/ntb_hw/ntb_hw.h user/alc/PQ_LAUNDRY/sys/dev/ntb/ntb_hw/ntb_regs.h user/alc/PQ_LAUNDRY/sys/dev/sdhci/sdhci.c user/alc/PQ_LAUNDRY/sys/dev/sdhci/sdhci.h user/alc/PQ_LAUNDRY/sys/dev/sdhci/sdhci_pci.c user/alc/PQ_LAUNDRY/sys/modules/cxgbe/if_cxgbe/Makefile user/alc/PQ_LAUNDRY/sys/net/if_lagg.c user/alc/PQ_LAUNDRY/sys/tools/fw_stub.awk user/alc/PQ_LAUNDRY/sys/ufs/ffs/ffs_alloc.c user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c user/alc/PQ_LAUNDRY/tests/Makefile user/alc/PQ_LAUNDRY/tests/sys/Makefile user/alc/PQ_LAUNDRY/tests/sys/pjdfstest/Makefile user/alc/PQ_LAUNDRY/tests/sys/pjdfstest/tests/Makefile Directory Properties: user/alc/PQ_LAUNDRY/ (props changed) user/alc/PQ_LAUNDRY/cddl/ (props changed) user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/ (props changed) user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/ (props changed) user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/alc/PQ_LAUNDRY/contrib/gcc/ (props changed) user/alc/PQ_LAUNDRY/gnu/lib/ (props changed) user/alc/PQ_LAUNDRY/gnu/usr.bin/binutils/ (props changed) user/alc/PQ_LAUNDRY/include/ (props changed) user/alc/PQ_LAUNDRY/sbin/ (props changed) user/alc/PQ_LAUNDRY/share/ (props changed) user/alc/PQ_LAUNDRY/share/man/man4/ (props changed) user/alc/PQ_LAUNDRY/sys/ (props changed) user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/alc/PQ_LAUNDRY/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/Makefile Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/Makefile Fri Oct 16 08:06:28 2015 (r289413) @@ -250,7 +250,7 @@ ${TGTS}: .MAKE tinderbox toolchains kernel-toolchains: .MAKE .endif -${TGTS}: +${TGTS}: .PHONY ${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET} # The historic default "all" target creates files which may cause stale @@ -259,9 +259,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 \"buildworld\" is wanted. See build(7)." @echo @false Modified: user/alc/PQ_LAUNDRY/Makefile.inc1 ============================================================================== --- user/alc/PQ_LAUNDRY/Makefile.inc1 Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/Makefile.inc1 Fri Oct 16 08:06:28 2015 (r289413) @@ -558,6 +558,7 @@ _worldtmp: 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 @@ -1062,7 +1063,7 @@ INSTALLKERNEL= ${_kernel} .endif .endfor -buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE +buildkernel ${WMAKE_TGTS:N_worldtmp} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY # # buildkernel @@ -1995,6 +1996,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; \ @@ -2017,6 +2025,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 | \ Modified: user/alc/PQ_LAUNDRY/ObsoleteFiles.inc ============================================================================== --- user/alc/PQ_LAUNDRY/ObsoleteFiles.inc Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/ObsoleteFiles.inc Fri Oct 16 08:06:28 2015 (r289413) @@ -38,6 +38,410 @@ # xargs -n1 | sort | uniq -d; # done +# 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: user/alc/PQ_LAUNDRY/bin/sh/tests/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/bin/sh/tests/Makefile Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/bin/sh/tests/Makefile Fri Oct 16 08:06:28 2015 (r289413) @@ -10,4 +10,6 @@ TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e +SUBDIR_PARALLEL= + .include <bsd.test.mk> Modified: user/alc/PQ_LAUNDRY/cddl/Makefile ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/Makefile Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/Makefile Fri Oct 16 08:06:28 2015 (r289413) @@ -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: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Oct 16 08:06:28 2015 (r289413) @@ -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 @@ -2714,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 @@ -2819,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 +process, or unclean shutdown of the system. +.Pp +The receive can be resumed with a stream generated by +.Nm zfs Cm send Fl t Ar token , +where the +.Ar token +is the value of the +.Sy receive_resume_token +property of the filesystem or volume which is received into. +.Pp +To use this flag, the storage pool must have the +.Sy extensible_dataset +feature enabled. See +.Xr zpool-features 5 +for details on ZFS feature flags. .El .It Xo .Nm +.Cm receive Ns | Ns Cm recv +.Fl A +.Ar filesystem Ns | Ns Ar volume +.Xc +Abort an interrupted +.Nm zfs Cm receive Fl s , +deleting its saved partially received state. +.It Xo +.Nm .Cm allow .Ar filesystem Ns | Ns Ar volume .Xc Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Oct 16 08:06:28 2015 (r289413) @@ -263,10 +263,11 @@ get_usage(zfs_help_t idx) case HELP_PROMOTE: return (gettext("\tpromote <clone-filesystem>\n")); case HELP_RECEIVE: - return (gettext("\treceive|recv [-vnFu] <filesystem|volume|" + return (gettext("\treceive|recv [-vnsFu] <filesystem|volume|" "snapshot>\n" - "\treceive|recv [-vnFu] [-o origin=<snapshot>] [-d | -e] " - "<filesystem>\n")); + "\treceive|recv [-vnsFu] [-o origin=<snapshot>] [-d | -e] " + "<filesystem>\n" + "\treceive|recv -A <filesystem|volume>\n")); case HELP_RENAME: return (gettext("\trename [-f] <filesystem|volume|snapshot> " "<filesystem|volume|snapshot>\n" @@ -279,7 +280,8 @@ get_usage(zfs_help_t idx) return (gettext("\tsend [-DnPpRvLe] [-[iI] snapshot] " "<snapshot>\n" "\tsend [-Le] [-i snapshot|bookmark] " - "<filesystem|volume|snapshot>\n")); + "<filesystem|volume|snapshot>\n" + "\tsend [-nvPe] -t <receive_resume_token>\n")); case HELP_SET: return (gettext("\tset <property=value> " "<filesystem|volume|snapshot> ...\n")); @@ -3728,6 +3730,7 @@ zfs_do_send(int argc, char **argv) { char *fromname = NULL; char *toname = NULL; + char *resume_token = NULL; char *cp; zfs_handle_t *zhp; sendflags_t flags = { 0 }; @@ -3736,7 +3739,7 @@ zfs_do_send(int argc, char **argv) boolean_t extraverbose = B_FALSE; /* check options */ - while ((c = getopt(argc, argv, ":i:I:RDpvnPLe")) != -1) { + while ((c = getopt(argc, argv, ":i:I:RDpvnPLet:")) != -1) { switch (c) { case 'i': if (fromname) @@ -3777,6 +3780,9 @@ zfs_do_send(int argc, char **argv) case 'e': flags.embed_data = B_TRUE; break; + case 't': + resume_token = optarg; + break; case ':': (void) fprintf(stderr, gettext("missing argument for " "'%c' option\n"), optopt); @@ -3792,14 +3798,28 @@ zfs_do_send(int argc, char **argv) argc -= optind; argv += optind; - /* check number of arguments */ - if (argc < 1) { - (void) fprintf(stderr, gettext("missing snapshot argument\n")); - usage(B_FALSE); - } - if (argc > 1) { - (void) fprintf(stderr, gettext("too many arguments\n")); - usage(B_FALSE); + if (resume_token != NULL) { + if (fromname != NULL || flags.replicate || flags.props || + flags.dedup) { + (void) fprintf(stderr, + gettext("invalid flags combined with -t\n")); + usage(B_FALSE); + } + if (argc != 0) { + (void) fprintf(stderr, gettext("no additional " + "arguments are permitted with -t\n")); + usage(B_FALSE); + } + } else { + if (argc < 1) { + (void) fprintf(stderr, + gettext("missing snapshot argument\n")); + usage(B_FALSE); + } + if (argc > 1) { + (void) fprintf(stderr, gettext("too many arguments\n")); + usage(B_FALSE); + } } if (!flags.dryrun && isatty(STDOUT_FILENO)) { @@ -3809,6 +3829,11 @@ zfs_do_send(int argc, char **argv) return (1); } + if (resume_token != NULL) { + return (zfs_send_resume(g_zfs, &flags, STDOUT_FILENO, + resume_token)); + } + /* * Special case sending a filesystem, or from a bookmark. */ @@ -3914,8 +3939,6 @@ zfs_do_send(int argc, char **argv) } /* - * zfs receive [-vnFu] [-d | -e] <fs@snap> - * * Restore a backup stream from stdin. */ static int @@ -3923,6 +3946,8 @@ zfs_do_receive(int argc, char **argv) { int c, err; recvflags_t flags = { 0 }; + boolean_t abort_resumable = B_FALSE; + nvlist_t *props; nvpair_t *nvp = NULL; @@ -3930,7 +3955,7 @@ zfs_do_receive(int argc, char **argv) nomem(); /* check options */ - while ((c = getopt(argc, argv, ":o:denuvF")) != -1) { + while ((c = getopt(argc, argv, ":o:denuvFsA")) != -1) { switch (c) { case 'o': if (parseprop(props, optarg) != 0) @@ -3952,9 +3977,15 @@ zfs_do_receive(int argc, char **argv) case 'v': flags.verbose = B_TRUE; break; + case 's': + flags.resumable = B_TRUE; + break; case 'F': flags.force = B_TRUE; break; + case 'A': + abort_resumable = B_TRUE; + break; case ':': (void) fprintf(stderr, gettext("missing argument for " "'%c' option\n"), optopt); @@ -3987,6 +4018,44 @@ zfs_do_receive(int argc, char **argv) } } + if (abort_resumable) { + if (flags.isprefix || flags.istail || flags.dryrun || + flags.resumable || flags.nomount) { + (void) fprintf(stderr, gettext("invalid option")); + usage(B_FALSE); + } + + char namebuf[ZFS_MAXNAMELEN]; + (void) snprintf(namebuf, sizeof (namebuf), + "%s/%%recv", argv[0]); + + if (zfs_dataset_exists(g_zfs, namebuf, + ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME)) { + zfs_handle_t *zhp = zfs_open(g_zfs, + namebuf, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME); + if (zhp == NULL) + return (1); + err = zfs_destroy(zhp, B_FALSE); + } else { + zfs_handle_t *zhp = zfs_open(g_zfs, + argv[0], ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME); + if (zhp == NULL) + usage(B_FALSE); + if (!zfs_prop_get_int(zhp, ZFS_PROP_INCONSISTENT) || + zfs_prop_get(zhp, ZFS_PROP_RECEIVE_RESUME_TOKEN, + NULL, 0, NULL, NULL, 0, B_TRUE) == -1) { + (void) fprintf(stderr, + gettext("'%s' does not have any " + "resumable receive state to abort\n"), + argv[0]); + return (1); + } + err = zfs_destroy(zhp, B_FALSE); + } + + return (err != 0); + } + if (isatty(STDIN_FILENO)) { (void) fprintf(stderr, gettext("Error: Backup stream can not be read " @@ -3994,7 +4063,6 @@ zfs_do_receive(int argc, char **argv) "You must redirect standard input.\n")); return (1); } - err = zfs_receive(g_zfs, argv[0], props, &flags, STDIN_FILENO, NULL); return (err != 0); @@ -5816,6 +5884,24 @@ share_mount_one(zfs_handle_t *zhp, int o } /* + * If this filesystem is inconsistent and has a receive resume + * token, we can not mount it. + */ + if (zfs_prop_get_int(zhp, ZFS_PROP_INCONSISTENT) && + zfs_prop_get(zhp, ZFS_PROP_RECEIVE_RESUME_TOKEN, + NULL, 0, NULL, NULL, 0, B_TRUE) == 0) { + if (!explicit) + return (0); + + (void) fprintf(stderr, gettext("cannot %s '%s': " + "Contains partially-completed state from " + "\"zfs receive -r\", which can be resumed with " + "\"zfs send -t\"\n"), + cmdname, zfs_get_name(zhp)); + return (1); + } + + /* * At this point, we have verified that the mountpoint and/or * shareopts are appropriate for auto management. If the * filesystem is already mounted or shared, return (failing Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c Fri Oct 16 08:06:28 2015 (r289413) @@ -125,7 +125,7 @@ read_hdr(dmu_replay_record_t *drr, zio_c saved_cksum.zc_word[1], saved_cksum.zc_word[2], saved_cksum.zc_word[3]); - exit(1); + return (0); } return (sizeof (*drr)); } @@ -346,8 +346,7 @@ main(int argc, char *argv[]) if (verbose) (void) printf("\n"); - if ((DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) == - DMU_COMPOUNDSTREAM) && drr->drr_payloadlen != 0) { + if (drr->drr_payloadlen != 0) { nvlist_t *nv; int sz = drr->drr_payloadlen; Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Oct 16 08:06:28 2015 (r289413) @@ -621,6 +621,10 @@ typedef boolean_t (snapfilter_cb_t)(zfs_ extern int zfs_send(zfs_handle_t *, const char *, const char *, sendflags_t *, int, snapfilter_cb_t, void *, nvlist_t **); extern int zfs_send_one(zfs_handle_t *, const char *, int, enum lzc_send_flags); +extern int zfs_send_resume(libzfs_handle_t *, sendflags_t *, int outfd, + const char *); +extern nvlist_t *zfs_send_resume_token_to_nvlist(libzfs_handle_t *hdl, + const char *token); extern int zfs_promote(zfs_handle_t *); extern int zfs_hold(zfs_handle_t *, const char *, const char *, @@ -661,6 +665,12 @@ typedef struct recvflags { /* set "canmount=off" on all modified filesystems */ boolean_t canmountoff; + /* + * Mark the file systems as "resumable" and do not destroy them if the + * receive is interrupted + */ + boolean_t resumable; + /* byteswap flag is used internally; callers need not specify */ boolean_t byteswap; Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c Fri Oct 16 08:06:28 2015 (r289413) @@ -74,6 +74,9 @@ zcmd_ioctl(int fd, int request, zfs_cmd_ if (zfs_ioctl_version >= ZFS_IOCVER_DEADMAN) { switch (zfs_ioctl_version) { + case ZFS_IOCVER_EDBP: + cflag = ZFS_CMD_COMPAT_EDBP; + break; case ZFS_IOCVER_ZCMD: cflag = ZFS_CMD_COMPAT_ZCMD; break; Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Oct 16 08:06:28 2015 (r289413) @@ -1778,22 +1778,21 @@ getprop_uint64(zfs_handle_t *zhp, zfs_pr return (value); } -static char * +static const char * getprop_string(zfs_handle_t *zhp, zfs_prop_t prop, char **source) { nvlist_t *nv; - char *value; + const char *value; *source = NULL; if (nvlist_lookup_nvlist(zhp->zfs_props, zfs_prop_to_name(prop), &nv) == 0) { - verify(nvlist_lookup_string(nv, ZPROP_VALUE, &value) == 0); + value = fnvlist_lookup_string(nv, ZPROP_VALUE); (void) nvlist_lookup_string(nv, ZPROP_SOURCE, source); } else { verify(!zhp->zfs_props_table || zhp->zfs_props_table[prop] == B_TRUE); - if ((value = (char *)zfs_prop_default_string(prop)) == NULL) - value = ""; + value = zfs_prop_default_string(prop); *source = ""; } @@ -2195,7 +2194,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop { char *source = NULL; uint64_t val; - char *str; + const char *str; const char *strval; boolean_t received = zfs_is_recvd_props_mode(zhp); @@ -2300,14 +2299,10 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop break; case ZFS_PROP_ORIGIN: - (void) strlcpy(propbuf, getprop_string(zhp, prop, &source), - proplen); - /* - * If there is no parent at all, return failure to indicate that - * it doesn't apply to this dataset. - */ - if (propbuf[0] == '\0') + str = getprop_string(zhp, prop, &source); + if (str == NULL) return (-1); + (void) strlcpy(propbuf, str, proplen); break; case ZFS_PROP_CLONES: @@ -2488,8 +2483,10 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop break; case PROP_TYPE_STRING: - (void) strlcpy(propbuf, - getprop_string(zhp, prop, &source), proplen); + str = getprop_string(zhp, prop, &source); + if (str == NULL) + return (-1); + (void) strlcpy(propbuf, str, proplen); break; case PROP_TYPE_INDEX: Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Fri Oct 16 08:06:28 2015 (r289413) @@ -1072,6 +1072,17 @@ mount_cb(zfs_handle_t *zhp, void *data) return (0); } + /* + * If this filesystem is inconsistent and has a receive resume + * token, we can not mount it. + */ + if (zfs_prop_get_int(zhp, ZFS_PROP_INCONSISTENT) && + zfs_prop_get(zhp, ZFS_PROP_RECEIVE_RESUME_TOKEN, + NULL, 0, NULL, NULL, 0, B_TRUE) == 0) { + zfs_close(zhp); + return (0); + } + libzfs_add_handle(cbp, zhp); if (zfs_iter_filesystems(zhp, mount_cb, cbp) != 0) { zfs_close(zhp); Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Fri Oct 16 08:00:22 2015 (r289412) +++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Fri Oct 16 08:06:28 2015 (r289413) @@ -21,7 +21,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510160806.t9G86TDH037318>