Date: Wed, 2 Dec 2015 01:55:15 +0000 (UTC) From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291636 - in projects/cxl_iscsi: . bin/df bin/ls bin/pkill bin/ps cddl/lib/libzfs cddl/sbin/zfs cddl/sbin/zpool cddl/usr.bin/ctfconvert cddl/usr.bin/ctfdump cddl/usr.bin/ctfmerge cddl/u... Message-ID: <201512020155.tB21tFXA079212@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: np Date: Wed Dec 2 01:55:14 2015 New Revision: 291636 URL: https://svnweb.freebsd.org/changeset/base/291636 Log: Catch up with head. Added: projects/cxl_iscsi/cddl/usr.sbin/plockstat/Makefile.depend - copied unchanged from r291635, head/cddl/usr.sbin/plockstat/Makefile.depend projects/cxl_iscsi/etc/Makefile.depend - copied unchanged from r291635, head/etc/Makefile.depend projects/cxl_iscsi/etc/newsyslog.conf.d/Makefile.depend - copied unchanged from r291635, head/etc/newsyslog.conf.d/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbInitialization/Makefile.depend - copied unchanged from r291635, head/lib/clang/liblldbInitialization/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginABISysV_arm/Makefile.depend - copied unchanged from r291635, head/lib/clang/liblldbPluginABISysV_arm/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend - copied unchanged from r291635, head/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginABISysV_i386/Makefile.depend - copied unchanged from r291635, head/lib/clang/liblldbPluginABISysV_i386/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginABISysV_mips/Makefile.depend - copied unchanged from r291635, head/lib/clang/liblldbPluginABISysV_mips/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend - copied unchanged from r291635, head/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginInstructionMIPS/Makefile.depend - copied unchanged from r291635, head/lib/clang/liblldbPluginInstructionMIPS/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginInstructionMIPS64/Makefile.depend - copied unchanged from r291635, head/lib/clang/liblldbPluginInstructionMIPS64/Makefile.depend projects/cxl_iscsi/lib/lib80211/ - copied from r291635, head/lib/lib80211/ projects/cxl_iscsi/lib/libbsdstat/Makefile.depend - copied unchanged from r291635, head/lib/libbsdstat/Makefile.depend projects/cxl_iscsi/lib/libcasper/Makefile.depend - copied unchanged from r291635, head/lib/libcasper/Makefile.depend projects/cxl_iscsi/lib/libclang_rt/asan-preinit/Makefile.depend - copied unchanged from r291635, head/lib/libclang_rt/asan-preinit/Makefile.depend projects/cxl_iscsi/lib/libclang_rt/asan/Makefile.depend - copied unchanged from r291635, head/lib/libclang_rt/asan/Makefile.depend projects/cxl_iscsi/lib/libclang_rt/asan_cxx/Makefile.depend - copied unchanged from r291635, head/lib/libclang_rt/asan_cxx/Makefile.depend projects/cxl_iscsi/lib/libclang_rt/include/ - copied from r291635, head/lib/libclang_rt/include/ projects/cxl_iscsi/lib/libclang_rt/profile/Makefile.depend - copied unchanged from r291635, head/lib/libclang_rt/profile/Makefile.depend projects/cxl_iscsi/lib/libclang_rt/safestack/Makefile.depend - copied unchanged from r291635, head/lib/libclang_rt/safestack/Makefile.depend projects/cxl_iscsi/lib/libclang_rt/ubsan_standalone/Makefile.depend - copied unchanged from r291635, head/lib/libclang_rt/ubsan_standalone/Makefile.depend projects/cxl_iscsi/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend - copied unchanged from r291635, head/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend projects/cxl_iscsi/lib/libdevctl/Makefile.depend - copied unchanged from r291635, head/lib/libdevctl/Makefile.depend projects/cxl_iscsi/lib/libkvm/kvm_aarch64.h - copied unchanged from r291635, head/lib/libkvm/kvm_aarch64.h projects/cxl_iscsi/lib/libkvm/kvm_amd64.h - copied unchanged from r291635, head/lib/libkvm/kvm_amd64.h projects/cxl_iscsi/lib/libkvm/kvm_arm.h - copied unchanged from r291635, head/lib/libkvm/kvm_arm.h projects/cxl_iscsi/lib/libkvm/kvm_i386.h - copied unchanged from r291635, head/lib/libkvm/kvm_i386.h projects/cxl_iscsi/lib/libkvm/kvm_mips.h - copied unchanged from r291635, head/lib/libkvm/kvm_mips.h projects/cxl_iscsi/lib/libkvm/kvm_native.3 - copied unchanged from r291635, head/lib/libkvm/kvm_native.3 projects/cxl_iscsi/lib/libkvm/kvm_sparc64.h - copied unchanged from r291635, head/lib/libkvm/kvm_sparc64.h projects/cxl_iscsi/lib/libpjdlog/Makefile.depend - copied unchanged from r291635, head/lib/libpjdlog/Makefile.depend projects/cxl_iscsi/lib/librt/Symbol.map - copied unchanged from r291635, head/lib/librt/Symbol.map projects/cxl_iscsi/libexec/casper/dns/Makefile.depend - copied unchanged from r291635, head/libexec/casper/dns/Makefile.depend projects/cxl_iscsi/libexec/casper/grp/Makefile.depend - copied unchanged from r291635, head/libexec/casper/grp/Makefile.depend projects/cxl_iscsi/libexec/casper/pwd/Makefile.depend - copied unchanged from r291635, head/libexec/casper/pwd/Makefile.depend projects/cxl_iscsi/libexec/casper/random/Makefile.depend - copied unchanged from r291635, head/libexec/casper/random/Makefile.depend projects/cxl_iscsi/libexec/casper/sysctl/Makefile.depend - copied unchanged from r291635, head/libexec/casper/sysctl/Makefile.depend projects/cxl_iscsi/libexec/hyperv/Makefile.depend - copied unchanged from r291635, head/libexec/hyperv/Makefile.depend projects/cxl_iscsi/sbin/casperd/Makefile.depend - copied unchanged from r291635, head/sbin/casperd/Makefile.depend projects/cxl_iscsi/secure/lib/libcrypto/engines/libcapi/Makefile.depend - copied unchanged from r291635, head/secure/lib/libcrypto/engines/libcapi/Makefile.depend projects/cxl_iscsi/share/dtrace/Makefile.depend - copied unchanged from r291635, head/share/dtrace/Makefile.depend projects/cxl_iscsi/share/examples/smbfs/Makefile.depend - copied unchanged from r291635, head/share/examples/smbfs/Makefile.depend projects/cxl_iscsi/share/examples/smbfs/print/Makefile.depend - copied unchanged from r291635, head/share/examples/smbfs/print/Makefile.depend projects/cxl_iscsi/share/keys/pkg/trusted/Makefile.depend - copied unchanged from r291635, head/share/keys/pkg/trusted/Makefile.depend projects/cxl_iscsi/share/locale-links/Makefile.depend - copied unchanged from r291635, head/share/locale-links/Makefile.depend projects/cxl_iscsi/share/man/man4/ure.4 - copied unchanged from r291635, head/share/man/man4/ure.4 projects/cxl_iscsi/share/mk/Makefile.depend - copied unchanged from r291635, head/share/mk/Makefile.depend projects/cxl_iscsi/share/vt/fonts/Makefile.depend - copied unchanged from r291635, head/share/vt/fonts/Makefile.depend projects/cxl_iscsi/share/vt/keymaps/Makefile.depend - copied unchanged from r291635, head/share/vt/keymaps/Makefile.depend projects/cxl_iscsi/sys/boot/common/Makefile.depend - copied unchanged from r291635, head/sys/boot/common/Makefile.depend projects/cxl_iscsi/sys/boot/efi/boot1/Makefile.depend - copied unchanged from r291635, head/sys/boot/efi/boot1/Makefile.depend projects/cxl_iscsi/sys/boot/efi/fdt/Makefile.depend - copied unchanged from r291635, head/sys/boot/efi/fdt/Makefile.depend projects/cxl_iscsi/sys/boot/efi/loader/Makefile.depend - copied unchanged from r291635, head/sys/boot/efi/loader/Makefile.depend projects/cxl_iscsi/sys/boot/fdt/Makefile.depend - copied unchanged from r291635, head/sys/boot/fdt/Makefile.depend projects/cxl_iscsi/sys/boot/ficl32/Makefile.depend - copied unchanged from r291635, head/sys/boot/ficl32/Makefile.depend projects/cxl_iscsi/sys/boot/forth/Makefile.depend - copied unchanged from r291635, head/sys/boot/forth/Makefile.depend projects/cxl_iscsi/sys/boot/i386/btx/btx/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/btx/btx/Makefile.depend projects/cxl_iscsi/sys/boot/i386/btx/btxldr/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/btx/btxldr/Makefile.depend projects/cxl_iscsi/sys/boot/i386/btx/lib/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/btx/lib/Makefile.depend projects/cxl_iscsi/sys/boot/i386/cdboot/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/cdboot/Makefile.depend projects/cxl_iscsi/sys/boot/i386/gptboot/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/gptboot/Makefile.depend projects/cxl_iscsi/sys/boot/i386/gptzfsboot/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/gptzfsboot/Makefile.depend projects/cxl_iscsi/sys/boot/i386/kgzldr/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/kgzldr/Makefile.depend projects/cxl_iscsi/sys/boot/i386/libfirewire/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/libfirewire/Makefile.depend projects/cxl_iscsi/sys/boot/i386/libi386/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/libi386/Makefile.depend projects/cxl_iscsi/sys/boot/i386/mbr/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/mbr/Makefile.depend projects/cxl_iscsi/sys/boot/i386/pmbr/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/pmbr/Makefile.depend projects/cxl_iscsi/sys/boot/i386/pxeldr/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/pxeldr/Makefile.depend projects/cxl_iscsi/sys/boot/i386/zfsboot/Makefile.depend - copied unchanged from r291635, head/sys/boot/i386/zfsboot/Makefile.depend projects/cxl_iscsi/sys/boot/libstand32/Makefile.depend - copied unchanged from r291635, head/sys/boot/libstand32/Makefile.depend projects/cxl_iscsi/sys/boot/userboot/ficl/Makefile.depend - copied unchanged from r291635, head/sys/boot/userboot/ficl/Makefile.depend projects/cxl_iscsi/sys/boot/userboot/libstand/Makefile.depend - copied unchanged from r291635, head/sys/boot/userboot/libstand/Makefile.depend projects/cxl_iscsi/sys/boot/userboot/test/Makefile.depend - copied unchanged from r291635, head/sys/boot/userboot/test/Makefile.depend projects/cxl_iscsi/sys/boot/userboot/userboot/Makefile.depend - copied unchanged from r291635, head/sys/boot/userboot/userboot/Makefile.depend projects/cxl_iscsi/sys/boot/userboot/zfs/Makefile.depend - copied unchanged from r291635, head/sys/boot/userboot/zfs/Makefile.depend projects/cxl_iscsi/sys/boot/zfs/Makefile.depend - copied unchanged from r291635, head/sys/boot/zfs/Makefile.depend projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9462_2p0_initvals.h - copied unchanged from r291635, head/sys/contrib/dev/ath/ath_hal/ar9300/ar9462_2p0_initvals.h projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9462_2p1_initvals.h - copied unchanged from r291635, head/sys/contrib/dev/ath/ath_hal/ar9300/ar9462_2p1_initvals.h projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar953x.ini - copied unchanged from r291635, head/sys/contrib/dev/ath/ath_hal/ar9300/ar953x.ini projects/cxl_iscsi/sys/dev/usb/net/if_ure.c - copied unchanged from r291635, head/sys/dev/usb/net/if_ure.c projects/cxl_iscsi/sys/dev/usb/net/if_urereg.h - copied unchanged from r291635, head/sys/dev/usb/net/if_urereg.h projects/cxl_iscsi/sys/modules/usb/ure/ - copied from r291635, head/sys/modules/usb/ure/ projects/cxl_iscsi/sys/powerpc/mpc85xx/qoriq_gpio.c - copied unchanged from r291635, head/sys/powerpc/mpc85xx/qoriq_gpio.c projects/cxl_iscsi/usr.bin/dpv/Makefile.depend - copied unchanged from r291635, head/usr.bin/dpv/Makefile.depend projects/cxl_iscsi/usr.bin/drill/Makefile.depend - copied unchanged from r291635, head/usr.bin/drill/Makefile.depend projects/cxl_iscsi/usr.bin/dtc/Makefile.depend - copied unchanged from r291635, head/usr.bin/dtc/Makefile.depend projects/cxl_iscsi/usr.bin/iconv/Makefile.depend - copied unchanged from r291635, head/usr.bin/iconv/Makefile.depend projects/cxl_iscsi/usr.bin/ident/Makefile.depend - copied unchanged from r291635, head/usr.bin/ident/Makefile.depend projects/cxl_iscsi/usr.bin/iscsictl/Makefile.depend - copied unchanged from r291635, head/usr.bin/iscsictl/Makefile.depend projects/cxl_iscsi/usr.bin/mkcsmapper/Makefile.depend - copied unchanged from r291635, head/usr.bin/mkcsmapper/Makefile.depend projects/cxl_iscsi/usr.bin/mkesdb/Makefile.depend - copied unchanged from r291635, head/usr.bin/mkesdb/Makefile.depend projects/cxl_iscsi/usr.bin/mkimg/Makefile.depend - copied unchanged from r291635, head/usr.bin/mkimg/Makefile.depend projects/cxl_iscsi/usr.bin/patch/Makefile.depend - copied unchanged from r291635, head/usr.bin/patch/Makefile.depend projects/cxl_iscsi/usr.bin/protect/Makefile.depend - copied unchanged from r291635, head/usr.bin/protect/Makefile.depend projects/cxl_iscsi/usr.bin/send-pr/Makefile.depend - copied unchanged from r291635, head/usr.bin/send-pr/Makefile.depend projects/cxl_iscsi/usr.bin/soelim/Makefile.depend - copied unchanged from r291635, head/usr.bin/soelim/Makefile.depend projects/cxl_iscsi/usr.bin/vi/catalog/Makefile.depend - copied unchanged from r291635, head/usr.bin/vi/catalog/Makefile.depend projects/cxl_iscsi/usr.bin/xo/Makefile.depend - copied unchanged from r291635, head/usr.bin/xo/Makefile.depend projects/cxl_iscsi/usr.sbin/auditdistd/Makefile.depend - copied unchanged from r291635, head/usr.sbin/auditdistd/Makefile.depend projects/cxl_iscsi/usr.sbin/autofs/Makefile.depend - copied unchanged from r291635, head/usr.sbin/autofs/Makefile.depend projects/cxl_iscsi/usr.sbin/bhyvectl/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bhyvectl/Makefile.depend projects/cxl_iscsi/usr.sbin/bhyveload/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bhyveload/Makefile.depend projects/cxl_iscsi/usr.sbin/binmiscctl/Makefile.depend - copied unchanged from r291635, head/usr.sbin/binmiscctl/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/console/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/console/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/console/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/console/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/diskmgmt/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/diskmgmt/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/diskmgmt/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/diskmgmt/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/docsinstall/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/docsinstall/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/docsinstall/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/docsinstall/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/dot/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/dot/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/dot/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/dot/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/examples/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/examples/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/includes/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/includes/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/includes/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/includes/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/mouse/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/mouse/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/mouse/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/mouse/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/networking/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/networking/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/networking/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/networking/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/networking/share/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/networking/share/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/password/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/password/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/password/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/password/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/password/share/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/password/share/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/security/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/security/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/security/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/security/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/share/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/share/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/share/media/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/share/media/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/startup/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/startup/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/startup/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/startup/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/startup/share/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/startup/share/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/timezone/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/timezone/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/timezone/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/timezone/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/timezone/share/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/timezone/share/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/ttys/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/ttys/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/ttys/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/ttys/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/usermgmt/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/usermgmt/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/usermgmt/include/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/usermgmt/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bsdconfig/usermgmt/share/Makefile.depend - copied unchanged from r291635, head/usr.sbin/bsdconfig/usermgmt/share/Makefile.depend projects/cxl_iscsi/usr.sbin/ctld/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ctld/Makefile.depend projects/cxl_iscsi/usr.sbin/devctl/Makefile.depend - copied unchanged from r291635, head/usr.sbin/devctl/Makefile.depend projects/cxl_iscsi/usr.sbin/fstyp/Makefile.depend - copied unchanged from r291635, head/usr.sbin/fstyp/Makefile.depend projects/cxl_iscsi/usr.sbin/ftp-proxy/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ftp-proxy/Makefile.depend projects/cxl_iscsi/usr.sbin/hyperv/tools/Makefile.depend - copied unchanged from r291635, head/usr.sbin/hyperv/tools/Makefile.depend projects/cxl_iscsi/usr.sbin/iovctl/Makefile.depend - copied unchanged from r291635, head/usr.sbin/iovctl/Makefile.depend projects/cxl_iscsi/usr.sbin/iscsid/Makefile.depend - copied unchanged from r291635, head/usr.sbin/iscsid/Makefile.depend projects/cxl_iscsi/usr.sbin/ntp/doc/drivers/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ntp/doc/drivers/Makefile.depend projects/cxl_iscsi/usr.sbin/ntp/doc/drivers/icons/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ntp/doc/drivers/icons/Makefile.depend projects/cxl_iscsi/usr.sbin/ntp/doc/drivers/scripts/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ntp/doc/drivers/scripts/Makefile.depend projects/cxl_iscsi/usr.sbin/ntp/doc/hints/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ntp/doc/hints/Makefile.depend projects/cxl_iscsi/usr.sbin/ntp/doc/icons/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ntp/doc/icons/Makefile.depend projects/cxl_iscsi/usr.sbin/ntp/doc/pic/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ntp/doc/pic/Makefile.depend projects/cxl_iscsi/usr.sbin/ntp/doc/scripts/Makefile.depend - copied unchanged from r291635, head/usr.sbin/ntp/doc/scripts/Makefile.depend projects/cxl_iscsi/usr.sbin/sysrc/Makefile.depend - copied unchanged from r291635, head/usr.sbin/sysrc/Makefile.depend projects/cxl_iscsi/usr.sbin/uefisign/Makefile.depend - copied unchanged from r291635, head/usr.sbin/uefisign/Makefile.depend projects/cxl_iscsi/usr.sbin/unbound/anchor/Makefile.depend - copied unchanged from r291635, head/usr.sbin/unbound/anchor/Makefile.depend projects/cxl_iscsi/usr.sbin/unbound/checkconf/Makefile.depend - copied unchanged from r291635, head/usr.sbin/unbound/checkconf/Makefile.depend projects/cxl_iscsi/usr.sbin/unbound/control/Makefile.depend - copied unchanged from r291635, head/usr.sbin/unbound/control/Makefile.depend projects/cxl_iscsi/usr.sbin/unbound/daemon/Makefile.depend - copied unchanged from r291635, head/usr.sbin/unbound/daemon/Makefile.depend projects/cxl_iscsi/usr.sbin/unbound/local-setup/Makefile.depend - copied unchanged from r291635, head/usr.sbin/unbound/local-setup/Makefile.depend projects/cxl_iscsi/usr.sbin/vigr/Makefile.depend - copied unchanged from r291635, head/usr.sbin/vigr/Makefile.depend Deleted: projects/cxl_iscsi/lib/libkvm/kvm_aarch64.c projects/cxl_iscsi/lib/libkvm/kvm_mips.c projects/cxl_iscsi/lib/libkvm/kvm_sparc.c projects/cxl_iscsi/lib/librt/Version.map projects/cxl_iscsi/sbin/ifconfig/regdomain.c projects/cxl_iscsi/sbin/ifconfig/regdomain.h Modified: projects/cxl_iscsi/Makefile projects/cxl_iscsi/Makefile.inc1 projects/cxl_iscsi/ObsoleteFiles.inc projects/cxl_iscsi/UPDATING projects/cxl_iscsi/bin/df/df.1 projects/cxl_iscsi/bin/ls/ls.1 projects/cxl_iscsi/bin/pkill/Makefile.depend projects/cxl_iscsi/bin/ps/Makefile.depend projects/cxl_iscsi/bin/ps/ps.1 projects/cxl_iscsi/cddl/lib/libzfs/Makefile.depend projects/cxl_iscsi/cddl/sbin/zfs/Makefile.depend projects/cxl_iscsi/cddl/sbin/zpool/Makefile.depend projects/cxl_iscsi/cddl/usr.bin/ctfconvert/Makefile.depend projects/cxl_iscsi/cddl/usr.bin/ctfdump/Makefile.depend projects/cxl_iscsi/cddl/usr.bin/ctfmerge/Makefile.depend projects/cxl_iscsi/cddl/usr.sbin/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile.depend projects/cxl_iscsi/contrib/netbsd-tests/lib/libcrypt/t_crypt.c projects/cxl_iscsi/contrib/wpa/src/drivers/driver_bsd.c projects/cxl_iscsi/crypto/openssh/pathnames.h projects/cxl_iscsi/etc/Makefile projects/cxl_iscsi/etc/defaults/rc.conf projects/cxl_iscsi/etc/mtree/BSD.include.dist projects/cxl_iscsi/etc/mtree/BSD.usr.dist projects/cxl_iscsi/etc/rc.d/local_unbound projects/cxl_iscsi/etc/rc.d/nfsd projects/cxl_iscsi/etc/rc.d/nfsuserd projects/cxl_iscsi/etc/rc.d/rctl projects/cxl_iscsi/gnu/lib/libssp/Makefile.depend projects/cxl_iscsi/gnu/usr.bin/diff/Makefile.depend projects/cxl_iscsi/gnu/usr.bin/dtc/Makefile projects/cxl_iscsi/gnu/usr.bin/dtc/Makefile.depend projects/cxl_iscsi/gnu/usr.bin/gdb/kgdb/Makefile projects/cxl_iscsi/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 projects/cxl_iscsi/gnu/usr.bin/gdb/kgdb/main.c projects/cxl_iscsi/gnu/usr.bin/gdb/kgdb/trgt.c projects/cxl_iscsi/gnu/usr.bin/gperf/Makefile.depend projects/cxl_iscsi/gnu/usr.bin/grep/Makefile.depend projects/cxl_iscsi/lib/Makefile projects/cxl_iscsi/lib/clang/Makefile projects/cxl_iscsi/lib/clang/clang.build.mk projects/cxl_iscsi/lib/clang/include/Makefile projects/cxl_iscsi/lib/clang/include/Makefile.depend projects/cxl_iscsi/lib/clang/libclanganalysis/Makefile.depend projects/cxl_iscsi/lib/clang/libclangast/Makefile.depend projects/cxl_iscsi/lib/clang/libclangbasic/Makefile.depend projects/cxl_iscsi/lib/clang/libclangcodegen/Makefile.depend projects/cxl_iscsi/lib/clang/libclangdriver/Makefile.depend projects/cxl_iscsi/lib/clang/libclanglex/Makefile.depend projects/cxl_iscsi/lib/clang/libclangparse/Makefile.depend projects/cxl_iscsi/lib/clang/libclangstaticanalyzercheckers/Makefile.depend projects/cxl_iscsi/lib/clang/libclangstaticanalyzercore/Makefile.depend projects/cxl_iscsi/lib/clang/liblldb/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbAPI/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbBreakpoint/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbCommands/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbCore/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbDataFormatters/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbExpression/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbHostCommon/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbHostFreeBSD/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbInterpreter/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginObjectFileELF/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginPlatformGDB/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginProcessElfCore/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginProcessUtility/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbSymbol/Makefile.depend projects/cxl_iscsi/lib/clang/liblldbTarget/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmaarch64codegen/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmaarch64disassembler/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmanalysis/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmarmcodegen/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmcodegen/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmcore/Makefile.depend projects/cxl_iscsi/lib/clang/libllvminstrumentation/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmipa/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmipo/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmmipscodegen/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmobjcarcopts/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmpowerpccodegen/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmscalaropts/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmtarget/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmtransformutils/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmx86codegen/Makefile.depend projects/cxl_iscsi/lib/clang/libllvmx86disassembler/Makefile.depend projects/cxl_iscsi/lib/libarchive/Makefile projects/cxl_iscsi/lib/libarchive/tests/Makefile projects/cxl_iscsi/lib/libauditd/Makefile projects/cxl_iscsi/lib/libbsm/Makefile projects/cxl_iscsi/lib/libc++/Makefile projects/cxl_iscsi/lib/libc++/Makefile.depend projects/cxl_iscsi/lib/libclang_rt/Makefile projects/cxl_iscsi/lib/libclang_rt/Makefile.inc projects/cxl_iscsi/lib/libcrypt/tests/Makefile projects/cxl_iscsi/lib/libelf/Makefile projects/cxl_iscsi/lib/libevent/Makefile.depend projects/cxl_iscsi/lib/libfetch/fetch.3 projects/cxl_iscsi/lib/libfetch/http.c projects/cxl_iscsi/lib/libkvm/Makefile projects/cxl_iscsi/lib/libkvm/Makefile.depend projects/cxl_iscsi/lib/libkvm/kvm.3 projects/cxl_iscsi/lib/libkvm/kvm.c projects/cxl_iscsi/lib/libkvm/kvm.h projects/cxl_iscsi/lib/libkvm/kvm_amd64.c projects/cxl_iscsi/lib/libkvm/kvm_arm.c projects/cxl_iscsi/lib/libkvm/kvm_cptime.c projects/cxl_iscsi/lib/libkvm/kvm_file.c projects/cxl_iscsi/lib/libkvm/kvm_getloadavg.c projects/cxl_iscsi/lib/libkvm/kvm_getswapinfo.c projects/cxl_iscsi/lib/libkvm/kvm_i386.c projects/cxl_iscsi/lib/libkvm/kvm_minidump_aarch64.c projects/cxl_iscsi/lib/libkvm/kvm_minidump_amd64.c projects/cxl_iscsi/lib/libkvm/kvm_minidump_arm.c projects/cxl_iscsi/lib/libkvm/kvm_minidump_i386.c projects/cxl_iscsi/lib/libkvm/kvm_minidump_mips.c projects/cxl_iscsi/lib/libkvm/kvm_nlist.3 projects/cxl_iscsi/lib/libkvm/kvm_open.3 projects/cxl_iscsi/lib/libkvm/kvm_pcpu.c projects/cxl_iscsi/lib/libkvm/kvm_powerpc.c projects/cxl_iscsi/lib/libkvm/kvm_powerpc64.c projects/cxl_iscsi/lib/libkvm/kvm_private.h projects/cxl_iscsi/lib/libkvm/kvm_proc.c projects/cxl_iscsi/lib/libkvm/kvm_read.3 projects/cxl_iscsi/lib/libkvm/kvm_sparc64.c projects/cxl_iscsi/lib/libkvm/kvm_vnet.c projects/cxl_iscsi/lib/libpmc/libpmc.c projects/cxl_iscsi/lib/librt/Makefile projects/cxl_iscsi/lib/libunbound/Makefile.depend projects/cxl_iscsi/lib/msun/Makefile projects/cxl_iscsi/libexec/bootpd/Makefile.depend projects/cxl_iscsi/libexec/dma/dmagent/Makefile.depend projects/cxl_iscsi/libexec/rpc.rstatd/Makefile.depend projects/cxl_iscsi/libexec/rtld-elf/Makefile projects/cxl_iscsi/rescue/rescue/Makefile projects/cxl_iscsi/sbin/ddb/Makefile.depend projects/cxl_iscsi/sbin/dmesg/Makefile.depend projects/cxl_iscsi/sbin/ifconfig/Makefile projects/cxl_iscsi/sbin/ifconfig/Makefile.depend projects/cxl_iscsi/sbin/ifconfig/ifieee80211.c projects/cxl_iscsi/sbin/ipf/Makefile.inc projects/cxl_iscsi/sbin/ipf/ipf/Makefile.depend projects/cxl_iscsi/sbin/ipf/ipfs/Makefile.depend projects/cxl_iscsi/sbin/ipf/ipfstat/Makefile.depend projects/cxl_iscsi/sbin/ipf/ipftest/Makefile.depend projects/cxl_iscsi/sbin/ipf/ipmon/Makefile.depend projects/cxl_iscsi/sbin/ipf/ipnat/Makefile.depend projects/cxl_iscsi/sbin/ipf/ippool/Makefile.depend projects/cxl_iscsi/sbin/ipf/ipresend/Makefile.depend projects/cxl_iscsi/sbin/newfs_msdos/mkfs_msdos.c projects/cxl_iscsi/sbin/newfs_msdos/newfs_msdos.c projects/cxl_iscsi/sbin/routed/Makefile.depend projects/cxl_iscsi/sbin/savecore/savecore.8 projects/cxl_iscsi/share/examples/libvgl/Makefile.depend projects/cxl_iscsi/share/man/man4/Makefile projects/cxl_iscsi/share/man/man4/ispfw.4 projects/cxl_iscsi/share/man/man4/miibus.4 projects/cxl_iscsi/share/man/man5/src.conf.5 projects/cxl_iscsi/share/mk/bsd.dep.mk projects/cxl_iscsi/share/mk/bsd.libnames.mk projects/cxl_iscsi/share/mk/bsd.subdir.mk projects/cxl_iscsi/share/mk/local.dirdeps.mk projects/cxl_iscsi/share/mk/local.gendirdeps.mk projects/cxl_iscsi/share/mk/local.meta.sys.mk projects/cxl_iscsi/share/mk/src.libnames.mk projects/cxl_iscsi/share/mk/src.sys.mk projects/cxl_iscsi/sys/amd64/amd64/elf_machdep.c projects/cxl_iscsi/sys/amd64/conf/GENERIC projects/cxl_iscsi/sys/amd64/linux/linux_sysvec.c projects/cxl_iscsi/sys/amd64/linux32/linux32_sysvec.c projects/cxl_iscsi/sys/arm/arm/cpufunc.c projects/cxl_iscsi/sys/arm/arm/elf_machdep.c projects/cxl_iscsi/sys/arm/arm/gic.c projects/cxl_iscsi/sys/arm/arm/identcpu.c projects/cxl_iscsi/sys/arm/arm/pmap-v6-new.c projects/cxl_iscsi/sys/arm/freescale/imx/imx6_anatop.c projects/cxl_iscsi/sys/arm/freescale/imx/imx6_machdep.c projects/cxl_iscsi/sys/arm/freescale/imx/imx_machdep.c projects/cxl_iscsi/sys/arm/freescale/imx/imx_machdep.h projects/cxl_iscsi/sys/arm/freescale/imx/imx_wdogreg.h projects/cxl_iscsi/sys/arm/include/armreg.h projects/cxl_iscsi/sys/arm/include/atomic-v4.h projects/cxl_iscsi/sys/arm/include/atomic-v6.h projects/cxl_iscsi/sys/arm/include/atomic.h projects/cxl_iscsi/sys/arm/include/pte-v6.h projects/cxl_iscsi/sys/arm/include/vm.h projects/cxl_iscsi/sys/arm/samsung/exynos/exynos5_combiner.c projects/cxl_iscsi/sys/arm/samsung/exynos/exynos5_ehci.c projects/cxl_iscsi/sys/arm/samsung/exynos/exynos5_pad.c projects/cxl_iscsi/sys/arm64/arm64/elf_machdep.c projects/cxl_iscsi/sys/arm64/arm64/exception.S projects/cxl_iscsi/sys/arm64/arm64/genassym.c projects/cxl_iscsi/sys/arm64/arm64/gic_v3.c projects/cxl_iscsi/sys/arm64/arm64/support.S projects/cxl_iscsi/sys/arm64/arm64/trap.c projects/cxl_iscsi/sys/arm64/include/atomic.h projects/cxl_iscsi/sys/boot/common/disk.c projects/cxl_iscsi/sys/boot/common/disk.h projects/cxl_iscsi/sys/boot/i386/boot2/Makefile.depend projects/cxl_iscsi/sys/boot/i386/loader/Makefile.depend projects/cxl_iscsi/sys/boot/i386/zfsloader/Makefile.depend projects/cxl_iscsi/sys/boot/kshim/bsd_busspace.c projects/cxl_iscsi/sys/boot/kshim/bsd_global.h projects/cxl_iscsi/sys/boot/kshim/bsd_kernel.c projects/cxl_iscsi/sys/boot/kshim/bsd_kernel.h projects/cxl_iscsi/sys/boot/ofw/libofw/ppc64_elf_freebsd.c projects/cxl_iscsi/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c projects/cxl_iscsi/sys/boot/powerpc/ps3/ppc64_elf_freebsd.c projects/cxl_iscsi/sys/boot/usb/storage/umass_common.c projects/cxl_iscsi/sys/boot/usb/storage/umass_loader.c projects/cxl_iscsi/sys/boot/usb/usb_busdma_loader.c projects/cxl_iscsi/sys/boot/usb/usbcore.mk projects/cxl_iscsi/sys/cam/ctl/ctl.c projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/cxl_iscsi/sys/compat/ia32/ia32_sysvec.c projects/cxl_iscsi/sys/compat/linuxkpi/common/include/linux/file.h projects/cxl_iscsi/sys/compat/linuxkpi/common/include/linux/workqueue.h projects/cxl_iscsi/sys/compat/svr4/svr4_sysvec.c projects/cxl_iscsi/sys/conf/NOTES projects/cxl_iscsi/sys/conf/files projects/cxl_iscsi/sys/conf/files.powerpc projects/cxl_iscsi/sys/conf/kern.pre.mk projects/cxl_iscsi/sys/conf/kmod.mk projects/cxl_iscsi/sys/conf/ldscript.powerpc64 projects/cxl_iscsi/sys/conf/options projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radar.c projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/cxl_iscsi/sys/contrib/dev/ath/ath_hal/ar9300/ar9300reg.h projects/cxl_iscsi/sys/ddb/db_run.c projects/cxl_iscsi/sys/dev/ahci/ahci.c projects/cxl_iscsi/sys/dev/ahci/ahci.h projects/cxl_iscsi/sys/dev/ath/ath_hal/ah.c projects/cxl_iscsi/sys/dev/ath/ath_hal/ah_devid.h projects/cxl_iscsi/sys/dev/ath/ath_hal/ah_internal.h projects/cxl_iscsi/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h projects/cxl_iscsi/sys/dev/ath/if_ath_tx_ht.c projects/cxl_iscsi/sys/dev/drm2/i915/i915_debug.c projects/cxl_iscsi/sys/dev/drm2/i915/i915_dma.c projects/cxl_iscsi/sys/dev/drm2/i915/i915_drm.h projects/cxl_iscsi/sys/dev/hwpmc/hwpmc_core.c projects/cxl_iscsi/sys/dev/hwpmc/hwpmc_intel.c projects/cxl_iscsi/sys/dev/hwpmc/pmc_events.h projects/cxl_iscsi/sys/dev/isp/isp.c projects/cxl_iscsi/sys/dev/isp/isp_freebsd.c projects/cxl_iscsi/sys/dev/isp/isp_freebsd.h projects/cxl_iscsi/sys/dev/isp/isp_library.c projects/cxl_iscsi/sys/dev/isp/isp_pci.c projects/cxl_iscsi/sys/dev/isp/ispvar.h projects/cxl_iscsi/sys/dev/sfxge/common/efsys.h projects/cxl_iscsi/sys/dev/sfxge/common/efx.h projects/cxl_iscsi/sys/dev/sfxge/common/efx_bootcfg.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_ev.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_filter.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_impl.h projects/cxl_iscsi/sys/dev/sfxge/common/efx_intr.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_mac.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_mcdi.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_mcdi.h projects/cxl_iscsi/sys/dev/sfxge/common/efx_mon.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_nic.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_nvram.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_phy.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_port.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_rx.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_sram.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_tx.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_vpd.c projects/cxl_iscsi/sys/dev/sfxge/common/efx_wol.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_ev.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_filter.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_impl.h projects/cxl_iscsi/sys/dev/sfxge/common/hunt_intr.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_mac.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_mcdi.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_nic.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_nvram.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_phy.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_rx.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_sram.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_tx.c projects/cxl_iscsi/sys/dev/sfxge/common/hunt_vpd.c projects/cxl_iscsi/sys/dev/sfxge/common/mcdi_mon.c projects/cxl_iscsi/sys/dev/sfxge/common/mcdi_mon.h projects/cxl_iscsi/sys/dev/sfxge/common/siena_flash.h projects/cxl_iscsi/sys/dev/sfxge/common/siena_impl.h projects/cxl_iscsi/sys/dev/sfxge/common/siena_mac.c projects/cxl_iscsi/sys/dev/sfxge/common/siena_mcdi.c projects/cxl_iscsi/sys/dev/sfxge/common/siena_nic.c projects/cxl_iscsi/sys/dev/sfxge/common/siena_nvram.c projects/cxl_iscsi/sys/dev/sfxge/common/siena_phy.c projects/cxl_iscsi/sys/dev/sfxge/common/siena_sram.c projects/cxl_iscsi/sys/dev/sfxge/common/siena_vpd.c projects/cxl_iscsi/sys/dev/sfxge/sfxge.c projects/cxl_iscsi/sys/dev/sfxge/sfxge_tx.c projects/cxl_iscsi/sys/dev/sfxge/sfxge_tx.h projects/cxl_iscsi/sys/dev/usb/usbdevs projects/cxl_iscsi/sys/dev/wpi/if_wpi.c projects/cxl_iscsi/sys/fs/nfs/nfs.h projects/cxl_iscsi/sys/fs/nfs/nfs_commonport.c projects/cxl_iscsi/sys/fs/nfs/nfs_commonsubs.c projects/cxl_iscsi/sys/fs/nfs/nfs_var.h projects/cxl_iscsi/sys/fs/nfs/nfsport.h projects/cxl_iscsi/sys/fs/nfs/nfsrvstate.h projects/cxl_iscsi/sys/fs/nfsclient/nfs_clnode.c projects/cxl_iscsi/sys/fs/nfsclient/nfs_clport.c projects/cxl_iscsi/sys/fs/nfsserver/nfs_nfsdport.c projects/cxl_iscsi/sys/i386/conf/GENERIC projects/cxl_iscsi/sys/i386/conf/NOTES projects/cxl_iscsi/sys/i386/i386/elf_machdep.c projects/cxl_iscsi/sys/i386/i386/machdep.c projects/cxl_iscsi/sys/i386/linux/linux_sysvec.c projects/cxl_iscsi/sys/kern/imgact_aout.c projects/cxl_iscsi/sys/kern/imgact_elf.c projects/cxl_iscsi/sys/kern/init_main.c projects/cxl_iscsi/sys/kern/subr_capability.c projects/cxl_iscsi/sys/kern/vfs_subr.c projects/cxl_iscsi/sys/mips/conf/AP143.hints projects/cxl_iscsi/sys/mips/conf/QCA953X_BASE projects/cxl_iscsi/sys/mips/conf/QCA953X_BASE.hints projects/cxl_iscsi/sys/mips/mips/elf_machdep.c projects/cxl_iscsi/sys/mips/mips/freebsd32_machdep.c projects/cxl_iscsi/sys/modules/Makefile projects/cxl_iscsi/sys/modules/uart/Makefile projects/cxl_iscsi/sys/modules/usb/Makefile projects/cxl_iscsi/sys/net/route.c projects/cxl_iscsi/sys/net/route.h projects/cxl_iscsi/sys/netinet/igmp.c projects/cxl_iscsi/sys/netinet/in_rmx.c projects/cxl_iscsi/sys/netinet/sctp_output.c projects/cxl_iscsi/sys/netinet/sctp_usrreq.c projects/cxl_iscsi/sys/netinet/sctputil.c projects/cxl_iscsi/sys/netinet6/mld6.c projects/cxl_iscsi/sys/netinet6/nd6.c projects/cxl_iscsi/sys/netinet6/nd6_rtr.c projects/cxl_iscsi/sys/nfs/nfssvc.h projects/cxl_iscsi/sys/pc98/conf/GENERIC projects/cxl_iscsi/sys/pc98/conf/NOTES projects/cxl_iscsi/sys/powerpc/aim/locore64.S projects/cxl_iscsi/sys/powerpc/conf/GENERIC projects/cxl_iscsi/sys/powerpc/include/asm.h projects/cxl_iscsi/sys/powerpc/include/spr.h projects/cxl_iscsi/sys/powerpc/powerpc/elf32_machdep.c projects/cxl_iscsi/sys/powerpc/powerpc/elf64_machdep.c projects/cxl_iscsi/sys/powerpc/powerpc/exec_machdep.c projects/cxl_iscsi/sys/powerpc/powerpc/swtch64.S projects/cxl_iscsi/sys/powerpc/powerpc/trap.c projects/cxl_iscsi/sys/powerpc/powerpc/vm_machdep.c projects/cxl_iscsi/sys/sparc64/conf/GENERIC projects/cxl_iscsi/sys/sparc64/include/kerneldump.h projects/cxl_iscsi/sys/sparc64/sparc64/elf_machdep.c projects/cxl_iscsi/sys/sys/param.h projects/cxl_iscsi/sys/sys/pmc.h projects/cxl_iscsi/sys/sys/sysent.h projects/cxl_iscsi/sys/sys/vnode.h projects/cxl_iscsi/sys/ufs/ffs/ffs_vfsops.c projects/cxl_iscsi/sys/vm/device_pager.c projects/cxl_iscsi/sys/vm/vm_object.c projects/cxl_iscsi/sys/vm/vm_pageout.c projects/cxl_iscsi/sys/vm/vm_reserv.c projects/cxl_iscsi/targets/pseudo/bootstrap-tools/Makefile projects/cxl_iscsi/targets/pseudo/userland/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/cddl/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/gnu/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/lib/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/libexec/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/misc/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/secure/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/share/Makefile.depend projects/cxl_iscsi/tests/sys/mqueue/Makefile projects/cxl_iscsi/tests/sys/mqueue/mqueue_test.sh projects/cxl_iscsi/tools/bsdbox/Makefile.net projects/cxl_iscsi/tools/build/mk/OptionalObsoleteFiles.inc projects/cxl_iscsi/tools/build/options/makeman projects/cxl_iscsi/tools/regression/lib/libc/nss/mach projects/cxl_iscsi/tools/regression/lib/libc/nss/test-getaddr.c projects/cxl_iscsi/tools/regression/lib/libc/nss/test-getgr.c projects/cxl_iscsi/tools/regression/lib/libc/nss/test-gethostby.c projects/cxl_iscsi/tools/regression/lib/libc/nss/test-getproto.c projects/cxl_iscsi/tools/regression/lib/libc/nss/test-getpw.c projects/cxl_iscsi/tools/regression/lib/libc/nss/test-getrpc.c projects/cxl_iscsi/tools/regression/lib/libc/nss/test-getserv.c projects/cxl_iscsi/tools/regression/lib/libc/nss/test-getusershell.c projects/cxl_iscsi/tools/regression/lib/libc/nss/testutil.h projects/cxl_iscsi/tools/regression/lib/libc/resolv/mach projects/cxl_iscsi/tools/regression/lib/libc/resolv/resolv.c projects/cxl_iscsi/usr.bin/bluetooth/btsockstat/Makefile.depend projects/cxl_iscsi/usr.bin/clang/clang-tblgen/Makefile.depend projects/cxl_iscsi/usr.bin/clang/clang/Makefile.depend projects/cxl_iscsi/usr.bin/clang/lldb/Makefile.depend projects/cxl_iscsi/usr.bin/clang/tblgen/Makefile.depend projects/cxl_iscsi/usr.bin/cpio/Makefile projects/cxl_iscsi/usr.bin/cpio/tests/Makefile projects/cxl_iscsi/usr.bin/ipcrm/Makefile.depend projects/cxl_iscsi/usr.bin/ipcs/Makefile.depend projects/cxl_iscsi/usr.bin/iscsictl/iscsictl.8 projects/cxl_iscsi/usr.bin/ktrdump/Makefile.depend projects/cxl_iscsi/usr.bin/lex/Makefile.depend projects/cxl_iscsi/usr.bin/netstat/Makefile.depend projects/cxl_iscsi/usr.bin/netstat/netstat.1 projects/cxl_iscsi/usr.bin/netstat/route.c projects/cxl_iscsi/usr.bin/nfsstat/Makefile.depend projects/cxl_iscsi/usr.bin/rctl/rctl.8 projects/cxl_iscsi/usr.bin/rctl/rctl.c projects/cxl_iscsi/usr.bin/smbutil/Makefile.depend projects/cxl_iscsi/usr.bin/svn/lib/libsvn_delta/Makefile.depend projects/cxl_iscsi/usr.bin/svn/lib/libsvn_subr/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svn/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnadmin/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnbench/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svndumpfilter/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnfsfs/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnlook/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnmucc/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnrdump/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnserve/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnsync/Makefile.depend projects/cxl_iscsi/usr.bin/svn/svnversion/Makefile.depend projects/cxl_iscsi/usr.bin/systat/Makefile.depend projects/cxl_iscsi/usr.bin/tar/Makefile projects/cxl_iscsi/usr.bin/tar/tests/Makefile projects/cxl_iscsi/usr.bin/top/Makefile.depend projects/cxl_iscsi/usr.bin/vmstat/Makefile.depend projects/cxl_iscsi/usr.bin/vmstat/vmstat.c projects/cxl_iscsi/usr.bin/w/Makefile.depend projects/cxl_iscsi/usr.bin/w/w.1 projects/cxl_iscsi/usr.bin/wc/wc.1 projects/cxl_iscsi/usr.sbin/asf/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend projects/cxl_iscsi/usr.sbin/dconschat/Makefile.depend projects/cxl_iscsi/usr.sbin/gstat/Makefile.depend projects/cxl_iscsi/usr.sbin/iostat/Makefile.depend projects/cxl_iscsi/usr.sbin/jail/Makefile.depend projects/cxl_iscsi/usr.sbin/kbdmap/kbdmap.c projects/cxl_iscsi/usr.sbin/kgmon/Makefile.depend projects/cxl_iscsi/usr.sbin/mount_smbfs/Makefile.depend projects/cxl_iscsi/usr.sbin/nfsuserd/nfsuserd.8 projects/cxl_iscsi/usr.sbin/nfsuserd/nfsuserd.c projects/cxl_iscsi/usr.sbin/pstat/Makefile.depend Directory Properties: projects/cxl_iscsi/ (props changed) projects/cxl_iscsi/cddl/ (props changed) projects/cxl_iscsi/contrib/wpa/ (props changed) projects/cxl_iscsi/crypto/openssh/ (props changed) projects/cxl_iscsi/gnu/lib/ (props changed) projects/cxl_iscsi/gnu/usr.bin/gdb/ (props changed) projects/cxl_iscsi/sbin/ (props changed) projects/cxl_iscsi/share/ (props changed) projects/cxl_iscsi/share/man/man4/ (props changed) projects/cxl_iscsi/sys/ (props changed) projects/cxl_iscsi/sys/boot/ (props changed) projects/cxl_iscsi/sys/boot/powerpc/kboot/ (props changed) projects/cxl_iscsi/sys/cddl/contrib/opensolaris/ (props changed) projects/cxl_iscsi/sys/conf/ (props changed) projects/cxl_iscsi/targets/ (props changed) projects/cxl_iscsi/usr.bin/mkimg/ (props changed) projects/cxl_iscsi/usr.sbin/bhyvectl/ (props changed) projects/cxl_iscsi/usr.sbin/bhyveload/ (props changed) projects/cxl_iscsi/usr.sbin/jail/ (props changed) Modified: projects/cxl_iscsi/Makefile ============================================================================== --- projects/cxl_iscsi/Makefile Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/Makefile Wed Dec 2 01:55:14 2015 (r291636) @@ -323,21 +323,21 @@ bmake: .PHONY @echo ">>> Building an up-to-date ${.TARGET}(1)" @echo "--------------------------------------------------------------" ${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \ - ${MMAKE} obj && \ - ${MMAKE} depend && \ - ${MMAKE} all && \ + ${MMAKE} obj; \ + ${MMAKE} depend; \ + ${MMAKE} all; \ ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= tinderbox toolchains kernel-toolchains: upgrade_checks tinderbox: - @cd ${.CURDIR} && ${SUB_MAKE} DOING_TINDERBOX=YES universe + @cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES universe toolchains: - @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe + @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe kernel-toolchains: - @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe + @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe # # universe @@ -435,7 +435,7 @@ universe_${target}_kernels: universe_${t (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) .endif - @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ + @cd ${.CURDIR}; ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels .endif # !MAKE_JUST_WORLDS Modified: projects/cxl_iscsi/Makefile.inc1 ============================================================================== --- projects/cxl_iscsi/Makefile.inc1 Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/Makefile.inc1 Wed Dec 2 01:55:14 2015 (r291636) @@ -144,6 +144,7 @@ CLEANDIR= cleandir .endif LOCAL_TOOL_DIRS?= +PACKAGEDIR?= ${DESTDIR}/${DISTDIR} BUILDENV_SHELL?=${SHELL} @@ -642,12 +643,9 @@ _includes: # Special handling for SUBDIR_OVERRIDE in buildworld as they most likely need # headers from default SUBDIR. Do SUBDIR_OVERRIDE includes last. ${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \ - buildincludes - ${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \ - installincludes + includes .if !empty(SUBDIR_OVERRIDE) && make(buildworld) - ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks buildincludes - ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks installincludes + ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes .endif _libraries: @echo @@ -668,7 +666,7 @@ everything: @echo "--------------------------------------------------------------" @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${WMAKE} par-all + ${_+_}cd ${.CURDIR}; _PARALLEL_SUBUDIR_OK=1 ${WMAKE} all .if defined(LIB32TMP) build32: .PHONY @echo @@ -1008,11 +1006,11 @@ packageworld: ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvf - --exclude usr/lib/debug \ @${DESTDIR}/${DISTDIR}/${dist}.meta | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz + ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvf - --exclude usr/lib/debug . | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz + ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz .endif .endfor @@ -1020,11 +1018,11 @@ packageworld: . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz + ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvLf - usr/lib/debug | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz + ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz . endif .endfor @@ -1109,10 +1107,14 @@ KERNCONFDIR?= ${KRNLCONFDIR} BUILDKERNELS= INSTALLKERNEL= +.if defined(NO_INSTALLKERNEL) +# All of the BUILDKERNELS loops start at index 1. +BUILDKERNELS+= dummy +.endif .for _kernel in ${KERNCONF} .if exists(${KERNCONFDIR}/${_kernel}) BUILDKERNELS+= ${_kernel} -.if empty(INSTALLKERNEL) +.if empty(INSTALLKERNEL) && !defined(NO_INSTALLKERNEL) INSTALLKERNEL= ${_kernel} .endif .endif @@ -1126,12 +1128,12 @@ ${WMAKE_TGTS:N_worldtmp:Nbuild32} ${.ALL # Builds all kernels defined by BUILDKERNELS. # buildkernel: .MAKE .PHONY -.if empty(BUILDKERNELS) +.if empty(BUILDKERNELS:Ndummy) @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \ false .endif @echo -.for _kernel in ${BUILDKERNELS} +.for _kernel in ${BUILDKERNELS:Ndummy} @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -1190,6 +1192,7 @@ buildkernel: .MAKE .PHONY # installkernel installkernel.debug \ reinstallkernel reinstallkernel.debug: _installcheck_kernel +.if !defined(NO_INSTALLKERNEL) .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false @@ -1200,6 +1203,7 @@ reinstallkernel reinstallkernel.debug: _ cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} +.endif .if ${BUILDKERNELS:[#]} > 1 .for _kernel in ${BUILDKERNELS:[2..-1]} @echo "--------------------------------------------------------------" @@ -1212,6 +1216,7 @@ reinstallkernel reinstallkernel.debug: _ .endif distributekernel distributekernel.debug: +.if !defined(NO_INSTALLKERNEL) .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false @@ -1229,6 +1234,7 @@ distributekernel distributekernel.debug: sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \ ${DESTDIR}/${DISTDIR}/kernel.meta .endif +.endif .if ${BUILDKERNELS:[#]} > 1 .for _kernel in ${BUILDKERNELS:[2..-1]} .if defined(NO_ROOT) @@ -1250,25 +1256,29 @@ distributekernel distributekernel.debug: packagekernel: .if defined(NO_ROOT) +.if !defined(NO_INSTALLKERNEL) cd ${DESTDIR}/${DISTDIR}/kernel; \ tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz + ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz +.endif .if ${BUILDKERNELS:[#]} > 1 .for _kernel in ${BUILDKERNELS:[2..-1]} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz + ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz .endfor .endif .else +.if !defined(NO_INSTALLKERNEL) cd ${DESTDIR}/${DISTDIR}/kernel; \ tar cvf - . | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz + ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz +.endif .if ${BUILDKERNELS:[#]} > 1 .for _kernel in ${BUILDKERNELS:[2..-1]} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ tar cvf - . | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz + ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz .endfor .endif .endif @@ -1283,7 +1293,7 @@ doxygen: .PHONY echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ exit 1; \ fi - ${_+_}cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all + ${_+_}cd ${.CURDIR}/tools/kerneldoc/subsys; ${MAKE} obj all # # update @@ -1303,7 +1313,7 @@ update: @echo "--------------------------------------------------------------" @echo ">>> Updating ${.CURDIR} using Subversion" @echo "--------------------------------------------------------------" - @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS}) + @(cd ${.CURDIR}; ${SVN} update ${SVNFLAGS}) .endif # @@ -1336,11 +1346,11 @@ legacy: .endif .for _tool in tools/build ${_elftoolchain_libs} ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ - cd ${.CURDIR}/${_tool} && \ - ${MAKE} DIRPRFX=${_tool}/ obj && \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \ - ${MAKE} DIRPRFX=${_tool}/ depend && \ - ${MAKE} DIRPRFX=${_tool}/ all && \ + cd ${.CURDIR}/${_tool}; \ + ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ + ${MAKE} DIRPRFX=${_tool}/ depend; \ + ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1489,10 +1499,10 @@ bootstrap-tools: .PHONY usr.bin/localedef ${_bt}-${_tool}: .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool} && \ - ${MAKE} DIRPRFX=${_tool}/ obj && \ - ${MAKE} DIRPRFX=${_tool}/ depend && \ - ${MAKE} DIRPRFX=${_tool}/ all && \ + cd ${.CURDIR}/${_tool}; \ + ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ depend; \ + ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install bootstrap-tools: ${_bt}-${_tool} @@ -1529,8 +1539,8 @@ _rescue=rescue/rescue usr.bin/vi/catalog build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ - cd ${.CURDIR}/${_tool} && \ - ${MAKE} DIRPRFX=${_tool}/ obj && \ + cd ${.CURDIR}/${_tool}; \ + ${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ build-tools build-tools: build-tools_${_tool} .endfor @@ -1538,9 +1548,9 @@ build-tools: build-tools_${_tool} ${_gcc_tools} build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool} && \ - ${MAKE} DIRPRFX=${_tool}/ obj && \ - ${MAKE} DIRPRFX=${_tool}/ depend && \ + cd ${.CURDIR}/${_tool}; \ + ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ depend; \ ${MAKE} DIRPRFX=${_tool}/ all build-tools: build-tools_${_tool} .endfor @@ -1620,10 +1630,10 @@ cross-tools: .MAKE .PHONY ${_crunchide} \ ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool} && \ - ${MAKE} DIRPRFX=${_tool}/ obj && \ - ${MAKE} DIRPRFX=${_tool}/ depend && \ - ${MAKE} DIRPRFX=${_tool}/ all && \ + cd ${.CURDIR}/${_tool}; \ + ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ depend; \ + ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor @@ -1652,10 +1662,10 @@ native-xtools: .PHONY .if ${MK_GCC_BOOTSTRAP} != "no" mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin ${_+_}@${ECHODIR} "===> ${_gperf} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_gperf} && \ - ${NXBMAKE} DIRPRFX=${_gperf}/ obj && \ - ${NXBMAKE} DIRPRFX=${_gperf}/ depend && \ - ${NXBMAKE} DIRPRFX=${_gperf}/ all && \ + cd ${.CURDIR}/${_gperf}; \ + ${NXBMAKE} DIRPRFX=${_gperf}/ obj; \ + ${NXBMAKE} DIRPRFX=${_gperf}/ depend; \ + ${NXBMAKE} DIRPRFX=${_gperf}/ all; \ ${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install .endif mkdir -p ${NXBDESTDIR}/bin ${NXBDESTDIR}/sbin ${NXBDESTDIR}/usr @@ -1727,10 +1737,10 @@ native-xtools: .PHONY usr.bin/yacc \ usr.sbin/chown ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool} && \ - ${NXBMAKE} DIRPRFX=${_tool}/ obj && \ - ${NXBMAKE} DIRPRFX=${_tool}/ depend && \ - ${NXBMAKE} DIRPRFX=${_tool}/ all && \ + cd ${.CURDIR}/${_tool}; \ + ${NXBMAKE} DIRPRFX=${_tool}/ obj; \ + ${NXBMAKE} DIRPRFX=${_tool}/ depend; \ + ${NXBMAKE} DIRPRFX=${_tool}/ all; \ ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install .endfor @@ -1738,7 +1748,7 @@ native-xtools: .PHONY # hierarchy - ensure that all the needed directories are present # hierarchy hier: .MAKE .PHONY - ${_+_}cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs + ${_+_}cd ${.CURDIR}/etc; ${HMAKE} distrib-dirs # # libraries - build all libraries, and install them under ${DESTDIR}. @@ -1748,10 +1758,10 @@ hierarchy hier: .MAKE .PHONY # ${.CURDIR}/tools/make_libdeps.sh script. # libraries: .MAKE .PHONY - ${_+_}cd ${.CURDIR} && \ - ${MAKE} -f Makefile.inc1 _prereq_libs && \ - ${MAKE} -f Makefile.inc1 _startup_libs && \ - ${MAKE} -f Makefile.inc1 _prebuild_libs && \ + ${_+_}cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 _prereq_libs; \ + ${MAKE} -f Makefile.inc1 _startup_libs; \ + ${MAKE} -f Makefile.inc1 _prebuild_libs; \ ${MAKE} -f Makefile.inc1 _generic_libs # @@ -1819,6 +1829,7 @@ _prebuild_libs+= lib/libc++ .endif lib/libgeom__L: lib/libexpat__L +lib/libkvm__L: lib/libelf__L .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr @@ -1956,11 +1967,11 @@ gnu/lib/libdialog__L: lib/msun__L lib/nc ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib} && \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \ + cd ${.CURDIR}/${_lib}; \ + ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \ + ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ - DIRPRFX=${_lib}/ all && \ + DIRPRFX=${_lib}/ all; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ install .endif @@ -1970,10 +1981,10 @@ ${_lib}__PL: .PHONY .MAKE ${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib} && \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all && \ + cd ${.CURDIR}/${_lib}; \ + ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \ + ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; \ + ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install .endif .endfor @@ -1983,11 +1994,11 @@ ${_lib}__L: .PHONY .MAKE # modules. lib/libpam__L: .PHONY .MAKE ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ - cd ${.CURDIR}/lib/libpam && \ - ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj && \ - ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend && \ + cd ${.CURDIR}/lib/libpam; \ + ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj; \ + ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend; \ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \ - -D_NO_LIBPAM_SO_YET all && \ + -D_NO_LIBPAM_SO_YET all; \ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \ -D_NO_LIBPAM_SO_YET install @@ -1996,16 +2007,15 @@ _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} -# 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) +# Enable SUBDIR_PARALLEL when not calling 'make all', unless called from +# 'everything' with _PARALLEL_SUBUDIR_OK set. 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. +.if !make(all) || defined(_PARALLEL_SUBUDIR_OK) SUBDIR_PARALLEL= .endif @@ -2282,10 +2292,10 @@ _xb-bootstrap-tools: .PHONY ${_clang_tblgen} \ ${_gperf} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool} && \ - ${CDMAKE} DIRPRFX=${_tool}/ obj && \ - ${CDMAKE} DIRPRFX=${_tool}/ depend && \ - ${CDMAKE} DIRPRFX=${_tool}/ all && \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + ${CDMAKE} DIRPRFX=${_tool}/ all; \ ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor @@ -2302,9 +2312,9 @@ _xb-cross-tools: .PHONY ${_clang} \ ${_cc} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool} && \ - ${CDMAKE} DIRPRFX=${_tool}/ obj && \ - ${CDMAKE} DIRPRFX=${_tool}/ depend && \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + ${CDMAKE} DIRPRFX=${_tool}/ depend; \ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor @@ -2345,9 +2355,7 @@ _xi-cross-tools: .PHONY .endfor _xi-includes: .PHONY - ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 buildincludes \ - DESTDIR=${XDDESTDIR} - ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 installincludes \ + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 includes \ DESTDIR=${XDDESTDIR} _xi-libraries: .PHONY Modified: projects/cxl_iscsi/ObsoleteFiles.inc ============================================================================== --- projects/cxl_iscsi/ObsoleteFiles.inc Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/ObsoleteFiles.inc Wed Dec 2 01:55:14 2015 (r291636) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406) +OLD_LIBS+=usr/lib/libelf.so.2 # 20151115: Fox bad upgrade scheme OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312 Modified: projects/cxl_iscsi/UPDATING ============================================================================== --- projects/cxl_iscsi/UPDATING Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/UPDATING Wed Dec 2 01:55:14 2015 (r291636) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151130: + r291527 changed the internal interface between the nfsd.ko and + nfscommon.ko modules. As such, they must both be upgraded to-gether. + __FreeBSD_version has been bumped because of this. + 20151108: Add support for unicode collation strings leads to a change of order of files listed by ls(1) for example. To get back to the old @@ -844,14 +849,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 keep 64-bits counters. Thus all tools, that work with networking statistics, must be rebuilt (netstat(1), bsnmpd(1), etc.) -20130629: - Fix targets that run multiple make's to use && rather than ; - so that subsequent steps depend on success of previous. - - NOTE: if building 'universe' with -j* on stable/8 or stable/9 - it would be better to start the build using bmake, to avoid - overloading the machine. - 20130618: Fix a bug that allowed a tracing process (e.g. gdb) to write to a memory-mapped file in the traced process's address space Modified: projects/cxl_iscsi/bin/df/df.1 ============================================================================== --- projects/cxl_iscsi/bin/df/df.1 Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/bin/df/df.1 Wed Dec 2 01:55:14 2015 (r291636) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd November 6, 2014 +.Dd December 1, 2015 .Dt DF 1 .Os .Sh NAME @@ -62,6 +62,13 @@ option below). .Pp The following options are available: .Bl -tag -width indent +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_parse_args 3 +for details on command line arguments. .It Fl a Show all mount points, including those that were mounted with the .Dv MNT_IGNORE Modified: projects/cxl_iscsi/bin/ls/ls.1 ============================================================================== --- projects/cxl_iscsi/bin/ls/ls.1 Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/bin/ls/ls.1 Wed Dec 2 01:55:14 2015 (r291636) @@ -32,7 +32,7 @@ .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" $FreeBSD$ .\" -.Dd September 27, 2015 +.Dd December 1, 2015 .Dt LS 1 .Os .Sh NAME @@ -69,6 +69,13 @@ lexicographical order. .Pp The following options are available: .Bl -tag -width indent +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_parse_args 3 +for details on command line arguments. .It Fl A Include directory entries whose names begin with a dot Modified: projects/cxl_iscsi/bin/pkill/Makefile.depend ============================================================================== --- projects/cxl_iscsi/bin/pkill/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/bin/pkill/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -9,6 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libelf \ lib/libjail \ lib/libkvm \ Modified: projects/cxl_iscsi/bin/ps/Makefile.depend ============================================================================== --- projects/cxl_iscsi/bin/ps/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/bin/ps/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -9,6 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libelf \ lib/libjail \ lib/libkvm \ lib/libutil \ Modified: projects/cxl_iscsi/bin/ps/ps.1 ============================================================================== --- projects/cxl_iscsi/bin/ps/ps.1 Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/bin/ps/ps.1 Wed Dec 2 01:55:14 2015 (r291636) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd May 27, 2015 +.Dd December 1, 2015 .Dt PS 1 .Os .Sh NAME @@ -103,6 +103,13 @@ and associated command. .Pp The options are as follows: .Bl -tag -width indent +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_parse_args 3 +for details on command line arguments. .It Fl a Display information about other users' processes as well as your own. If the @@ -135,7 +142,7 @@ column is not the last column displayed. .It Fl e Display the environment as well. .It Fl f -Show commandline and environment information about swapped out processes. +Show command-line and environment information about swapped out processes. This option is honored only if the UID of the user is 0. .It Fl G Display information about processes which are running with the specified Modified: projects/cxl_iscsi/cddl/lib/libzfs/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libzfs/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/lib/libzfs/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -19,6 +19,7 @@ DIRDEPS = \ lib/libmd \ lib/libthr \ lib/libutil \ + lib/libz \ lib/msun \ Modified: projects/cxl_iscsi/cddl/sbin/zfs/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/sbin/zfs/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/sbin/zfs/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -22,6 +22,7 @@ DIRDEPS = \ lib/libsbuf \ lib/libthr \ lib/libutil \ + lib/libz \ lib/msun \ Modified: projects/cxl_iscsi/cddl/sbin/zpool/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/sbin/zpool/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/sbin/zpool/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -21,6 +21,7 @@ DIRDEPS = \ lib/libsbuf \ lib/libthr \ lib/libutil \ + lib/libz \ lib/msun \ Modified: projects/cxl_iscsi/cddl/usr.bin/ctfconvert/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/usr.bin/ctfconvert/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/usr.bin/ctfconvert/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -2,14 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - cddl/lib/libctf \ gnu/lib/csu \ gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ lib/libdwarf \ lib/libelf \ Modified: projects/cxl_iscsi/cddl/usr.bin/ctfdump/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/usr.bin/ctfdump/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/usr.bin/ctfdump/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -8,10 +8,8 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ lib/libelf \ - lib/libthr \ lib/libz \ Modified: projects/cxl_iscsi/cddl/usr.bin/ctfmerge/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/usr.bin/ctfmerge/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/usr.bin/ctfmerge/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -2,16 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - cddl/lib/libctf \ gnu/lib/csu \ gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ - lib/libdwarf \ lib/libelf \ lib/libthr \ lib/libz \ Modified: projects/cxl_iscsi/cddl/usr.sbin/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/Makefile Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/usr.sbin/Makefile Wed Dec 2 01:55:14 2015 (r291636) @@ -25,10 +25,8 @@ _zhack= zhack _dtrace= dtrace _dtruss= dtruss _lockstat= lockstat -.if defined(WITH_PLOCKSTAT) _plockstat= plockstat .endif -.endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" _dtrace= dtrace Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile Wed Dec 2 01:55:14 2015 (r291636) @@ -22,7 +22,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -LIBADD= dtrace +LIBADD= dtrace ctf elf proc .if ${MK_DTRACE_TESTS} != "no" SUBDIR+= tests Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -10,7 +10,6 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ lib/libcxxrt \ lib/libelf \ @@ -18,9 +17,7 @@ DIRDEPS = \ lib/librtld_db \ lib/libthr \ lib/libutil \ - lib/liby \ lib/libz \ - usr.bin/lex/lib \ .include <dirdeps.mk> Copied: projects/cxl_iscsi/cddl/usr.sbin/plockstat/Makefile.depend (from r291635, head/cddl/usr.sbin/plockstat/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/cxl_iscsi/cddl/usr.sbin/plockstat/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636, copy of r291635, head/cddl/usr.sbin/plockstat/Makefile.depend) @@ -0,0 +1,27 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + cddl/lib/libctf \ + cddl/lib/libdtrace \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcxxrt \ + lib/libelf \ + lib/libproc \ + lib/librtld_db \ + lib/libthr \ + lib/libutil \ + lib/libz \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: projects/cxl_iscsi/contrib/netbsd-tests/lib/libcrypt/t_crypt.c ============================================================================== --- projects/cxl_iscsi/contrib/netbsd-tests/lib/libcrypt/t_crypt.c Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/contrib/netbsd-tests/lib/libcrypt/t_crypt.c Wed Dec 2 01:55:14 2015 (r291636) @@ -124,11 +124,13 @@ ATF_TC_HEAD(crypt_salts, tc) ATF_TC_BODY(crypt_salts, tc) { for (size_t i = 0; tests[i].hash; i++) { + char *hash = crypt(tests[i].pw, tests[i].hash); #if defined(__FreeBSD__) - if (22 <= i) + if (i >= 22 && i != 24 && i != 25) atf_tc_expect_fail("Old-style/bad inputs fail on FreeBSD"); + else + atf_tc_expect_pass(); #endif - char *hash = crypt(tests[i].pw, tests[i].hash); if (!hash) { ATF_CHECK_MSG(0, "Test %zu NULL\n", i); continue; Modified: projects/cxl_iscsi/contrib/wpa/src/drivers/driver_bsd.c ============================================================================== --- projects/cxl_iscsi/contrib/wpa/src/drivers/driver_bsd.c Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/contrib/wpa/src/drivers/driver_bsd.c Wed Dec 2 01:55:14 2015 (r291636) @@ -1055,7 +1055,14 @@ wpa_driver_bsd_associate(void *priv, str mode = 0 /* STA */; break; case IEEE80211_MODE_IBSS: + /* + * Ref bin/203086 - FreeBSD's net80211 currently uses + * IFM_IEEE80211_ADHOC. + */ +#if 0 mode = IFM_IEEE80211_IBSS; +#endif + mode = IFM_IEEE80211_ADHOC; break; case IEEE80211_MODE_AP: mode = IFM_IEEE80211_HOSTAP; @@ -1102,6 +1109,13 @@ wpa_driver_bsd_associate(void *priv, str params->wpa_ie[0] == WLAN_EID_RSN ? 2 : 1) < 0) return -1; + /* + * NB: interface must be marked UP for association + * or scanning (ap_scan=2) + */ + if (bsd_ctrl_iface(drv, 1) < 0) + return -1; + os_memset(&mlme, 0, sizeof(mlme)); mlme.im_op = IEEE80211_MLME_ASSOC; if (params->ssid != NULL) Modified: projects/cxl_iscsi/crypto/openssh/pathnames.h ============================================================================== --- projects/cxl_iscsi/crypto/openssh/pathnames.h Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/crypto/openssh/pathnames.h Wed Dec 2 01:55:14 2015 (r291636) @@ -1,4 +1,5 @@ /* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -121,7 +122,7 @@ * Default location of askpass */ #ifndef _PATH_SSH_ASKPASS_DEFAULT -#define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" +#define _PATH_SSH_ASKPASS_DEFAULT "/usr/local/bin/ssh-askpass" #endif /* Location of ssh-keysign for hostbased authentication */ @@ -136,7 +137,7 @@ /* xauth for X11 forwarding */ #ifndef _PATH_XAUTH -#define _PATH_XAUTH "/usr/X11R6/bin/xauth" +#define _PATH_XAUTH "/usr/local/bin/xauth" #endif /* UNIX domain socket for X11 server; displaynum will replace %u */ Modified: projects/cxl_iscsi/etc/Makefile ============================================================================== --- projects/cxl_iscsi/etc/Makefile Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/etc/Makefile Wed Dec 2 01:55:14 2015 (r291636) @@ -408,7 +408,7 @@ distrib-dirs: ${MTREES:N/*} distrib-clea ${METALOG.add} ; \ done; true .endif - ${INSTALL_SYMLINK} ${SRCTOP:C/^\///}/sys ${DESTDIR}/sys + ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys .if ${MK_MAN} != "no" cd ${DESTDIR}${SHAREDIR}/man; \ for mandir in man*; do \ Copied: projects/cxl_iscsi/etc/Makefile.depend (from r291635, head/etc/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/cxl_iscsi/etc/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636, copy of r291635, head/etc/Makefile.depend) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: projects/cxl_iscsi/etc/defaults/rc.conf ============================================================================== --- projects/cxl_iscsi/etc/defaults/rc.conf Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/etc/defaults/rc.conf Wed Dec 2 01:55:14 2015 (r291636) @@ -326,6 +326,7 @@ nfs_client_enable="NO" # This host is a nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). nfs_server_flags="-u -t" # Flags to nfsd (if enabled). +nfs_server_managegids="NO" # The NFS server maps gids for AUTH_SYS (or NO). mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. Modified: projects/cxl_iscsi/etc/mtree/BSD.include.dist ============================================================================== --- projects/cxl_iscsi/etc/mtree/BSD.include.dist Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/etc/mtree/BSD.include.dist Wed Dec 2 01:55:14 2015 (r291636) @@ -241,6 +241,8 @@ .. krb5 .. + lib80211 + .. libmilter .. libxo Modified: projects/cxl_iscsi/etc/mtree/BSD.usr.dist ============================================================================== --- projects/cxl_iscsi/etc/mtree/BSD.usr.dist Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/etc/mtree/BSD.usr.dist Wed Dec 2 01:55:14 2015 (r291636) @@ -21,6 +21,8 @@ clang 3.7.0 include + sanitizer + .. .. lib freebsd Copied: projects/cxl_iscsi/etc/newsyslog.conf.d/Makefile.depend (from r291635, head/etc/newsyslog.conf.d/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/cxl_iscsi/etc/newsyslog.conf.d/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636, copy of r291635, head/etc/newsyslog.conf.d/Makefile.depend) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: projects/cxl_iscsi/etc/rc.d/local_unbound ============================================================================== --- projects/cxl_iscsi/etc/rc.d/local_unbound Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/etc/rc.d/local_unbound Wed Dec 2 01:55:14 2015 (r291636) @@ -24,6 +24,8 @@ configtest_cmd="local_unbound_configtest setup_cmd="local_unbound_setup" pidfile="/var/run/${name}.pid" +load_rc_config $name + : ${local_unbound_workdir:=/var/unbound} : ${local_unbound_config:=${local_unbound_workdir}/unbound.conf} : ${local_unbound_flags:="-c ${local_unbound_config}"} @@ -32,8 +34,6 @@ pidfile="/var/run/${name}.pid" : ${local_unbound_anchor:=${local_unbound_workdir}/root.key} : ${local_unbound_forwarders:=} -load_rc_config $name - do_as_unbound() { echo "$@" | su -m unbound Modified: projects/cxl_iscsi/etc/rc.d/nfsd ============================================================================== --- projects/cxl_iscsi/etc/rc.d/nfsd Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/etc/rc.d/nfsd Wed Dec 2 01:55:14 2015 (r291636) @@ -32,9 +32,13 @@ nfsd_precmd() sysctl vfs.nfsd.nfs_privport=0 > /dev/null fi + if checkyesno nfsv4_server_enable || \ + checkyesno nfs_server_managegids; then + force_depend nfsuserd || err 1 "Cannot run nfsuserd" + fi + if checkyesno nfsv4_server_enable; then sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null - force_depend nfsuserd || err 1 "Cannot run nfsuserd" else echo 'NFSv4 is disabled' sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null Modified: projects/cxl_iscsi/etc/rc.d/nfsuserd ============================================================================== --- projects/cxl_iscsi/etc/rc.d/nfsuserd Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/etc/rc.d/nfsuserd Wed Dec 2 01:55:14 2015 (r291636) @@ -15,5 +15,14 @@ command="/usr/sbin/${name}" sig_stop="USR1" load_rc_config $name +start_precmd="nfsuserd_precmd" + +nfsuserd_precmd() +{ + if checkyesno nfs_server_managegids; then + rc_flags="-manage-gids ${nfsuserd_flags}" + fi + return 0 +} run_rc_command "$1" Modified: projects/cxl_iscsi/etc/rc.d/rctl ============================================================================== --- projects/cxl_iscsi/etc/rc.d/rctl Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/etc/rc.d/rctl Wed Dec 2 01:55:14 2015 (r291636) @@ -23,10 +23,10 @@ rctl_start() \#*|'') ;; *) - rctl -a "${var}" + echo "${var}" ;; esac - done < ${rctl_rules} + done < ${rctl_rules} | xargs rctl -a fi } Modified: projects/cxl_iscsi/gnu/lib/libssp/Makefile.depend ============================================================================== --- projects/cxl_iscsi/gnu/lib/libssp/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/gnu/lib/libssp/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -2,11 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + gnu/lib/csu \ gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcompiler_rt \ .include <dirdeps.mk> Modified: projects/cxl_iscsi/gnu/usr.bin/diff/Makefile.depend ============================================================================== --- projects/cxl_iscsi/gnu/usr.bin/diff/Makefile.depend Wed Dec 2 01:50:22 2015 (r291635) +++ projects/cxl_iscsi/gnu/usr.bin/diff/Makefile.depend Wed Dec 2 01:55:14 2015 (r291636) @@ -2,20 +2,18 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + gnu/lib/csu \ gnu/lib/libgcc \ gnu/lib/libregex \ include \ include/xlocale \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512020155.tB21tFXA079212>