Date: Sat, 23 May 2015 02:25:04 GMT From: pratiksinghal@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r285909 - in soc2015/pratiksinghal/cubie-head: . bin/pax cddl cddl/lib cddl/lib/libdtrace cddl/sbin cddl/usr.bin cddl/usr.bin/ctfconvert cddl/usr.bin/ctfdump cddl/usr.sbin cddl/usr.s... Message-ID: <201505230225.t4N2P4AA043116@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pratiksinghal Date: Sat May 23 02:25:03 2015 New Revision: 285909 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285909 Log: Merged with ~head Added: soc2015/pratiksinghal/cubie-head/lib/csu/i386/ - copied from r285886, mirror/FreeBSD/head/lib/csu/i386/ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/allwinner/a10_mmc.c soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/allwinner/a10_mmc.h soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_ecap.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/am335x/am335x_ecap.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_ehrpwm.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/am335x/am335x_ehrpwm.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_musb.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/am335x/am335x_musb.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_pwmss.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/am335x/am335x_pwmss.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_hwmods.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/ti_hwmods.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_hwmods.h - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/ti_hwmods.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_pinmux.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/ti_pinmux.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_pinmux.h - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/ti_pinmux.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/usb/omap_host.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/usb/omap_host.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/usb/omap_tll.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/usb/omap_tll.c soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/beaglebone-common.dtsi - copied unchanged from r285886, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/beaglebone-common.dtsi soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/pandaboard-common.dtsi - copied unchanged from r285886, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/pandaboard-common.dtsi soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/pandaboard-es.dts - copied unchanged from r285886, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/pandaboard-es.dts soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_arm64.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/dev/hwpmc/hwpmc_arm64.c soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_arm64.h - copied unchanged from r285886, mirror/FreeBSD/head/sys/dev/hwpmc/hwpmc_arm64.h soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_arm64_md.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/dev/hwpmc/hwpmc_arm64_md.c soc2015/pratiksinghal/cubie-head/tests/sys/kern/ptrace_test.c - copied unchanged from r285886, mirror/FreeBSD/head/tests/sys/kern/ptrace_test.c Deleted: soc2015/pratiksinghal/cubie-head/kerberos5/lib/libheimsqlite/ soc2015/pratiksinghal/cubie-head/lib/csu/i386-elf/ soc2015/pratiksinghal/cubie-head/lib/libmandoc/ soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_pwm.c soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/am335x.dtsi soc2015/pratiksinghal/cubie-head/usr.bin/demandoc/ Modified: soc2015/pratiksinghal/cubie-head/ (props changed) soc2015/pratiksinghal/cubie-head/Makefile.inc1 soc2015/pratiksinghal/cubie-head/ObsoleteFiles.inc soc2015/pratiksinghal/cubie-head/UPDATING soc2015/pratiksinghal/cubie-head/bin/pax/ar_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/buf_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/cache.c soc2015/pratiksinghal/cubie-head/bin/pax/cpio.c soc2015/pratiksinghal/cubie-head/bin/pax/file_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/gen_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/getoldopt.c soc2015/pratiksinghal/cubie-head/bin/pax/pat_rep.c soc2015/pratiksinghal/cubie-head/bin/pax/pax.c soc2015/pratiksinghal/cubie-head/bin/pax/sel_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/tar.c soc2015/pratiksinghal/cubie-head/bin/pax/tty_subs.c soc2015/pratiksinghal/cubie-head/cddl/ (props changed) soc2015/pratiksinghal/cubie-head/cddl/lib/Makefile soc2015/pratiksinghal/cubie-head/cddl/lib/libdtrace/Makefile soc2015/pratiksinghal/cubie-head/cddl/sbin/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.bin/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfconvert/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfdump/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/dtrace/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/lockstat/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/plockstat/Makefile soc2015/pratiksinghal/cubie-head/contrib/atf/ (props changed) soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/atf_check_test.sh soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/misc_helpers.sh soc2015/pratiksinghal/cubie-head/include/ (props changed) soc2015/pratiksinghal/cubie-head/include/stringlist.h soc2015/pratiksinghal/cubie-head/kerberos5/lib/Makefile soc2015/pratiksinghal/cubie-head/kerberos5/lib/libhdb/Makefile soc2015/pratiksinghal/cubie-head/lib/Makefile soc2015/pratiksinghal/cubie-head/lib/csu/Makefile soc2015/pratiksinghal/cubie-head/lib/libc/ (props changed) soc2015/pratiksinghal/cubie-head/lib/libc/gen/dlfcn.c soc2015/pratiksinghal/cubie-head/lib/libc/gen/stringlist.c soc2015/pratiksinghal/cubie-head/lib/libpmc/libpmc.c soc2015/pratiksinghal/cubie-head/lib/libproc/Makefile soc2015/pratiksinghal/cubie-head/lib/libprocstat/Makefile soc2015/pratiksinghal/cubie-head/lib/libprocstat/libprocstat.3 soc2015/pratiksinghal/cubie-head/lib/libufs/Makefile soc2015/pratiksinghal/cubie-head/release/Makefile.ec2 soc2015/pratiksinghal/cubie-head/release/Makefile.mirrors soc2015/pratiksinghal/cubie-head/sbin/ (props changed) soc2015/pratiksinghal/cubie-head/sbin/ipfw/ (props changed) soc2015/pratiksinghal/cubie-head/sbin/ipfw/tables.c soc2015/pratiksinghal/cubie-head/share/ (props changed) soc2015/pratiksinghal/cubie-head/share/man/man4/ (props changed) soc2015/pratiksinghal/cubie-head/share/man/man4/ctl.4 soc2015/pratiksinghal/cubie-head/share/man/man9/psignal.9 soc2015/pratiksinghal/cubie-head/share/mk/src.libnames.mk soc2015/pratiksinghal/cubie-head/sys/ (props changed) soc2015/pratiksinghal/cubie-head/sys/amd64/amd64/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/amd64/vmm/ (props changed) soc2015/pratiksinghal/cubie-head/sys/amd64/vmm/vmm_instruction_emul.c soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_clk.c soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_clk.h soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_ccm.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_rtc.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m6.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726 soc2015/pratiksinghal/cubie-head/sys/arm/arm/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/arm/arm/pmap.c soc2015/pratiksinghal/cubie-head/sys/arm/arm/pmu.c soc2015/pratiksinghal/cubie-head/sys/arm/at91/at91_pio.c soc2015/pratiksinghal/cubie-head/sys/arm/conf/BEAGLEBONE soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2 soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1 soc2015/pratiksinghal/cubie-head/sys/arm/conf/PANDABOARD soc2015/pratiksinghal/cubie-head/sys/arm/conf/SAM9G20EK soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102 soc2015/pratiksinghal/cubie-head/sys/arm/ti/aintc.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_dmtimer.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_gpio.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_lcd.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_lcd.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_pmic.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_prcm.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_pwm.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_scm_padconf.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_usbss.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/files.am335x soc2015/pratiksinghal/cubie-head/sys/arm/ti/cpsw/if_cpsw.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/cpsw/if_cpswreg.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/cpsw/if_cpswvar.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/files.ti soc2015/pratiksinghal/cubie-head/sys/arm/ti/omap4/files.omap4 soc2015/pratiksinghal/cubie-head/sys/arm/ti/omap4/omap4_gpio.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/omap4/omap4_prcm_clks.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/omap4/omap4_scm_padconf.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_adc.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_common.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_edma3.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_gpio.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_gpio.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_i2c.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_mbox.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_prcm.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_pruss.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_pruss.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_scm.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_scm.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_sdhci.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_sdma.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/usb/omap_ehci.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/usb/omap_usb.h soc2015/pratiksinghal/cubie-head/sys/arm64/arm64/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/arm64/arm64/intr_machdep.c soc2015/pratiksinghal/cubie-head/sys/arm64/include/armreg.h soc2015/pratiksinghal/cubie-head/sys/arm64/include/pmc_mdep.h soc2015/pratiksinghal/cubie-head/sys/boot/ (props changed) soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/am335x-evm.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/beaglebone-black.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/beaglebone.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/cubieboard.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/cubieboard2.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/odroidc1.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/pandaboard.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun7i-a20.dtsi soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/vsatv102-m6.dts soc2015/pratiksinghal/cubie-head/sys/conf/ (props changed) soc2015/pratiksinghal/cubie-head/sys/conf/files.arm64 soc2015/pratiksinghal/cubie-head/sys/ddb/db_access.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_access.h soc2015/pratiksinghal/cubie-head/sys/ddb/db_break.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_capture.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_command.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_examine.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_expr.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_main.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_print.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_ps.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_run.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_script.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_sym.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_sym.h soc2015/pratiksinghal/cubie-head/sys/ddb/db_textdump.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_thread.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_variables.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_watch.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_write_cmd.c soc2015/pratiksinghal/cubie-head/sys/ddb/ddb.h soc2015/pratiksinghal/cubie-head/sys/dev/acpica/acpi_cpu.c soc2015/pratiksinghal/cubie-head/sys/dev/acpica/acpi_throttle.c soc2015/pratiksinghal/cubie-head/sys/dev/bxe/bxe.c soc2015/pratiksinghal/cubie-head/sys/dev/bxe/bxe_stats.c soc2015/pratiksinghal/cubie-head/sys/dev/bxe/bxe_stats.h soc2015/pratiksinghal/cubie-head/sys/dev/fdt/fdt_common.c soc2015/pratiksinghal/cubie-head/sys/dev/fdt/fdt_common.h soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_core.c soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_mod.c soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/pmc_events.h soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_adminq.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_adminq.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_adminq_cmd.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_alloc.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_common.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_hmc.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_hmc.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_lan_hmc.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_lan_hmc.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_nvm.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_osdep.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_osdep.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_prototype.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_register.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_status.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_type.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_virtchnl.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/if_ixl.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/ixl_txrx.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/mmc/mmc.c soc2015/pratiksinghal/cubie-head/sys/dev/sdhci/sdhci.c soc2015/pratiksinghal/cubie-head/sys/dev/sdhci/sdhci.h soc2015/pratiksinghal/cubie-head/sys/dev/sfxge/sfxge_tx.c soc2015/pratiksinghal/cubie-head/sys/dev/uart/uart_dev_ti8250.c soc2015/pratiksinghal/cubie-head/sys/dev/usb/controller/dwc_otg.c soc2015/pratiksinghal/cubie-head/sys/fs/nfsclient/nfs_clvnops.c soc2015/pratiksinghal/cubie-head/sys/fs/procfs/procfs_ctl.c soc2015/pratiksinghal/cubie-head/sys/geom/uncompress/g_uncompress.c soc2015/pratiksinghal/cubie-head/sys/i386/i386/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/kern/kern_condvar.c soc2015/pratiksinghal/cubie-head/sys/kern/kern_exit.c soc2015/pratiksinghal/cubie-head/sys/kern/kern_ktr.c soc2015/pratiksinghal/cubie-head/sys/kern/kern_shutdown.c soc2015/pratiksinghal/cubie-head/sys/kern/subr_nvlist.c soc2015/pratiksinghal/cubie-head/sys/kern/subr_nvpair.c soc2015/pratiksinghal/cubie-head/sys/kern/subr_turnstile.c soc2015/pratiksinghal/cubie-head/sys/kern/subr_witness.c soc2015/pratiksinghal/cubie-head/sys/mips/conf/ROUTERSTATION soc2015/pratiksinghal/cubie-head/sys/mips/conf/RSPRO soc2015/pratiksinghal/cubie-head/sys/mips/mips/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/mips/mips/pmap.c soc2015/pratiksinghal/cubie-head/sys/mips/mips/vm_machdep.c soc2015/pratiksinghal/cubie-head/sys/modules/Makefile soc2015/pratiksinghal/cubie-head/sys/net80211/ieee80211_freebsd.c soc2015/pratiksinghal/cubie-head/sys/netinet/tcp_hostcache.c soc2015/pratiksinghal/cubie-head/sys/netinet/tcp_input.c soc2015/pratiksinghal/cubie-head/sys/netipsec/key.c soc2015/pratiksinghal/cubie-head/sys/netipsec/keysock.c soc2015/pratiksinghal/cubie-head/sys/netpfil/ipfw/dn_sched.h soc2015/pratiksinghal/cubie-head/sys/netpfil/ipfw/ip_dn_private.h soc2015/pratiksinghal/cubie-head/sys/netpfil/ipfw/ip_fw_pfil.c soc2015/pratiksinghal/cubie-head/sys/netpfil/ipfw/ip_fw_sockopt.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf_if.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf_ioctl.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf_norm.c soc2015/pratiksinghal/cubie-head/sys/powerpc/powerpc/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/sparc64/sparc64/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/sys/condvar.h soc2015/pratiksinghal/cubie-head/sys/sys/elf_common.h soc2015/pratiksinghal/cubie-head/sys/sys/ktr.h soc2015/pratiksinghal/cubie-head/sys/sys/module.h soc2015/pratiksinghal/cubie-head/sys/sys/nvpair_impl.h soc2015/pratiksinghal/cubie-head/sys/sys/pmc.h soc2015/pratiksinghal/cubie-head/sys/sys/systm.h soc2015/pratiksinghal/cubie-head/sys/vm/vm_page.c soc2015/pratiksinghal/cubie-head/sys/x86/x86/cpu_machdep.c soc2015/pratiksinghal/cubie-head/tests/sys/kern/Makefile soc2015/pratiksinghal/cubie-head/tools/build/mk/OptionalObsoleteFiles.inc soc2015/pratiksinghal/cubie-head/usr.bin/Makefile soc2015/pratiksinghal/cubie-head/usr.bin/ctlstat/ctlstat.8 soc2015/pratiksinghal/cubie-head/usr.bin/mandoc/Makefile soc2015/pratiksinghal/cubie-head/usr.bin/procstat/ (props changed) soc2015/pratiksinghal/cubie-head/usr.bin/procstat/procstat.1 soc2015/pratiksinghal/cubie-head/usr.bin/soelim/soelim.1 soc2015/pratiksinghal/cubie-head/usr.bin/soelim/soelim.c soc2015/pratiksinghal/cubie-head/usr.bin/tar/Makefile soc2015/pratiksinghal/cubie-head/usr.sbin/bhyve/ (props changed) soc2015/pratiksinghal/cubie-head/usr.sbin/bhyve/block_if.h soc2015/pratiksinghal/cubie-head/usr.sbin/bhyve/pci_hostbridge.c soc2015/pratiksinghal/cubie-head/usr.sbin/bhyvectl/ (props changed) soc2015/pratiksinghal/cubie-head/usr.sbin/bhyvectl/bhyvectl.c soc2015/pratiksinghal/cubie-head/usr.sbin/bluetooth/bthidd/Makefile soc2015/pratiksinghal/cubie-head/usr.sbin/ctladm/ctladm.8 soc2015/pratiksinghal/cubie-head/usr.sbin/ctld/ctld.8 soc2015/pratiksinghal/cubie-head/usr.sbin/iostat/iostat.8 soc2015/pratiksinghal/cubie-head/usr.sbin/uefisign/pe.c Modified: soc2015/pratiksinghal/cubie-head/Makefile.inc1 ============================================================================== --- soc2015/pratiksinghal/cubie-head/Makefile.inc1 Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/Makefile.inc1 Sat May 23 02:25:03 2015 (r285909) @@ -1297,7 +1297,9 @@ _lex= usr.bin/lex .endif -.if ${BOOTSTRAPPING} < 1001507 +# r277259 crunchide: Correct 64-bit section header offset +# r281674 crunchide: always include both 32- and 64-bit ELF support +.if ${BOOTSTRAPPING} < 1100071 _crunch= usr.sbin/crunch .endif @@ -1466,11 +1468,6 @@ _btxld= usr.sbin/btxld .endif .endif -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ${MK_RESCUE} != "no" -_crunchide= usr.sbin/crunch/crunchide -.endif -.endif # If we're given an XAS, don't build binutils. .if ${XAS:M/*} == "" @@ -1505,6 +1502,9 @@ _cc= gnu/usr.bin/cc .endif .endif +.if ${MK_USB} != "no" +_usb_tools= sys/boot/usb/tools +.endif cross-tools: .MAKE .for _tool in \ @@ -1515,7 +1515,7 @@ ${_cc} \ ${_btxld} \ ${_crunchide} \ - sys/boot/usb/tools + ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ @@ -1679,7 +1679,7 @@ ${_kerberos5_lib_libhdb} \ ${_kerberos5_lib_libheimbase} \ ${_kerberos5_lib_libheimntlm} \ - ${_kerberos5_lib_libheimsqlite} \ + ${_libsqlite3} \ ${_kerberos5_lib_libheimipcc} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ @@ -1755,6 +1755,13 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libzfs__L: lib/libgeom__L cddl/lib/libctf__L: lib/libz__L +# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built +# on select architectures though (see cddl/lib/Makefile) +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ + ${MACHINE_CPUARCH} == "arm" +_prebuild_libs+= lib/libproc lib/librtld_db +.endif .endif .if ${MK_CRYPT} != "no" @@ -1786,7 +1793,7 @@ kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \ - kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L + kerberos5/lib/libwind__L lib/libsqlite3__L kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ @@ -1799,7 +1806,7 @@ kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libheimbase__L: lib/libthr__L kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L -kerberos5/lib/libheimsqlite__L: lib/libthr__L +lib/libsqlite3__L: lib/libthr__L .endif .if ${MK_GSSAPI} != "no" @@ -1815,7 +1822,7 @@ _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm -_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite +_libsqlite3= lib/libsqlite3 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libwind= kerberos5/lib/libwind _libcom_err= lib/libcom_err @@ -1829,6 +1836,16 @@ lib/libradius__L: lib/libmd__L .endif +lib/libproc__L: \ + ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L +.if ${MK_CXX} != "no" +.if ${MK_LIBCPLUSPLUS} != "no" +lib/libproc__L: lib/libcxxrt__L +.else # This implies MK_GNUCXX != "no"; see lib/libproc +lib/libproc__L: gnu/lib/libsupc++__L +.endif +.endif + gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L .for _lib in ${_prereq_libs} Modified: soc2015/pratiksinghal/cubie-head/ObsoleteFiles.inc ============================================================================== --- soc2015/pratiksinghal/cubie-head/ObsoleteFiles.inc Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/ObsoleteFiles.inc Sat May 23 02:25:03 2015 (r285909) @@ -38,6 +38,20 @@ # xargs -n1 | sort | uniq -d; # done +# 20150521 +OLD_FILES+=usr/bin/demandoc +OLD_FILES+=usr/share/man/man1/demandoc.1.gz +OLD_FILES+=usr/share/man/man3/mandoc.3.gz +OLD_FILES+=usr/share/man/man3/mandoc_headers.3.gz +# 20150520 +OLD_FILES+=usr/lib/libheimsqlite.a +OLD_FILES+=usr/lib/libheimsqlite.so +OLD_LIBS+=usr/lib/libheimsqlite.so.11 +OLD_FILES+=usr/lib/libheimsqlite_p.a +OLD_FILES+=usr/lib32/libheimsqlite.a +OLD_FILES+=usr/lib32/libheimsqlite.so +OLD_LIBS+=usr/lib32/libheimsqlite.so.11 +OLD_FILES+=usr/lib32/libheimsqlite_p.a # 20150506 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz # 20150504 Modified: soc2015/pratiksinghal/cubie-head/UPDATING ============================================================================== --- soc2015/pratiksinghal/cubie-head/UPDATING Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/UPDATING Sat May 23 02:25:03 2015 (r285909) @@ -31,6 +31,19 @@ disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150521: + TI platform code switched to using vendor DTS files and this update + may break existing systems running on Beaglebone, Beaglebone Black, + and Pandaboard: + + - dtb files should be regenerated/reinstalled. Filenames are the + same but content is different now + - GPIO addressing was changed, now each GPIO bank (32 pins per bank) + has its own /dev/gpiocX device, e.g. pin 121 on /dev/gpioc0 in old + addressing scheme is now pin 25 on /dev/gpioc3. + - Pandaboard: /etc/ttys should be updated, serial console device is + now /dev/ttyu2, not /dev/ttyu0 + 20150501: soelim(1) from gnu/usr.bin/groff has been replaced by usr.bin/soelim. If you need the GNU extension from groff soelim(1), install groff Modified: soc2015/pratiksinghal/cubie-head/bin/pax/ar_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/ar_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/ar_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -48,7 +48,6 @@ #include <fcntl.h> #include <errno.h> #include <unistd.h> -#include <stdlib.h> #include "pax.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/buf_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/buf_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/buf_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -44,7 +44,6 @@ #include <errno.h> #include <unistd.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> #include "pax.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/cache.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/cache.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/cache.c Sat May 23 02:25:03 2015 (r285909) @@ -45,7 +45,6 @@ #include <stdio.h> #include <pwd.h> #include <grp.h> -#include <unistd.h> #include <stdlib.h> #include "pax.h" #include "cache.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/cpio.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/cpio.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/cpio.c Sat May 23 02:25:03 2015 (r285909) @@ -45,8 +45,6 @@ #include <string.h> #include <stdint.h> #include <stdio.h> -#include <unistd.h> -#include <stdlib.h> #include "pax.h" #include "cpio.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/file_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/file_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/file_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -48,7 +48,6 @@ #include <stdio.h> #include <errno.h> #include <sys/uio.h> -#include <stdlib.h> #include "pax.h" #include "options.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/gen_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/gen_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/gen_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -45,8 +45,6 @@ #include <langinfo.h> #include <stdint.h> #include <stdio.h> -#include <unistd.h> -#include <stdlib.h> #include <string.h> #include "pax.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/getoldopt.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/getoldopt.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/getoldopt.c Sat May 23 02:25:03 2015 (r285909) @@ -19,8 +19,7 @@ #include <string.h> #include <unistd.h> -#include "pax.h" -#include "extern.h" +int getoldopt(int, char **, const char *); int getoldopt(int argc, char **argv, const char *optstring) Modified: soc2015/pratiksinghal/cubie-head/bin/pax/pat_rep.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/pat_rep.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/pat_rep.c Sat May 23 02:25:03 2015 (r285909) @@ -43,9 +43,7 @@ #include <sys/stat.h> #include <stdio.h> #include <string.h> -#include <unistd.h> #include <stdlib.h> -#include <errno.h> #ifdef NET2_REGEX #include <regexp.h> #else Modified: soc2015/pratiksinghal/cubie-head/bin/pax/pax.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/pax.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/pax.c Sat May 23 02:25:03 2015 (r285909) @@ -58,7 +58,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> #include "pax.h" #include "extern.h" static int gen_init(void); Modified: soc2015/pratiksinghal/cubie-head/bin/pax/sel_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/sel_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/sel_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -47,7 +47,6 @@ #include <stdio.h> #include <string.h> #include <strings.h> -#include <unistd.h> #include <stdlib.h> #include "pax.h" #include "sel_subs.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/tar.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/tar.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/tar.c Sat May 23 02:25:03 2015 (r285909) @@ -44,8 +44,6 @@ #include <sys/stat.h> #include <string.h> #include <stdio.h> -#include <unistd.h> -#include <stdlib.h> #include "pax.h" #include "extern.h" #include "tar.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/tty_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/tty_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/tty_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -44,7 +44,6 @@ #include <fcntl.h> #include <stdio.h> #include <unistd.h> -#include <stdlib.h> #include <string.h> #include "pax.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/cddl/lib/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/lib/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/lib/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -33,4 +33,11 @@ _libdtrace= libdtrace .endif +SUBDIR_DEPEND_libdtrace= libctf +SUBDIR_DEPEND_libzfs_core= libnvpair +SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core +SUBDIR_DEPEND_libzpool= libavl libnvpair libumem + +SUBDIR_PARALLEL= + .include <bsd.subdir.mk> Modified: soc2015/pratiksinghal/cubie-head/cddl/lib/libdtrace/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/lib/libdtrace/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/lib/libdtrace/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -104,6 +104,8 @@ YFLAGS+=-d +LIBADD= ctf elf proc pthread rtld_db + CLEANFILES= dt_errtags.c dt_names.c dt_errtags.c: Modified: soc2015/pratiksinghal/cubie-head/cddl/sbin/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/sbin/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/sbin/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -13,4 +13,6 @@ _zpool= zpool .endif +SUBDIR_PARALLEL= + .include <bsd.subdir.mk> Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.bin/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.bin/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.bin/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -26,4 +26,6 @@ .endif .endif +SUBDIR_PARALLEL= + .include <bsd.subdir.mk> Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfconvert/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfconvert/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -3,8 +3,6 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt -DEBUG_FLAGS= -g - PROG= ctfconvert SRCS= alist.c \ ctf.c \ @@ -36,7 +34,6 @@ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} -LDADD= -ldwarf -lelf -lz -lpthread +LIBADD= dwarf elf z pthread .include <bsd.prog.mk> Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfdump/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfdump/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -17,7 +17,6 @@ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ} -LDADD= -lpthread -lelf -lz +LIBADD= elf z .include <bsd.prog.mk> Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -46,4 +46,6 @@ _lockstat= lockstat .endif +SUBDIR_PARALLEL= + .include <bsd.subdir.mk> Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/dtrace/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/dtrace/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -20,9 +20,6 @@ #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \ - -lrtld_db +LIBADD= dtrace .include <bsd.prog.mk> Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/lockstat/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/lockstat/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -21,10 +21,6 @@ #YFLAGS+= -d -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} ${LIBUTIL} \ - ${LIBRTLD_DB} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt -lutil \ - -lrtld_db +LIBADD= elf dtrace rt .include <bsd.prog.mk> Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/plockstat/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/plockstat/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/plockstat/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -18,9 +18,6 @@ -I${.CURDIR}/../../../cddl/lib/libdtrace \ -I${.CURDIR}/../../../sys -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF}\ - ${LIBELF} ${LIBZ} ${LIBRT} ${LIBRTLD_DB} ${LIBUTIL} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt \ - -lrtld_db -lutil +LIBADD= dtrace proc .include <bsd.prog.mk> Modified: soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/atf_check_test.sh ============================================================================== --- soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/atf_check_test.sh Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/atf_check_test.sh Sat May 23 02:25:03 2015 (r285909) @@ -164,18 +164,22 @@ grep '^failed: \${x} != \${y} (a != b)$' resfile } -atf_test_case flush_stdout_on_timeout -flush_stdout_on_timeout_body() +atf_test_case flush_stdout_on_death +flush_stdout_on_death_body() { - "$(atf_get_srcdir)/misc_helpers" -s "$(atf_get_srcdir)" atf_check_timeout \ - >out 2>err & + CONTROL_FILE="$(pwd)/done" "$(atf_get_srcdir)/misc_helpers" \ + -s "$(atf_get_srcdir)" atf_check_flush_stdout >out 2>err & pid="${!}" - sleep 1 - kill "${pid}" + while [ ! -f ./done ]; do + echo "Still waiting for helper to create control file" + ls + sleep 1 + done + kill -9 "${pid}" grep 'Executing command.*true' out \ || atf_fail 'First command not in output' - grep 'Executing command.*sleep 42' out \ + grep 'Executing command.*false' out \ || atf_fail 'Second command not in output' } @@ -187,7 +191,7 @@ atf_add_test_case null_stdout atf_add_test_case null_stderr atf_add_test_case equal - atf_add_test_case flush_stdout_on_timeout + atf_add_test_case flush_stdout_on_death } # vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 Modified: soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/misc_helpers.sh ============================================================================== --- soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/misc_helpers.sh Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/misc_helpers.sh Sat May 23 02:25:03 2015 (r285909) @@ -139,16 +139,20 @@ atf_check_equal '${x}' '${y}' } -atf_test_case atf_check_timeout -atf_check_timeout_head() +atf_test_case atf_check_flush_stdout +atf_check_flush_stdout_head() { atf_set "descr" "Helper test case for the t_atf_check test program" - atf_set "timeout" 1 + atf_set "timeout" "30" } -atf_check_timeout_body() +atf_check_flush_stdout_body() { atf_check true - atf_check sleep 42 + atf_check -s exit:1 false + touch "${CONTROL_FILE:-done}" + while :; do + sleep 1 + done } # ------------------------------------------------------------------------- @@ -281,7 +285,7 @@ atf_add_test_case atf_check_equal_fail atf_add_test_case atf_check_equal_eval_ok atf_add_test_case atf_check_equal_eval_fail - atf_add_test_case atf_check_timeout + atf_add_test_case atf_check_flush_stdout # Add helper tests for t_config. atf_add_test_case config_get Modified: soc2015/pratiksinghal/cubie-head/include/stringlist.h ============================================================================== --- soc2015/pratiksinghal/cubie-head/include/stringlist.h Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/include/stringlist.h Sat May 23 02:25:03 2015 (r285909) @@ -12,11 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED Modified: soc2015/pratiksinghal/cubie-head/kerberos5/lib/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/kerberos5/lib/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/kerberos5/lib/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -3,7 +3,7 @@ SUBDIR= libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \ libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \ - libroken libsl libvers libkdc libwind libheimsqlite libheimbase libheimipcc libheimipcs + libroken libsl libvers libkdc libwind libheimbase libheimipcc libheimipcs SUBDIR+= libkafs5 # requires krb_err.h from libkrb5 Modified: soc2015/pratiksinghal/cubie-head/kerberos5/lib/libhdb/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/kerberos5/lib/libhdb/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/kerberos5/lib/libhdb/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -3,7 +3,7 @@ LIB= hdb LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map -LIBADD= asn1 com_err krb5 roken heimsqlite +LIBADD= asn1 com_err krb5 roken sqlite3 DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 @@ -56,7 +56,7 @@ ${GEN:S/.x$/.c/:S/.hx$/.h/} CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sqlite \ + -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ -I${KRB5DIR}/lib/krb5 \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" Modified: soc2015/pratiksinghal/cubie-head/lib/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -65,7 +65,6 @@ ${_libldns} \ liblzma \ ${_libmagic} \ - libmandoc \ libmemstat \ libmd \ ${_libmilter} \ Modified: soc2015/pratiksinghal/cubie-head/lib/csu/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/csu/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/csu/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -1,8 +1,7 @@ # $FreeBSD$ -ARCH= ${MACHINE_ARCH:S/i386/i386-elf/} -.if exists(${.CURDIR}/${ARCH}) -SUBDIR+= ${ARCH} +.if exists(${.CURDIR}/${MACHINE_ARCH}) +SUBDIR+= ${MACHINE_ARCH} .else SUBDIR+= ${MACHINE_CPUARCH} .endif Modified: soc2015/pratiksinghal/cubie-head/lib/libc/gen/dlfcn.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libc/gen/dlfcn.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libc/gen/dlfcn.c Sat May 23 02:25:03 2015 (r285909) @@ -149,10 +149,8 @@ dl_init_phdr_info(void) { Elf_Auxinfo *auxp; - size_t phent; unsigned int i; - phent = 0; for (auxp = __elf_aux_vector; auxp->a_type != AT_NULL; auxp++) { switch (auxp->a_type) { case AT_BASE: @@ -165,9 +163,6 @@ phdr_info.dlpi_phdr = (const Elf_Phdr *)auxp->a_un.a_ptr; break; - case AT_PHENT: - phent = auxp->a_un.a_val; - break; case AT_PHNUM: phdr_info.dlpi_phnum = (Elf_Half)auxp->a_un.a_val; break; Modified: soc2015/pratiksinghal/cubie-head/lib/libc/gen/stringlist.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libc/gen/stringlist.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libc/gen/stringlist.c Sat May 23 02:25:03 2015 (r285909) @@ -10,8 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED Modified: soc2015/pratiksinghal/cubie-head/lib/libpmc/libpmc.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libpmc/libpmc.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libpmc/libpmc.c Sat May 23 02:25:03 2015 (r285909) @@ -82,6 +82,10 @@ static int armv7_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif +#if defined(__aarch64__) +static int arm64_allocate_pmc(enum pmc_event _pe, char *_ctrspec, + struct pmc_op_pmcallocate *_pmc_config); +#endif #if defined(__mips__) static int mips_allocate_pmc(enum pmc_event _pe, char* ctrspec, struct pmc_op_pmcallocate *_pmc_config); @@ -158,6 +162,7 @@ PMC_CLASSDEP_TABLE(p6, P6); PMC_CLASSDEP_TABLE(xscale, XSCALE); PMC_CLASSDEP_TABLE(armv7, ARMV7); +PMC_CLASSDEP_TABLE(armv8, ARMV8); PMC_CLASSDEP_TABLE(mips24k, MIPS24K); PMC_CLASSDEP_TABLE(mips74k, MIPS74K); PMC_CLASSDEP_TABLE(octeon, OCTEON); @@ -263,6 +268,16 @@ __PMC_EV_ALIAS_WESTMEREUC() }; +static const struct pmc_event_descr cortex_a53_event_table[] = +{ + __PMC_EV_ALIAS_ARMV8_CORTEX_A53() +}; + +static const struct pmc_event_descr cortex_a57_event_table[] = +{ + __PMC_EV_ALIAS_ARMV8_CORTEX_A57() +}; + /* * PMC_MDEP_TABLE(NAME, PRIMARYCLASS, ADDITIONAL_CLASSES...) * @@ -294,6 +309,8 @@ PMC_MDEP_TABLE(p6, P6, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(xscale, XSCALE, PMC_CLASS_SOFT, PMC_CLASS_XSCALE); PMC_MDEP_TABLE(armv7, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7); +PMC_MDEP_TABLE(cortex_a53, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8); +PMC_MDEP_TABLE(cortex_a57, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8); PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K); PMC_MDEP_TABLE(mips74k, MIPS74K, PMC_CLASS_SOFT, PMC_CLASS_MIPS74K); PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON); @@ -362,6 +379,10 @@ #endif PMC_CLASS_TABLE_DESC(armv7, ARMV7, armv7, armv7); #endif +#if defined(__aarch64__) +PMC_CLASS_TABLE_DESC(cortex_a53, ARMV8, cortex_a53, arm64); +PMC_CLASS_TABLE_DESC(cortex_a57, ARMV8, cortex_a57, arm64); +#endif #if defined(__mips__) PMC_CLASS_TABLE_DESC(mips24k, MIPS24K, mips24k, mips); PMC_CLASS_TABLE_DESC(mips74k, MIPS74K, mips74k, mips); @@ -402,9 +423,14 @@ __PMC_CAPS() }; -static const char * pmc_class_names[] = { +struct pmc_class_map { + enum pmc_class pm_class; + const char *pm_name; +}; + +static const struct pmc_class_map pmc_class_names[] = { #undef __PMC_CLASS -#define __PMC_CLASS(C) #C , +#define __PMC_CLASS(S,V,D) { .pm_class = PMC_CLASS_##S, .pm_name = #S } , __PMC_CLASSES() }; @@ -2429,6 +2455,26 @@ } #endif +#if defined(__aarch64__) +static struct pmc_event_alias cortex_a53_aliases[] = { + EV_ALIAS(NULL, NULL) +}; +static struct pmc_event_alias cortex_a57_aliases[] = { + EV_ALIAS(NULL, NULL) +}; +static int +arm64_allocate_pmc(enum pmc_event pe, char *ctrspec __unused, + struct pmc_op_pmcallocate *pmc_config __unused) +{ + switch (pe) { + default: + break; + } + + return (0); +} +#endif + #if defined(__mips__) static struct pmc_event_alias mips24k_aliases[] = { @@ -2938,6 +2984,19 @@ ev = armv7_event_table; count = PMC_EVENT_TABLE_SIZE(armv7); break; + case PMC_CLASS_ARMV8: + switch (cpu_info.pm_cputype) { + default: + case PMC_CPU_ARMV8_CORTEX_A53: + ev = cortex_a53_event_table; + count = PMC_EVENT_TABLE_SIZE(cortex_a53); + break; + case PMC_CPU_ARMV8_CORTEX_A57: + ev = cortex_a57_event_table; + count = PMC_EVENT_TABLE_SIZE(cortex_a57); + break; + } + break; case PMC_CLASS_MIPS24K: ev = mips24k_event_table; count = PMC_EVENT_TABLE_SIZE(mips24k); @@ -3235,6 +3294,16 @@ pmc_class_table[n] = &armv7_class_table_descr; break; #endif +#if defined(__aarch64__) + case PMC_CPU_ARMV8_CORTEX_A53: + PMC_MDEP_INIT(cortex_a53); + pmc_class_table[n] = &cortex_a53_class_table_descr; + break; + case PMC_CPU_ARMV8_CORTEX_A57: + PMC_MDEP_INIT(cortex_a57); + pmc_class_table[n] = &cortex_a57_class_table_descr; + break; +#endif #if defined(__mips__) case PMC_CPU_MIPS_24K: PMC_MDEP_INIT(mips24k); @@ -3298,9 +3367,11 @@ const char * pmc_name_of_class(enum pmc_class pc) { - if ((int) pc >= PMC_CLASS_FIRST && - pc <= PMC_CLASS_LAST) - return (pmc_class_names[pc]); + size_t n; + + for (n = 0; n < PMC_TABLE_SIZE(pmc_class_names); n++) + if (pc == pmc_class_names[n].pm_class) + return (pmc_class_names[n].pm_name); errno = EINVAL; return (NULL); @@ -3446,6 +3517,19 @@ } else if (pe >= PMC_EV_ARMV7_FIRST && pe <= PMC_EV_ARMV7_LAST) { ev = armv7_event_table; evfence = armv7_event_table + PMC_EVENT_TABLE_SIZE(armv7); + } else if (pe >= PMC_EV_ARMV8_FIRST && pe <= PMC_EV_ARMV8_LAST) { + switch (cpu) { + case PMC_CPU_ARMV8_CORTEX_A53: + ev = cortex_a53_event_table; + evfence = cortex_a53_event_table + PMC_EVENT_TABLE_SIZE(cortex_a53); + break; + case PMC_CPU_ARMV8_CORTEX_A57: + ev = cortex_a57_event_table; + evfence = cortex_a57_event_table + PMC_EVENT_TABLE_SIZE(cortex_a57); + break; + default: /* Unknown CPU type. */ + break; + } } else if (pe >= PMC_EV_MIPS24K_FIRST && pe <= PMC_EV_MIPS24K_LAST) { ev = mips24k_event_table; evfence = mips24k_event_table + PMC_EVENT_TABLE_SIZE(mips24k); Modified: soc2015/pratiksinghal/cubie-head/lib/libproc/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libproc/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libproc/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -23,6 +23,8 @@ LIBADD+= supcplusplus .endif +LIBADD+= elf rtld_db util + .if ${MK_CDDL} != "no" LIBADD+= ctf IGNORE_PRAGMA= YES Modified: soc2015/pratiksinghal/cubie-head/lib/libprocstat/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libprocstat/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libprocstat/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -22,6 +22,36 @@ LIBADD= elf kvm util MAN= libprocstat.3 +MLINKS+=libprocstat.3 procstat_close.3 \ + libprocstat.3 procstat_freeargv.3 \ + libprocstat.3 procstat_freeauxv.3 \ + libprocstat.3 procstat_freeenvv.3 \ + libprocstat.3 procstat_freefiles.3 \ + libprocstat.3 procstat_freegroups.3 \ + libprocstat.3 procstat_freekstack.3 \ + libprocstat.3 procstat_freeprocs.3 \ + libprocstat.3 procstat_freevmmap.3 \ + libprocstat.3 procstat_get_pipe_info.3 \ + libprocstat.3 procstat_get_pts_info.3 \ + libprocstat.3 procstat_get_sem_info.3 \ + libprocstat.3 procstat_get_shm_info.3 \ + libprocstat.3 procstat_get_socket_info.3 \ + libprocstat.3 procstat_get_vnode_info.3 \ + libprocstat.3 procstat_getargv.3 \ + libprocstat.3 procstat_getauxv.3 \ + libprocstat.3 procstat_getenvv.3 \ + libprocstat.3 procstat_getfiles.3 \ + libprocstat.3 procstat_getgroups.3 \ + libprocstat.3 procstat_getkstack.3 \ + libprocstat.3 procstat_getosrel.3 \ + libprocstat.3 procstat_getpathname.3 \ + libprocstat.3 procstat_getprocs.3 \ + libprocstat.3 procstat_getrlimit.3 \ + libprocstat.3 procstat_getumask.3 \ + libprocstat.3 procstat_getvmmap.3 \ + libprocstat.3 procstat_open_core.3 \ + libprocstat.3 procstat_open_kvm.3 \ + libprocstat.3 procstat_open_sysctl.3 # XXX This is a hack. .if ${MK_CDDL} != "no" Modified: soc2015/pratiksinghal/cubie-head/lib/libprocstat/libprocstat.3 ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libprocstat/libprocstat.3 Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libprocstat/libprocstat.3 Sat May 23 02:25:03 2015 (r285909) @@ -24,25 +24,11 @@ .\" .\" $FreeBSD$ .\" -.Dd May 3, 2013 +.Dd May 18, 2015 .Dt LIBPROCSTAT 3 .Os .Sh NAME -.Nm procstat_open_core , -.Nm procstat_open_kvm , -.Nm procstat_open_sysctl , .Nm procstat_close , -.Nm procstat_getargv , -.Nm procstat_getauxv , -.Nm procstat_getenvv , -.Nm procstat_getfiles , -.Nm procstat_getgroups , -.Nm procstat_getkstack , -.Nm procstat_getosrel , -.Nm procstat_getpathname , -.Nm procstat_getprocs , -.Nm procstat_getumask , -.Nm procstat_getvmmap , .Nm procstat_freeargv , .Nm procstat_freeauxv , .Nm procstat_freeenvv , @@ -56,7 +42,22 @@ .Nm procstat_get_sem_info , .Nm procstat_get_shm_info , .Nm procstat_get_socket_info , -.Nm procstat_get_vnode_info +.Nm procstat_get_vnode_info , +.Nm procstat_getargv , +.Nm procstat_getauxv , +.Nm procstat_getenvv , +.Nm procstat_getfiles , +.Nm procstat_getgroups , +.Nm procstat_getkstack , +.Nm procstat_getosrel , +.Nm procstat_getpathname , +.Nm procstat_getprocs , +.Nm procstat_getrlimit , +.Nm procstat_getumask , +.Nm procstat_getvmmap , +.Nm procstat_open_core , +.Nm procstat_open_kvm , +.Nm procstat_open_sysctl .Nd library interface for file and process information retrieval .Sh LIBRARY .Lb libprocstat @@ -175,17 +176,24 @@ .Fa "struct kinfo_proc *kp" .Fa "unsigned int *count" .Fc +.Ft "struct kinfo_kstack *" +.Fo procstat_getkstack +.Fa "struct procstat *procstat" +.Fa "struct kinfo_proc *kp" +.Fa "unsigned int *count" +.Fc .Ft int .Fo procstat_getosrel .Fa "struct procstat *procstat" .Fa "struct kinfo_proc *kp" .Fa "int *osrelp" .Fc -.Ft "struct kinfo_kstack *" -.Fo procstat_getkstack +.Ft "int" +.Fo procstat_getpathname .Fa "struct procstat *procstat" .Fa "struct kinfo_proc *kp" -.Fa "unsigned int *count" +.Fa "char *pathname" +.Fa "size_t maxlen" .Fc .Ft "struct kinfo_proc *" .Fo procstat_getprocs @@ -195,13 +203,6 @@ .Fa "unsigned int *count" .Fc .Ft "int" -.Fo procstat_getpathname -.Fa "struct procstat *procstat" -.Fa "struct kinfo_proc *kp" -.Fa "char *pathname" -.Fa "size_t maxlen" -.Fc -.Ft "int" .Fo procstat_getrlimit .Fa "struct procstat *procstat" .Fa "struct kinfo_proc *kp" Modified: soc2015/pratiksinghal/cubie-head/lib/libufs/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libufs/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libufs/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -21,7 +21,6 @@ WARNS?= 2 -DEBUG_FLAGS = -g CFLAGS+= -D_LIBUFS .if defined(LIBUFS_DEBUG) CFLAGS+= -D_LIBUFS_DEBUGGING Modified: soc2015/pratiksinghal/cubie-head/release/Makefile.ec2 ============================================================================== --- soc2015/pratiksinghal/cubie-head/release/Makefile.ec2 Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/release/Makefile.ec2 Sat May 23 02:25:03 2015 (r285909) @@ -53,7 +53,7 @@ .endif /usr/local/bin/bsdec2-image-upload ${PUBLISH} \ ${.OBJDIR}/ec2.raw \ - "${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}" \ - "${TYPE} ${REVISION}-${BRANCH}" \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} @touch ${.TARGET} Modified: soc2015/pratiksinghal/cubie-head/release/Makefile.mirrors ============================================================================== --- soc2015/pratiksinghal/cubie-head/release/Makefile.mirrors Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/release/Makefile.mirrors Sat May 23 02:25:03 2015 (r285909) @@ -18,19 +18,16 @@ FTPDIR?= ${RELEASEDIR}/ftp-stage STAGE_TARGETS?= iso-images-stage +.if defined(EMBEDDED_TARGET) && !empty(EMBEDDED_TARGET) +. if ${TARGET} == "arm" || ${EMBEDDED_TARGET} == "arm" +EMBEDDED= 1 +. endif +.endif + # snapshot .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" SNAPSHOT= 1 TLD?= ${FTPDIR}/snapshots -BUILDDATE!= date -j -f '%s' $$(stat -f "%c" ${.OBJDIR}/dist/base/bin/sh) +%Y%m%d -. if ${TARGET} == "arm" && ${TARGET_ARCH} == "armv6" -. if !defined(BOARDNAME) || empty(BOARDNAME) -BOARDNAME= ${KERNCONF} -. endif -_SNAP_SUFFIX:= -${BOARDNAME}-${BUILDDATE} -. else # not arm/armv6 -_SNAP_SUFFIX:= -${BUILDDATE} -. endif . for _D in /usr/bin /usr/local/bin . for _S in svnversion svnliteversion . if exists(${_D}/${_S}) @@ -38,9 +35,16 @@ . endif . endfor . endfor +. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh) +BUILDDATE!= cd ${.CURDIR} && date -j -f '%s' $$(stat -f "%c" ${.OBJDIR}/dist/base/bin/sh) +%Y%m%d +. else +BUILDDATE!= date +%Y%m%d +. endif . if exists(${SVNVERSION}) && !empty(SVNVERSION) SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile -_SNAP_SUFFIX:= ${_SNAP_SUFFIX}-r${SVNREVISION} +_SNAP_SUFFIX:= -r${SVNREVISION}-${BUILDDATE} +. else +_SNAP_SUFFIX:= -${BUILDDATE} . endif .else # release @@ -48,6 +52,20 @@ TLD?= ${FTPDIR}/releases .endif +.if defined(EMBEDDED) && !empty(EMBEDDED) +. if ${TARGET} == "arm" && ${TARGET_ARCH} == "armv6" +. if !defined(BOARDNAME) && empty(BOARDNAME) +BOARDNAME:= ${KERNCONF} +. else +OLDNAME:= ${KERNCONF} +. endif +. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" +SNAPSHOT= 1 +. endif +IMAGES:= ${BOARDNAME}.img +. endif # arm/armv6 +.endif # embedded + .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) STAGE_TARGETS+= vm-images-stage VM_DIR= ${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} @@ -68,8 +86,15 @@ .if exists(${RELEASEDIR}) @# Assume we have images to copy. . for IMAGE in ${IMAGES} + @# arm/armv6 IMX6 -> WANDBOARD, for example. +. if defined(OLDNAME) && !empty(OLDNAME) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505230225.t4N2P4AA043116>