PERFORCE change 221830 for review
Brooks Davis
brooks at FreeBSD.org
Thu Feb 7 10:21:54 UTC 2013
http://p4web.freebsd.org/@@221830?ac=10
Change 221830 by brooks at brooks_zenith on 2013/02/07 10:21:10
Integrate the latest changes to beribsd. Most usefully NO_ROOT
support and atse(4).
Affected files ...
.. //depot/projects/ctsrd/cheribsd/src/Makefile.inc1#7 integrate
.. //depot/projects/ctsrd/cheribsd/src/UPDATING#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/bin/cat/cat.1#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/bin/cat/cat.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/bin/cp/utils.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/bin/df/df.1#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_target/snmp_target.3#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_target/target_snmp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_usm/snmp_usm.3#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_usm/usm_snmp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_vacm/snmp_vacm.3#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_vacm/vacm_snmp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/ee/ee.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/contrib/ipfilter/ipsend/44arp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#10 integrate
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/atsectl/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/atsectl/atsectl.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/flashit/flashit.sh#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/etc/Makefile#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/etc/login.conf#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/gnu/lib/libsupc++/Version.map#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/gnu/usr.bin/cc/c++/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/gnu/usr.bin/patch/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/include/arpa/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/include/stdio.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/amd64/sys/__vdso_gettc.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/arm/sys/Makefile.inc#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/arm/sys/__vdso_gettc.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/i386/sys/__vdso_gettc.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/ia64/sys/Makefile.inc#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/ia64/sys/__vdso_gettc.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/mips/sys/Makefile.inc#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/mips/sys/__vdso_gettc.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/powerpc/Makefile.inc#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/powerpc/sys/__vdso_gettc.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/powerpc64/Makefile.inc#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/powerpc64/sys/__vdso_gettc.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/sparc64/Makefile.inc#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/sparc64/sys/__vdso_gettc.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/stdio/Makefile.inc#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/stdio/Symbol.map#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/stdio/fmemopen.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/stdio/fopen.3#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/sys/__vdso_gettimeofday.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libc/sys/gettimeofday.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libcxxrt/Version.map#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libproc/proc_rtld.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/lib/libstand/if_ether.h#3 delete
.. //depot/projects/ctsrd/cheribsd/src/libexec/bootpd/rtmsg.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/libexec/tftpd/tftp-io.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/libexec/tftpd/tftp-options.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/libexec/tftpd/tftp-utils.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/libexec/tftpd/tftpd.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sbin/devd/devd.8#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sbin/devd/devd.cc#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sbin/devd/devd.hh#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sbin/geom/class/part/gpart.8#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sbin/route/route.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/share/man/man5/src.conf.5#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/share/man/man9/VFS_SET.9#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/share/mk/bsd.own.mk#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/amd64/include/vmm_instruction_emul.h#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/amd64/linux32/linux.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/amd64/vmm/intel/vmx.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/amd64/vmm/vmm_instruction_emul.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/allwinner/a10_clk.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/allwinner/a10_clk.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/allwinner/a10_ehci.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/allwinner/aintc.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/allwinner/common.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/allwinner/files.a10#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/allwinner/timer.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/arm/cpufunc_asm_arm10.S#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/arm/cpufunc_asm_arm9.S#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/arm/intr.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/conf/CUBIEBOARD#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/conf/DOCKSTAR#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/conf/DREAMPLUG-1001#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/conf/NOTES#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/conf/SHEEVAPLUG#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/mv/kirkwood/files.sheevaplug#3 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/mv/kirkwood/sheevaplug.c#3 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/mv/kirkwood/std.sheevaplug#3 delete
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/mv/mv_machdep.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/arm/ti/am335x/am335x_scm_padconf.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/Makefile.mips#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beaglebone.dts#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/cubieboard.dts#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/dreamplug-1001.dts#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/dreamplug-1001N.dts#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/Makefile.inc#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/boot2.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/uboot/common/metadata.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/Makefile.test#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/bsd_busspace.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/bsd_global.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/bsd_kernel.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/bsd_kernel.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/bsd_usbloader_test.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/tools/sysinit.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/tools/sysinit.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/usb/usb_busdma_loader.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/cam/scsi/scsi_all.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#6 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_emul.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_file.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_fork.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_futex.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_ioctl.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_ipc.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_mib.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_misc.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_signal.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_socket.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_sysctl.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/compat/linux/linux_time.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/contrib/dev/acpica/components/utilities/utcache.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/contrib/dev/acpica/include/acmacros.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/contrib/dev/acpica/include/acoutput.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/contrib/dev/acpica/include/actypes.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpi_support/acpi_asus_wmi.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpi_support/acpi_hp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpi_support/acpi_panasonic.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpi_support/acpi_sony.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpi_support/acpi_toshiba.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_button.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_cmbat.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_dock.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_ec.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_hpet.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_lid.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_pci.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_pcib.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_pcib_pci.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_perf.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_resource.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_smbat.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_thermal.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_throttle.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/acpica/acpi_timer.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/adlink/adlink.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/agp/agp_i810.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/a_api.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse_fdt.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse_nexus.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atsereg.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/amdsbwd/amdsbwd.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/amdtemp/amdtemp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ath/ath_hal/ar5211/boss.ini#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ath/if_ath.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ath/if_ath_misc.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ath/if_ath_rx.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ath/if_ath_tx.c#6 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ath/if_ath_tx_edma.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/auxio/auxio.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/bktr/CHANGELOG.TXT#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cas/if_cas.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ce/if_ce.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_bus_fdt.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_bus_ixp4xx.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cp/if_cp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cpufreq/ichss.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/adapter.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/common/t4_msg.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/t4_main.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/t4_sge.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/tom/t4_connect.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/tom/t4_cpl_io.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/tom/t4_listen.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/tom/t4_tom.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cxgbe/tom/t4_tom.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/digi/digi_isa.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/digi/digi_pci.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/e1000/if_em.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/e1000/if_igb.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/e1000/if_lem.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ep/if_ep_eisa.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ep/if_ep_isa.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ep/if_ep_mca.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ep/if_ep_pccard.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/fdc/fdc_acpi.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/iicbus/ad7418.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/iicbus/ds133x.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/iicbus/ds1672.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/iicbus/icee.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf_fdt.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf_nexus.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ixgb/if_ixgb.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ixgbe/ixgbe.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ixgbe/ixgbe_82598.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ixgbe/ixgbe_82599.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ixgbe/ixgbe_x540.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ixgbe/ixgbe_x540.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/ixgbe/ixv.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/mfi/mfi_cam.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/mn/if_mn.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/mxge/if_mxge.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/my/if_my.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/nand/nand_id.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/nvram2env/nvram2env.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/nxge/if_nxge.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/oce/oce_if.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/sdhci/sdhci_pci.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/sound/pci/emu10kx-midi.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/sound/pci/emu10kx.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/sound/sbus/cs4231.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/at91dci.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/atmegadci.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/avr32dci.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/dwc_otg.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/ehci.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/musb_otg.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/ohci.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/uhci.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/usb_controller.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/uss820dci.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/controller/xhci.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/input/uhid.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/input/ukbd.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/input/ums.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/misc/udbp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/misc/ufm.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/net/if_axe.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/net/if_cdce.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/net/if_cue.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/net/if_ipheth.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/net/if_kue.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/net/if_smsc.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/quirk/usb_quirk.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/storage/umass.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/storage/urio.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/template/usb_template.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/template/usb_template_audio.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/template/usb_template_kbd.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/template/usb_template_modem.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/template/usb_template_mouse.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/template/usb_template_msc.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/ufm_ioctl.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_busdma.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_busdma.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_compat_linux.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_core.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_core.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_debug.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_dev.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_dev.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_device.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_dynamic.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_endian.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_error.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_freebsd.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_freebsd_loader.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_generic.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_handle_request.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_hid.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_hub.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_ioctl.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_lookup.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_mbuf.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_msctest.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_parse.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_pci.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_pf.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_process.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_process.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_request.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usb_util.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usbdi.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/usb/usbhid.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/vx/if_vx_eisa.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/vx/if_vx_pci.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/vxge/vxge.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/xen/console/console.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/ext2fs/ext2_dinode.h#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/ext2fs/ext2_dir.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/ext2fs/ext2_inode.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/ext2fs/ext2fs.h#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/nfs/nfs.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/nfs/nfsport.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/geom/mirror/g_mirror.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/i386/linux/linux.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/i386/linux/linux_ptrace.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/kern/kern_clock.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/kern/kern_poll.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/kern/kern_tc.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/files.beri#11 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#9 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_BASE#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/pte.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/trap.c#14 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/modules/digi/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/modules/digi/Makefile.inc#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/modules/isci/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/modules/sound/driver/ich/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/net/if_llatbl.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/net/if_llatbl.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/net80211/ieee80211_node.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet/if_ether.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet/in.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet/libalias/alias.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet/libalias/libalias.3#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet/tcp_usrreq.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet/toecore.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet6/nd6.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/netinet6/nd6_nbr.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/nfsclient/nfs_krpc.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/pci/ncr.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/sys/kernel.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/sys/mbuf.h#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/sys/mount.h#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/sys/param.h#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/sys/time.h#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/sys/vdso.h#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/sys/vmmeter.h#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/vm/uma_core.c#6 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/vm/vm_fault.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/vm/vm_meter.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/x86/x86/tsc.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/tools/build/options/WITH_BSD_PATCH#1 branch
.. //depot/projects/ctsrd/cheribsd/src/tools/install.sh#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/tools/regression/lib/libc/stdio/test-fmemopen.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/tools/regression/lib/libc/stdio/test-fmemopen.t#1 branch
.. //depot/projects/ctsrd/cheribsd/src/tools/test/pthread_vfork/pthread_vfork_test.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/Makefile#6 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/dtc/dtc.1#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/backupfile.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/backupfile.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/common.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/inp.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/inp.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/mkpath.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/patch.1#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/patch.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/pathnames.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/pch.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/pch.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/util.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/patch/util.h#1 branch
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/sort/sort.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/systat/vmstat.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/truss/main.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/vmstat/vmstat.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.bin/xinstall/xinstall.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/arp/arp.8#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/arp/arp.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bhyve/pci_emul.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bhyve/pci_emul.h#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bhyve/pci_virtio_net.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bhyve/pmtmr.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bhyve/rtc.c#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bhyve/virtio.h#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bsdinstall/scripts/script#2 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bsdinstall/scripts/wlanconfig#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bsnmpd/modules/snmp_target/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bsnmpd/modules/snmp_usm/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/ndp/ndp.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/newsyslog/newsyslog.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/ppp/arp.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/rarpd/rarpd.c#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/tcpdrop/tcpdrop.8#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/tcpdrop/tcpdrop.c#3 integrate
.. //depot/projects/ctsrd/cheribsd/src/usr.sbin/watchdogd/watchdogd.c#4 integrate
Differences ...
==== //depot/projects/ctsrd/cheribsd/src/Makefile.inc1#7 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/Makefile.inc1 245890 2013-01-24 17:12:02Z brooks $
+# $FreeBSD: head/Makefile.inc1 246097 2013-01-29 22:17:58Z brooks $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -185,7 +185,7 @@
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
# /usr/games added for fortune which depend on strfile
-BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
+BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
@@ -412,7 +412,7 @@
rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
.endif
.for _dir in \
- lib usr legacy/usr
+ lib usr legacy/bin legacy/usr
mkdir -p ${WORLDTMP}/${_dir}
.endfor
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
@@ -673,8 +673,8 @@
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep id install ${_install-info} \
- ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
- test true uname wc ${_zoneinfo}
+ ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \
+ rm sed sh sysctl test true uname wc ${_zoneinfo}
#
# distributeworld
@@ -964,7 +964,7 @@
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} PATH=${TMPPATH} \
- ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
+ ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
distributekernel distributekernel.debug:
.if empty(INSTALLKERNEL)
@@ -1044,7 +1044,7 @@
echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \
echo "--------------------------------------------------------------" ; \
echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \
- echo "!! Update methods with ${SUP} are deprecated." ; \
+ echo "!! Update methods with CVS are deprecated." ; \
echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \
echo "!! and convert your update method to SVN_UPDATE or" ; \
echo "!! freebsd-update(8)." ; \
@@ -1132,8 +1132,14 @@
.if ${BOOTSTRAPPING} < 1000026
_nmtree= lib/libnetbsd \
usr.sbin/nmtree
+.else
+_nmtree_itools= nmtree
.endif
+.if ${BOOTSTRAPPING} < 1000027
+_cat= bin/cat
+.endif
+
.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
_awk= usr.bin/awk
.endif
@@ -1189,6 +1195,7 @@
${_ar} \
${_dtc} \
${_awk} \
+ ${_cat} \
usr.bin/lorder \
usr.bin/makewhatis \
${_mklocale} \
==== //depot/projects/ctsrd/cheribsd/src/UPDATING#5 (text+ko) ====
@@ -26,6 +26,13 @@
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20130129:
+ A BSD-licensed patch(1) variant has been added and is installed
+ as bsdpatch, being the GNU version the default patch.
+ To inverse the logic and use the BSD-licensed one as default,
+ while having the GNU version installed as gnupatch, rebuild
+ and install world with the WITH_BSD_PATCH knob set.
+
20130118:
The install(1) option -M has changed meaning and now takes an
argument that is a file or path to append logs to. In the
@@ -1751,4 +1758,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: head/UPDATING 245617 2013-01-18 20:57:50Z brooks $
+$FreeBSD: head/UPDATING 246114 2013-01-30 10:23:38Z gabor $
==== //depot/projects/ctsrd/cheribsd/src/bin/cat/cat.1#4 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cat.1 8.3 (Berkeley) 5/2/95
-.\" $FreeBSD: head/bin/cat/cat.1 240192 2012-09-07 09:00:25Z kevlo $
+.\" $FreeBSD: head/bin/cat/cat.1 246090 2013-01-29 20:01:47Z joel $
.\"
-.Dd March 21, 2004
+.Dd January 29, 2013
.Dt CAT 1
.Os
.Sh NAME
@@ -40,7 +40,7 @@
.Nd concatenate and print files
.Sh SYNOPSIS
.Nm
-.Op Fl benstuv
+.Op Fl belnstuv
.Op Ar
.Sh DESCRIPTION
The
@@ -79,6 +79,16 @@
option), and display a dollar sign
.Pq Ql \&$
at the end of each line.
+.It Fl l
+Set an exclusive advisory lock on the standard output file descriptor.
+This lock is set using
+.Xr fcntl 2
+with the
+.Dv F_SETLKW
+command.
+If the output file is already locked,
+.Nm
+will block until the lock is acquired.
.It Fl n
Number the output lines, starting at 1.
.It Fl s
@@ -160,6 +170,7 @@
.Xr tail 1 ,
.Xr vis 1 ,
.Xr zcat 1 ,
+.Xr fcntl 2 ,
.Xr setbuf 3
.Rs
.%A Rob Pike
@@ -175,7 +186,7 @@
specification.
.Pp
The flags
-.Op Fl benstv
+.Op Fl belnstv
are extensions to the specification.
.Sh HISTORY
A
==== //depot/projects/ctsrd/cheribsd/src/bin/cat/cat.c#4 (text+ko) ====
@@ -44,7 +44,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/cat/cat.c 238653 2012-07-20 08:33:23Z jh $");
+__FBSDID("$FreeBSD: head/bin/cat/cat.c 246083 2013-01-29 18:19:40Z brooks $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -64,7 +64,7 @@
#include <string.h>
#include <unistd.h>
-static int bflag, eflag, nflag, sflag, tflag, vflag;
+static int bflag, eflag, lflag, nflag, sflag, tflag, vflag;
static int rval;
static const char *filename;
@@ -96,10 +96,11 @@
main(int argc, char *argv[])
{
int ch;
+ struct flock stdout_lock;
setlocale(LC_CTYPE, "");
- while ((ch = getopt(argc, argv, "benstuv")) != -1)
+ while ((ch = getopt(argc, argv, "belnstuv")) != -1)
switch (ch) {
case 'b':
bflag = nflag = 1; /* -b implies -n */
@@ -107,6 +108,9 @@
case 'e':
eflag = vflag = 1; /* -e implies -v */
break;
+ case 'l':
+ lflag = 1;
+ break;
case 'n':
nflag = 1;
break;
@@ -127,6 +131,15 @@
}
argv += optind;
+ if (lflag) {
+ stdout_lock.l_len = 0;
+ stdout_lock.l_start = 0;
+ stdout_lock.l_type = F_WRLCK;
+ stdout_lock.l_whence = SEEK_SET;
+ if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) == -1)
+ err(EXIT_FAILURE, "stdout");
+ }
+
if (bflag || eflag || nflag || sflag || tflag || vflag)
scanfiles(argv, 1);
else
@@ -140,7 +153,7 @@
static void
usage(void)
{
- fprintf(stderr, "usage: cat [-benstuv] [file ...]\n");
+ fprintf(stderr, "usage: cat [-belnstuv] [file ...]\n");
exit(1);
/* NOTREACHED */
}
==== //depot/projects/ctsrd/cheribsd/src/bin/cp/utils.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/cp/utils.c 245832 2013-01-23 02:06:20Z obrien $");
+__FBSDID("$FreeBSD: head/bin/cp/utils.c 245960 2013-01-27 05:59:28Z markj $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -266,6 +266,11 @@
int len;
char llink[PATH_MAX];
+ if (exists && nflag) {
+ if (vflag)
+ printf("%s not overwritten\n", to.p_path);
+ return (1);
+ }
if ((len = readlink(p->fts_path, llink, sizeof(llink) - 1)) == -1) {
warn("readlink: %s", p->fts_path);
return (1);
@@ -285,6 +290,12 @@
int
copy_fifo(struct stat *from_stat, int exists)
{
+
+ if (exists && nflag) {
+ if (vflag)
+ printf("%s not overwritten\n", to.p_path);
+ return (1);
+ }
if (exists && unlink(to.p_path)) {
warn("unlink: %s", to.p_path);
return (1);
@@ -299,6 +310,12 @@
int
copy_special(struct stat *from_stat, int exists)
{
+
+ if (exists && nflag) {
+ if (vflag)
+ printf("%s not overwritten\n", to.p_path);
+ return (1);
+ }
if (exists && unlink(to.p_path)) {
warn("unlink: %s", to.p_path);
return (1);
==== //depot/projects/ctsrd/cheribsd/src/bin/df/df.1#3 (text+ko) ====
@@ -27,9 +27,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)df.1 8.3 (Berkeley) 5/8/95
-.\" $FreeBSD: head/bin/df/df.1 245871 2013-01-24 05:36:37Z delphij $
+.\" $FreeBSD: head/bin/df/df.1 245912 2013-01-25 18:47:16Z delphij $
.\"
-.Dd January 24, 2012
+.Dd January 24, 2013
.Dt DF 1
.Os
.Sh NAME
==== //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_target/snmp_target.3#4 (text+ko) ====
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/contrib/bsnmp/snmp_target/snmp_target.3 237193 2012-06-17 11:33:55Z joel $
+.\" $FreeBSD: head/contrib/bsnmp/snmp_target/snmp_target.3 245952 2013-01-26 22:08:21Z pfg $
.\"
.Dd December 16, 2010
.Dt SNMP_TARGET 3
==== //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_target/target_snmp.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/contrib/bsnmp/snmp_target/target_snmp.c 216594 2010-12-20 17:13:14Z syrinx $
+ * $FreeBSD: head/contrib/bsnmp/snmp_target/target_snmp.c 245952 2013-01-26 22:08:21Z pfg $
*/
#include <sys/queue.h>
#include <sys/types.h>
==== //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_usm/snmp_usm.3#4 (text+ko) ====
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/contrib/bsnmp/snmp_usm/snmp_usm.3 237194 2012-06-17 11:36:28Z joel $
+.\" $FreeBSD: head/contrib/bsnmp/snmp_usm/snmp_usm.3 245952 2013-01-26 22:08:21Z pfg $
.\"
.Dd September 9, 2010
.Dt SNMP_USM 3
==== //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_usm/usm_snmp.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/contrib/bsnmp/snmp_usm/usm_snmp.c 216294 2010-12-08 13:51:38Z syrinx $
+ * $FreeBSD: head/contrib/bsnmp/snmp_usm/usm_snmp.c 245952 2013-01-26 22:08:21Z pfg $
*/
#include <sys/queue.h>
#include <sys/types.h>
==== //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_vacm/snmp_vacm.3#4 (text+ko) ====
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: head/contrib/bsnmp/snmp_vacm/snmp_vacm.3 237193 2012-06-17 11:33:55Z joel $
+.\" $FreeBSD: head/contrib/bsnmp/snmp_vacm/snmp_vacm.3 245952 2013-01-26 22:08:21Z pfg $
.\"
.Dd October 7, 2010
.Dt SNMP_VACM 3
==== //depot/projects/ctsrd/cheribsd/src/contrib/bsnmp/snmp_vacm/vacm_snmp.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/contrib/bsnmp/snmp_vacm/vacm_snmp.c 216294 2010-12-08 13:51:38Z syrinx $
+ * $FreeBSD: head/contrib/bsnmp/snmp_vacm/vacm_snmp.c 245952 2013-01-26 22:08:21Z pfg $
*/
#include <sys/queue.h>
#include <sys/types.h>
==== //depot/projects/ctsrd/cheribsd/src/contrib/ee/ee.c#3 (text+ko) ====
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/contrib/ee/ee.c 228627 2011-12-17 14:26:16Z dim $");
+__FBSDID("$FreeBSD: head/contrib/ee/ee.c 245952 2013-01-26 22:08:21Z pfg $");
char *ee_copyright_message =
"Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon ";
==== //depot/projects/ctsrd/cheribsd/src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0#3 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: head/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 145519 2005-04-25 18:20:15Z darrenr $
+.\" $FreeBSD: head/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 245952 2013-01-26 22:08:21Z pfg $
.\"
*** ip6_input.c.orig Sun Feb 13 14:32:01 2000
--- ip6_input.c Wed Apr 26 22:31:34 2000
==== //depot/projects/ctsrd/cheribsd/src/contrib/ipfilter/ipsend/44arp.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/contrib/ipfilter/ipsend/44arp.c 186119 2008-12-15 06:10:57Z qingli $ */
+/* $FreeBSD: head/contrib/ipfilter/ipsend/44arp.c 246143 2013-01-31 08:55:21Z glebius $ */
/*
* Based upon 4.4BSD's /usr/sbin/arp
@@ -72,7 +72,7 @@
size_t needed;
char *lim, *buf, *next;
struct rt_msghdr *rtm;
- struct sockaddr_inarp *sin;
+ struct sockaddr_in *sin;
struct sockaddr_dl *sdl;
#ifdef IPSEND
@@ -113,7 +113,7 @@
for (next = buf; next < lim; next += rtm->rtm_msglen)
{
rtm = (struct rt_msghdr *)next;
- sin = (struct sockaddr_inarp *)(rtm + 1);
+ sin = (struct sockaddr_in *)(rtm + 1);
sdl = (struct sockaddr_dl *)(sin + 1);
if (!bcmp(addr, (char *)&sin->sin_addr,
sizeof(struct in_addr)))
==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#10 (text+ko) ====
@@ -1,6 +1,7 @@
.include <bsd.own.mk>
-SUBDIR= browser \
+SUBDIR= atsectl \
+ browser \
cheripoint \
cycle_led \
flashit \
==== //depot/projects/ctsrd/cheribsd/src/ctsrd/flashit/flashit.sh#3 (text+ko) ====
@@ -8,6 +8,10 @@
isf1_OFFSET=0
isf1_MAXLEN=0x02000000
+boot_DEV=isf0
+boot_OFFSET=0x01F00000
+boot_MAXLEN=0x100000
+
fpga_DEV=isf0
fpga_OFFSET=0x00020000
fpga_MAXLEN=0x00C00000
@@ -22,7 +26,7 @@
kernel_OFFSET=0x00000000
kernel_MAXLEN=0x02000000
-TARGETS="fpga:kernel:kernel2:root"
+TARGETS="boot:fpga:kernel:kernel2:root"
prog=`basename "$0"`
==== //depot/projects/ctsrd/cheribsd/src/etc/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: head/etc/Makefile 245825 2013-01-22 21:10:03Z brooks $
+# $FreeBSD: head/etc/Makefile 246127 2013-01-30 17:39:43Z brooks $
.include <bsd.own.mk>
@@ -180,6 +180,10 @@
PWD_MKDB_ENDIAN?=
.endif
+.if defined(NO_ROOT)
+METALOG.add?= cat -l >> ${METALOG}
+.endif
+
distribution:
.if !defined(DESTDIR)
@echo "set DESTDIR before running \"make ${.TARGET}\""
@@ -201,6 +205,14 @@
.endif
pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
${DESTDIR}/etc/master.passwd
+.if defined(NO_ROOT)
+ ( \
+ echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \
+ echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \
+ echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
+ echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
+ ) | ${METALOG.add}
+.endif
.if ${MK_ATF} != "no"
${_+_}cd ${.CURDIR}/atf; ${MAKE} install
.endif
@@ -336,9 +348,10 @@
test "$$d" == "/" && d=""; \
d=${DISTBASE}$$d; \
shift; \
- ${ECHO} "${MTREE_CMD} -C -f $$m | sed s#^\.#.$$d# >>" \
- "${METALOG}" ; \
- ${MTREE_CMD} -C -f $$m | sed s#^\.#.$$d# >> ${METALOG} ; \
+ ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
+ "sed s#^\.#.$$d# | ${METALOG.add}" ; \
+ ${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \
+ ${METALOG.add} ; \
done; true
.endif
${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
==== //depot/projects/ctsrd/cheribsd/src/etc/login.conf#4 (text+ko) ====
@@ -7,7 +7,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
-# $FreeBSD: head/etc/login.conf 244383 2012-12-18 07:27:50Z zont $
+# $FreeBSD: head/etc/login.conf 246002 2013-01-27 21:55:01Z neel $
#
# Default settings effectively disable resource limits, see the
@@ -59,7 +59,7 @@
staff:\
:tc=default:
daemon:\
- :memorylocked=64M:\
+ :memorylocked=128M:\
:tc=default:
news:\
:tc=default:
==== //depot/projects/ctsrd/cheribsd/src/gnu/lib/libsupc++/Version.map#3 (text+ko) ====
@@ -19,7 +19,7 @@
## Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
## USA.
-## $FreeBSD: head/gnu/lib/libsupc++/Version.map 236890 2012-06-11 15:40:57Z theraven $
+## $FreeBSD: head/gnu/lib/libsupc++/Version.map 246028 2013-01-28 11:12:49Z theraven $
# Symbols in the support library (libsupc++) have their own tag.
@@ -142,8 +142,37 @@
_ZdaPvRKSt9nothrow_t;
_ZdlPv;
_ZdlPvRKSt9nothrow_t;
+ extern "C++" {
+ std::set_new_handler*;
+ std::set_terminate*;
+ std::set_unexpected*;
+
+ std::bad_alloc;
+ std::bad_cast;
+ std::exception*;
+
+ "typeinfo for std::bad_alloc";
+ "typeinfo for std::bad_cast";
+ "typeinfo for std::exception";
+
+ "typeinfo name for std::bad_alloc";
+ "typeinfo name for std::bad_cast";
+ "typeinfo name for std::exception";
+
+ "vtable for std::bad_alloc";
+ "vtable for std::bad_cast";
+ "vtable for std::exception";
+ };
};
+GLIBCXX_3.4.9 {
+ extern "C++" {
+ "std::bad_alloc::what() const";
+ "std::bad_cast::what() const";
+ "std::bad_typeid::what() const";
+ };
+} GLIBCXX_3.4;
+
CXXABI_1.3.1 {
__cxa_get_exception_ptr;
==== //depot/projects/ctsrd/cheribsd/src/gnu/usr.bin/cc/c++/Makefile#3 (text+ko) ====
@@ -1,4 +1,7 @@
-# $FreeBSD: head/gnu/usr.bin/cc/c++/Makefile 245882 2013-01-24 15:18:41Z brooks $
+# $FreeBSD: head/gnu/usr.bin/cc/c++/Makefile 245898 2013-01-25 06:18:49Z andrew $
+
+NO_MAN=
+.include <bsd.own.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
@@ -7,13 +10,10 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list