From owner-svn-src-projects@FreeBSD.ORG Sat Jun 14 01:24:27 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9801D49F; Sat, 14 Jun 2014 01:24:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 81E9E2AD1; Sat, 14 Jun 2014 01:24:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5E1ORsS044008; Sat, 14 Jun 2014 01:24:27 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5E1ONW0043979; Sat, 14 Jun 2014 01:24:23 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201406140124.s5E1ONW0043979@svn.freebsd.org> From: Glen Barber Date: Sat, 14 Jun 2014 01:24:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267462 - in projects/release-debugdist: . include lib lib/libc/iconv lib/libfetch lib/libiconv_modules/HZ lib/libz release release/doc/en_US.ISO8859-1/relnotes sbin/geom/class/part sha... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jun 2014 01:24:27 -0000 Author: gjb Date: Sat Jun 14 01:24:22 2014 New Revision: 267462 URL: http://svnweb.freebsd.org/changeset/base/267462 Log: MFH @267460: Tracking commit. Sponsored by: The FreeBSD Foundation Added: projects/release-debugdist/lib/libz/zlib.pc - copied unchanged from r267460, head/lib/libz/zlib.pc projects/release-debugdist/share/vt/fonts/vgarom-thin-8x16.hex - copied unchanged from r267460, head/share/vt/fonts/vgarom-thin-8x16.hex projects/release-debugdist/share/vt/fonts/vgarom-thin-8x8.hex - copied unchanged from r267460, head/share/vt/fonts/vgarom-thin-8x8.hex projects/release-debugdist/sys/arm/freescale/vybrid/vf_spi.c - copied unchanged from r267460, head/sys/arm/freescale/vybrid/vf_spi.c projects/release-debugdist/sys/geom/part/g_part_bsd64.c - copied unchanged from r267460, head/sys/geom/part/g_part_bsd64.c projects/release-debugdist/sys/modules/geom/geom_part/geom_part_bsd64/ - copied from r267460, head/sys/modules/geom/geom_part/geom_part_bsd64/ Deleted: projects/release-debugdist/share/vt/fonts/vgarom-8x14.fnt.uu projects/release-debugdist/share/vt/fonts/vgarom-8x16.fnt.uu projects/release-debugdist/share/vt/fonts/vgarom-8x8.fnt.uu Modified: projects/release-debugdist/MAINTAINERS projects/release-debugdist/Makefile.inc1 projects/release-debugdist/include/Makefile projects/release-debugdist/lib/Makefile projects/release-debugdist/lib/libc/iconv/bsd_iconv.c projects/release-debugdist/lib/libc/iconv/citrus_db_factory.c projects/release-debugdist/lib/libc/iconv/citrus_iconv.c projects/release-debugdist/lib/libfetch/fetch.3 projects/release-debugdist/lib/libiconv_modules/HZ/citrus_hz.c projects/release-debugdist/lib/libz/Makefile projects/release-debugdist/release/Makefile projects/release-debugdist/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/release-debugdist/sbin/geom/class/part/gpart.8 projects/release-debugdist/share/mk/src.opts.mk projects/release-debugdist/share/vt/fonts/Makefile projects/release-debugdist/sys/arm/arm/gic.c projects/release-debugdist/sys/arm/arm/pmap.c projects/release-debugdist/sys/arm/at91/if_macb.c projects/release-debugdist/sys/arm/cavium/cns11xx/if_ece.c projects/release-debugdist/sys/arm/conf/EXYNOS5.common projects/release-debugdist/sys/arm/conf/EXYNOS5250 projects/release-debugdist/sys/arm/conf/VYBRID projects/release-debugdist/sys/arm/freescale/vybrid/files.vybrid projects/release-debugdist/sys/arm/samsung/exynos/exynos5_machdep.c projects/release-debugdist/sys/arm/samsung/exynos/exynos5_mp.c projects/release-debugdist/sys/cam/ctl/ctl_backend_block.c projects/release-debugdist/sys/conf/NOTES projects/release-debugdist/sys/conf/files projects/release-debugdist/sys/conf/options projects/release-debugdist/sys/contrib/x86emu/x86emu.c projects/release-debugdist/sys/dev/ae/if_ae.c projects/release-debugdist/sys/dev/age/if_age.c projects/release-debugdist/sys/dev/aha/aha.c projects/release-debugdist/sys/dev/ahb/ahb.c projects/release-debugdist/sys/dev/aic7xxx/aic79xx.c projects/release-debugdist/sys/dev/aic7xxx/aic7xxx.c projects/release-debugdist/sys/dev/alc/if_alc.c projects/release-debugdist/sys/dev/ale/if_ale.c projects/release-debugdist/sys/dev/amr/amr_pci.c projects/release-debugdist/sys/dev/bce/if_bce.c projects/release-debugdist/sys/dev/bfe/if_bfe.c projects/release-debugdist/sys/dev/bge/if_bge.c projects/release-debugdist/sys/dev/dc/if_dc.c projects/release-debugdist/sys/dev/de/if_de.c projects/release-debugdist/sys/dev/drm/ati_pcigart.c projects/release-debugdist/sys/dev/drm/drm_pci.c projects/release-debugdist/sys/dev/drm2/drm_pci.c projects/release-debugdist/sys/dev/e1000/if_em.c projects/release-debugdist/sys/dev/e1000/if_igb.c projects/release-debugdist/sys/dev/e1000/if_lem.c projects/release-debugdist/sys/dev/hpt27xx/hpt27xx_os_bsd.c projects/release-debugdist/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/release-debugdist/sys/dev/hptmv/entry.c projects/release-debugdist/sys/dev/hptrr/hptrr_os_bsd.c projects/release-debugdist/sys/dev/hptrr/hptrr_osm_bsd.c projects/release-debugdist/sys/dev/i40e/i40e_osdep.c projects/release-debugdist/sys/dev/isp/isp_pci.c projects/release-debugdist/sys/dev/iwn/if_iwn.c projects/release-debugdist/sys/dev/ixgb/if_ixgb.c projects/release-debugdist/sys/dev/ixgbe/ixgbe.c projects/release-debugdist/sys/dev/ixgbe/ixv.c projects/release-debugdist/sys/dev/jme/if_jme.c projects/release-debugdist/sys/dev/mfi/mfi_pci.c projects/release-debugdist/sys/dev/mlx/mlx.c projects/release-debugdist/sys/dev/msk/if_msk.c projects/release-debugdist/sys/dev/nge/if_nge.c projects/release-debugdist/sys/dev/qlxgb/qla_os.c projects/release-debugdist/sys/dev/qlxgbe/ql_os.c projects/release-debugdist/sys/dev/qlxge/qls_os.c projects/release-debugdist/sys/dev/re/if_re.c projects/release-debugdist/sys/dev/sf/if_sf.c projects/release-debugdist/sys/dev/sge/if_sge.c projects/release-debugdist/sys/dev/sis/if_sis.c projects/release-debugdist/sys/dev/sk/if_sk.c projects/release-debugdist/sys/dev/ste/if_ste.c projects/release-debugdist/sys/dev/stge/if_stge.c projects/release-debugdist/sys/dev/ubsec/ubsec.c projects/release-debugdist/sys/dev/vge/if_vge.c projects/release-debugdist/sys/dev/vr/if_vr.c projects/release-debugdist/sys/dev/vte/if_vte.c projects/release-debugdist/sys/geom/part/g_part.c projects/release-debugdist/sys/geom/part/g_part.h projects/release-debugdist/sys/geom/part/g_part_bsd.c projects/release-debugdist/sys/geom/part/g_part_gpt.c projects/release-debugdist/sys/kern/vfs_mountroot.c projects/release-debugdist/sys/kern/vfs_subr.c projects/release-debugdist/sys/mips/atheros/if_arge.c projects/release-debugdist/sys/mips/idt/if_kr.c projects/release-debugdist/sys/modules/Makefile projects/release-debugdist/sys/modules/geom/geom_part/Makefile projects/release-debugdist/sys/net/bpf.c projects/release-debugdist/sys/ofed/include/linux/bitops.h projects/release-debugdist/sys/pci/if_rl.c projects/release-debugdist/sys/sys/disklabel.h projects/release-debugdist/sys/sys/gpt.h projects/release-debugdist/sys/sys/param.h projects/release-debugdist/sys/vm/uma_core.c projects/release-debugdist/sys/vm/vm_reserv.c projects/release-debugdist/tools/build/mk/OptionalObsoleteFiles.inc projects/release-debugdist/usr.bin/calendar/calendars/calendar.freebsd projects/release-debugdist/usr.bin/iconv/iconv.c projects/release-debugdist/usr.bin/patch/patch.1 projects/release-debugdist/usr.bin/patch/pch.c projects/release-debugdist/usr.bin/vtfontcvt/vtfontcvt.c Directory Properties: projects/release-debugdist/ (props changed) projects/release-debugdist/contrib/tzdata/ (props changed) projects/release-debugdist/share/ (props changed) projects/release-debugdist/sys/ (props changed) projects/release-debugdist/sys/conf/ (props changed) Modified: projects/release-debugdist/MAINTAINERS ============================================================================== --- projects/release-debugdist/MAINTAINERS Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/MAINTAINERS Sat Jun 14 01:24:22 2014 (r267462) @@ -102,7 +102,7 @@ linux emul emulation Please discuss chan bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. -openssl benl Pre-commit review requested. +openssl benl,jkim Pre-commit review requested. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. Modified: projects/release-debugdist/Makefile.inc1 ============================================================================== --- projects/release-debugdist/Makefile.inc1 Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/Makefile.inc1 Sat Jun 14 01:24:22 2014 (r267462) @@ -1199,6 +1199,10 @@ _gperf= gnu/usr.bin/gperf _groff= gnu/usr.bin/groff .endif +.if ${MK_VT_SUPPORT} != "no" +_vtfontcvt= usr.bin/vtfontcvt +.endif + .if ${BOOTSTRAPPING} < 900002 _sed= usr.bin/sed .endif @@ -1298,7 +1302,8 @@ bootstrap-tools: .MAKE ${_gensnmptree} \ usr.sbin/config \ ${_crunch} \ - ${_nmtree} + ${_nmtree} \ + ${_vtfontcvt} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ Modified: projects/release-debugdist/include/Makefile ============================================================================== --- projects/release-debugdist/include/Makefile Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/include/Makefile Sat Jun 14 01:24:22 2014 (r267462) @@ -6,11 +6,11 @@ .include CLEANFILES= osreldate.h version vers.c -SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale +SUBDIR= arpa protocols rpcsvc rpc xlocale INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ - fts.h ftw.h getopt.h glob.h grp.h gssapi.h \ + fts.h ftw.h getopt.h glob.h grp.h \ ieeefp.h ifaddrs.h \ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \ @@ -67,6 +67,11 @@ _dev_powermac_nvram= dev/powermac_nvram _dev_ieee488= dev/ieee488 .endif +.if ${MK_GSSAPI} != "no" +SUBDIR+= gssapi +INCS+= gssapi.h +.endif + .if ${MK_HESIOD} != "no" INCS+= hesiod.h .endif Modified: projects/release-debugdist/lib/Makefile ============================================================================== --- projects/release-debugdist/lib/Makefile Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/lib/Makefile Sat Jun 14 01:24:22 2014 (r267462) @@ -136,6 +136,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libz \ ${_atf} \ ${_clang} \ + ${_cuse} \ ${_tests} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -172,6 +173,10 @@ _libcasper= libcasper _clang= clang .endif +.if ${MK_CUSE} != "no" +_cuse= libcuse +.endif + .if ${MK_GPIB} != "no" _libgpib= libgpib .endif Modified: projects/release-debugdist/lib/libc/iconv/bsd_iconv.c ============================================================================== --- projects/release-debugdist/lib/libc/iconv/bsd_iconv.c Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/lib/libc/iconv/bsd_iconv.c Sat Jun 14 01:24:22 2014 (r267462) @@ -83,6 +83,7 @@ __bsd___iconv_open(const char *out, cons } handle->cv_shared->ci_discard_ilseq = strcasestr(out, "//IGNORE"); + handle->cv_shared->ci_ilseq_invalid = false; handle->cv_shared->ci_hooks = NULL; return ((iconv_t)(void *)handle); @@ -223,7 +224,7 @@ __bsd_iconvlist(int (*do_one) (unsigned return; } strlcpy(curkey, list[i], slashpos - list[i] + 1); - names[j++] = strdup(curkey); + names[j++] = curkey; for (; (i < sz) && (memcmp(curkey, list[i], strlen(curkey)) == 0); i++) { slashpos = strchr(list[i], '/'); curitem = (char *)malloc(strlen(slashpos) + 1); @@ -235,7 +236,7 @@ __bsd_iconvlist(int (*do_one) (unsigned if (strcmp(curkey, curitem) == 0) { continue; } - names[j++] = strdup(curitem); + names[j++] = curitem; } np = (const char * const *)names; do_one(j, np, data); Modified: projects/release-debugdist/lib/libc/iconv/citrus_db_factory.c ============================================================================== --- projects/release-debugdist/lib/libc/iconv/citrus_db_factory.c Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/lib/libc/iconv/citrus_db_factory.c Sat Jun 14 01:24:22 2014 (r267462) @@ -270,11 +270,9 @@ _citrus_db_factory_serialize(struct _cit return (0); } /* allocate hash table */ - depp = malloc(sizeof(*depp) * df->df_num_entries); + depp = calloc(df->df_num_entries, sizeof(*depp)); if (depp == NULL) return (-1); - for (i = 0; i < df->df_num_entries; i++) - depp[i] = NULL; /* step1: store the entries which are not conflicting */ STAILQ_FOREACH(de, &df->df_entries, de_entry) { Modified: projects/release-debugdist/lib/libc/iconv/citrus_iconv.c ============================================================================== --- projects/release-debugdist/lib/libc/iconv/citrus_iconv.c Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/lib/libc/iconv/citrus_iconv.c Sat Jun 14 01:24:22 2014 (r267462) @@ -344,9 +344,8 @@ const char { char *buf; - if ((buf = malloc((size_t)PATH_MAX)) == NULL) + if ((buf = calloc((size_t)PATH_MAX, sizeof(*buf))) == NULL) return (NULL); - memset((void *)buf, 0, (size_t)PATH_MAX); _citrus_esdb_alias(name, buf, (size_t)PATH_MAX); return (buf); } Modified: projects/release-debugdist/lib/libfetch/fetch.3 ============================================================================== --- projects/release-debugdist/lib/libfetch/fetch.3 Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/lib/libfetch/fetch.3 Sat Jun 14 01:24:22 2014 (r267462) @@ -774,27 +774,27 @@ library first appeared in The .Nm fetch library was mostly written by -.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org with numerous suggestions and contributions from -.An Jordan K. Hubbard Aq jkh@FreeBSD.org , -.An Eugene Skepner Aq eu@qub.com , -.An Hajimu Umemoto Aq ume@FreeBSD.org , -.An Henry Whincup Aq henry@techiebod.com , -.An Jukka A. Ukkonen Aq jau@iki.fi , -.An Jean-Fran\(,cois Dockes Aq jf@dockes.org , -.An Michael Gmelin Aq freebsd@grem.de +.An Jordan K. Hubbard Aq Mt jkh@FreeBSD.org , +.An Eugene Skepner Aq Mt eu@qub.com , +.An Hajimu Umemoto Aq Mt ume@FreeBSD.org , +.An Henry Whincup Aq Mt henry@techiebod.com , +.An Jukka A. Ukkonen Aq Mt jau@iki.fi , +.An Jean-Fran\(,cois Dockes Aq Mt jf@dockes.org , +.An Michael Gmelin Aq Mt freebsd@grem.de and others. It replaces the older .Nm ftpio library written by -.An Poul-Henning Kamp Aq phk@FreeBSD.org +.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org and -.An Jordan K. Hubbard Aq jkh@FreeBSD.org . +.An Jordan K. Hubbard Aq Mt jkh@FreeBSD.org . .Pp This manual page was written by -.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org and -.An Michael Gmelin Aq freebsd@grem.de . +.An Michael Gmelin Aq Mt freebsd@grem.de . .Sh BUGS Some parts of the library are not yet implemented. The most notable Modified: projects/release-debugdist/lib/libiconv_modules/HZ/citrus_hz.c ============================================================================== --- projects/release-debugdist/lib/libiconv_modules/HZ/citrus_hz.c Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/lib/libiconv_modules/HZ/citrus_hz.c Sat Jun 14 01:24:22 2014 (r267462) @@ -532,10 +532,9 @@ _citrus_HZ_parse_graphic(void *context, p = (void **)context; escape = (escape_t *)p[0]; ei = (_HZEncodingInfo *)p[1]; - graphic = malloc(sizeof(*graphic)); + graphic = calloc(1, sizeof(*graphic)); if (graphic == NULL) return (ENOMEM); - memset(graphic, 0, sizeof(*graphic)); if (strcmp("GL", name) == 0) { if (GL(escape) != NULL) goto release; @@ -598,10 +597,9 @@ _citrus_HZ_parse_escape(void *context, c void *p[2]; ei = (_HZEncodingInfo *)context; - escape = malloc(sizeof(*escape)); + escape = calloc(1, sizeof(*escape)); if (escape == NULL) return (EINVAL); - memset(escape, 0, sizeof(*escape)); if (strcmp("0", name) == 0) { escape->set = E0SET(ei); TAILQ_INSERT_TAIL(E0SET(ei), escape, entry); Modified: projects/release-debugdist/lib/libz/Makefile ============================================================================== --- projects/release-debugdist/lib/libz/Makefile Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/lib/libz/Makefile Sat Jun 14 01:24:22 2014 (r267462) @@ -55,6 +55,8 @@ CFLAGS+= -DSYMBOL_VERSIONING INCS= zconf.h zlib.h +.PATH: ${.CURDIR}/test + minigzip: all minigzip.o $(CC) -o minigzip minigzip.o -L. -lz @@ -66,6 +68,10 @@ test: example minigzip (export LD_LIBRARY_PATH=. ; \ echo hello world | ./minigzip | ./minigzip -d ) +beforeinstall: + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${.CURDIR}/zlib.pc ${DESTDIR}${LIBDATADIR}/pkgconfig + .include ## XXX: clang integrated-as doesn't grok .intel_syntax directives yet Copied: projects/release-debugdist/lib/libz/zlib.pc (from r267460, head/lib/libz/zlib.pc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-debugdist/lib/libz/zlib.pc Sat Jun 14 01:24:22 2014 (r267462, copy of r267460, head/lib/libz/zlib.pc) @@ -0,0 +1,14 @@ +# $FreeBSD$ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: zlib +Description: zlib compression library +Version: 1.2.8 + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} Modified: projects/release-debugdist/release/Makefile ============================================================================== --- projects/release-debugdist/release/Makefile Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/release/Makefile Sat Jun 14 01:24:22 2014 (r267462) @@ -154,8 +154,8 @@ system: packagesystem # Install system mkdir -p release cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ - WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1 \ + DESTDIR=${.OBJDIR}/release MK_RESCUE=no MK_KERNEL_SYMBOLS=no \ + MK_PROFILE=no MK_SENDMAIL=no MK_TESTS=no MK_LIB32=no \ MK_DEBUG_FILES=no # Copy distfiles mkdir -p release/usr/freebsd-dist @@ -178,12 +178,12 @@ bootonly: packagesystem # Install system mkdir -p bootonly cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/bootonly WITHOUT_AMD=1 WITHOUT_AT=1 \ - WITHOUT_GAMES=1 WITHOUT_GROFF=1 \ - WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \ - WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \ - WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \ - WITHOUT_KERNEL_SYMBOLS=1 MK_TESTS=no MK_DEBUG_FILES=no + DESTDIR=${.OBJDIR}/bootonly MK_AMD=no MK_AT=no \ + MK_GAMES=no MK_GROFF=no \ + MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \ + MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \ + MK_INSTALLIB=no MK_RESCUE=no MK_DICT=no \ + MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no # Copy manifest only (no distfiles) to get checksums mkdir -p bootonly/usr/freebsd-dist cp MANIFEST bootonly/usr/freebsd-dist @@ -202,7 +202,7 @@ dvd: # Install system mkdir -p ${.TARGET} cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ + DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \ MK_TESTS=no MK_DEBUG_FILES=no # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist Modified: projects/release-debugdist/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- projects/release-debugdist/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/release/doc/en_US.ISO8859-1/relnotes/article.xml Sat Jun 14 01:24:22 2014 (r267462) @@ -317,7 +317,7 @@ The &man.pmcstat.8; utility has been updated to include a new flag, -l, which - adds event collection after the specified number of + ends event collection after the specified number of seconds. The default &man.newsyslog.conf.5; now Modified: projects/release-debugdist/sbin/geom/class/part/gpart.8 ============================================================================== --- projects/release-debugdist/sbin/geom/class/part/gpart.8 Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/sbin/geom/class/part/gpart.8 Sat Jun 14 01:24:22 2014 (r267462) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 2, 2014 +.Dd June 11, 2014 .Dt GPART 8 .Os .Sh NAME @@ -491,6 +491,12 @@ called Requires the .Cm GEOM_PART_BSD kernel option. +.It Cm BSD64 +64-bit implementation of BSD disklabel used in DragonFlyBSD to subdivide MBR +or GPT partitions. +Requires the +.Cm GEOM_PART_BSD64 +kernel option. .It Cm LDM The Logical Disk Manager is an implementation of volume manager for Microsoft Windows NT. Modified: projects/release-debugdist/share/mk/src.opts.mk ============================================================================== --- projects/release-debugdist/share/mk/src.opts.mk Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/share/mk/src.opts.mk Sat Jun 14 01:24:22 2014 (r267462) @@ -68,6 +68,7 @@ __DEFAULT_YES_OPTIONS = \ CROSS_COMPILER \ CRYPT \ CTM \ + CUSE \ CXX \ DICT \ DMAGENT \ Modified: projects/release-debugdist/share/vt/fonts/Makefile ============================================================================== --- projects/release-debugdist/share/vt/fonts/Makefile Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/share/vt/fonts/Makefile Sat Jun 14 01:24:22 2014 (r267462) @@ -3,13 +3,18 @@ FILES= gallant.fnt \ vgarom-8x8.fnt \ vgarom-8x14.fnt \ - vgarom-8x16.fnt + vgarom-8x16.fnt \ + vgarom-thin-8x8.fnt \ + vgarom-thin-8x16.fnt CLEANFILES+= ${FILES} -.SUFFIXES: .uu -.uu: - uudecode < ${.IMPSRC} +.SUFFIXES: .fnt .fnt.uu .hex +.hex.fnt: + vtfontcvt ${.IMPSRC} ${.TARGET} + +.fnt.uu.fnt: + uudecode -p < ${.IMPSRC} > ${.TARGET} FILESDIR= ${SHAREDIR}/vt/fonts Copied: projects/release-debugdist/share/vt/fonts/vgarom-thin-8x16.hex (from r267460, head/share/vt/fonts/vgarom-thin-8x16.hex) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-debugdist/share/vt/fonts/vgarom-thin-8x16.hex Sat Jun 14 01:24:22 2014 (r267462, copy of r267460, head/share/vt/fonts/vgarom-thin-8x16.hex) @@ -0,0 +1,259 @@ +# $FreeBSD$ +# Height: 16 +# Width: 8 +0000:00000000000000000000000000000000 +0020:00000000000000000000000000000000 +0021:00001038383810101000101000000000 +0022:00424242420000000000000000000000 +0023:0000004444FE444444FE444400000000 +0024:10107C828240300C0482827C10100000 +0025:00000000008284081020428200000000 +0026:00003844443838474444443B00000000 +0027:00202040000000000000000000000000 +0028:00000408101010101010080400000000 +0029:00002010080808080808102000000000 +002A:00000000002418FF1824000000000000 +002B:000000000010107C1010000000000000 +002C:00000000000000000010101020000000 +002D:00000000000000FE0000000000000000 +002E:00000000000000000000101000000000 +002F:00000000000204081020408000000000 +0030:00003844828292928282443800000000 +0031:00000818380808080808083E00000000 +0032:00007C8202040810204082FE00000000 +0033:00007C8202023C020202827C00000000 +0034:00000C14244484FE0404040E00000000 +0035:0000FE808080FC020202827C00000000 +0036:000038408080FC828282827C00000000 +0037:0000FE82020204081010101000000000 +0038:00007C8282827C828282827C00000000 +0039:00007C8282827E020202047800000000 +003A:00000000101000000010100000000000 +003B:00000000101000000010102000000000 +003C:00000004081020402010080400000000 +003D:00000000007E00007E00000000000000 +003E:00000040201008040810204000000000 +003F:00007C82820204080800080800000000 +0040:0000007C82829E92928C807C00000000 +0041:00001028448282FE8282828200000000 +0042:0000FC4242427C42424242FC00000000 +0043:00003C42828080808082423C00000000 +0044:0000F84442424242424244F800000000 +0045:0000FE4242487848404242FE00000000 +0046:0000FE4242487848404040E000000000 +0047:00003C428280809E8282463A00000000 +0048:000082828282FE828282828200000000 +0049:00003810101010101010103800000000 +004A:00000E04040404048484847800000000 +004B:0000C24242444878444242C200000000 +004C:0000E04040404040404242FE00000000 +004D:000082C6AA9282828282828200000000 +004E:00008282C2A2928A8682828200000000 +004F:00003844828282828282443800000000 +0050:0000FC4242427C40404040E000000000 +0051:00007C828282828282928A7C04020000 +0052:0000FC4242427C44424242C200000000 +0053:00007C828240300C0482827C00000000 +0054:0000FE92921010101010103800000000 +0055:00008282828282828282827C00000000 +0056:00008282828282828244281000000000 +0057:000082828282828292AAC68200000000 +0058:00008282442810284482828200000000 +0059:00008282824438101010103800000000 +005A:0000FE8282041820408282FE00000000 +005B:00003C20202020202020203C00000000 +005C:00000080402010080402010000000000 +005D:00003C04040404040404043C00000000 +005E:10284482000000000000000000000000 +005F:00000000000000000000000000FF0000 +0060:10100800000000000000000000000000 +0061:000000000078047C84848C7600000000 +0062:0000C040407844424242427C00000000 +0063:00000000007C82808080827C00000000 +0064:00000C04043C448484848C7600000000 +0065:00000000007C8282FE80827C00000000 +0066:000038444440E040404040E000000000 +0067:0000000000768C848484847C04847800 +0068:0000C040407C4242424242C200000000 +0069:00001010003010101010103800000000 +006A:00000202000602020202020242423C00 +006B:0000C04040424448784442C200000000 +006C:00003010101010101010103800000000 +006D:0000000000EC92929292929200000000 +006E:0000000000DC62424242424200000000 +006F:00000000007C82828282827C00000000 +0070:0000000000DC62424242427C4040E000 +0071:0000000000768C848484847C04040E00 +0072:0000000000DC6242404040E000000000 +0073:00000000007C82807C02827C00000000 +0074:0000202020F820202020221C00000000 +0075:000000000084848484848C7600000000 +0076:00000000004242424242241800000000 +0077:000000000082828292AAC68200000000 +0078:00000000008244281028448200000000 +0079:00000000008282828282827E02047800 +007A:0000000000FE8408102042FE00000000 +007B:00000E10101060101010100E00000000 +007C:00001010101000101010101000000000 +007D:00007008080806080808087000000000 +007E:000076DC000000000000000000000000 +00A0:00000000000000000000000000000000 +00A1:00001010001010103838381000000000 +00A2:00101038444040404838101000000000 +00A3:0038444440E04040404042FC00000000 +00A5:0000444428107C107C10101000000000 +00A7:007C864038448282443804C27C000000 +00AA:003C44443E007E000000000000000000 +00AB:00000000002448904824000000000000 +00AC:000000000000FE060606060000000000 +00B0:00384444380000000000000000000000 +00B1:0000000010107C10100000FE00000000 +00B2:00708810204878000000000000000000 +00B5:0000000042424242427C4040C0000000 +00B6:00007F89898979090909090900000000 +00B7:00000000000000181800000000000000 +00BA:0038444438007C000000000000000000 +00BB:00000000008844224488000000000000 +00BC:0080808284881020468A123E02020000 +00BD:0080808284881020409C0204081E0000 +00BF:00002020002020408082827C00000000 +00C4:0082001028448282FE82828200000000 +00C5:3844381028448282FE82828200000000 +00C6:00003E448484FE848484848600000000 +00C7:00003C428280808082423C04027C0000 +00C9:081020FE4240407C404042FE00000000 +00D1:76DC0082C2A2928A8682828200000000 +00D6:0082007C828282828282827C00000000 +00DC:00820082828282828282827C00000000 +00DF:000078848484B884828282BC80000000 +00E0:004020100078047C84848C7600000000 +00E1:000810200078047C84848C7600000000 +00E2:001028440078047C84848C7600000000 +00E4:000084840078047C84848C7600000000 +00E5:003844380078047C84848C7600000000 +00E6:00000000008C52327E88986E00000000 +00E7:000000003C424040423C04023C000000 +00E8:00402010007C8282FE80827C00000000 +00E9:00040810007C8282FE80827C00000000 +00EA:00102844007C8282FE80827C00000000 +00EB:00008400007C8282FE80827C00000000 +00EC:00402010001808080808081C00000000 +00ED:00040810001808080808081C00000000 +00EE:00182442001808080808081C00000000 +00EF:00004444001808080808081C00000000 +00F1:000076DC00DC62424242424200000000 +00F2:00402010007C82828282827C00000000 +00F3:00081020007C82828282827C00000000 +00F4:00102844007C82828282827C00000000 +00F6:00004400007C82828282827C00000000 +00F7:000000001010007C0010100000000000 +00F9:004020100084848484848C7600000000 +00FA:000810200084848484848C7600000000 +00FB:003048840084848484848C7600000000 +00FC:000084000084848484848C7600000000 +00FF:00008200000082828282827E02047800 +0192:0006090808083E080808080848300000 +0393:0000FE82828080808080808000000000 +0398:00000038448282FE8282443800000000 +03A3:000000FE82402010204082FE00000000 +03A6:0000007C103844444438107C00000000 +03A9:0000384482828244282828EE00000000 +03B1:00000000006294988898946200000000 +03B4:00001E1008043E424242423C00000000 +03B5:00001C20404078404040201C00000000 +03C0:00000000FE4444444444444400000000 +03C3:00000000007E88888888887000000000 +03C4:0000000072D408080808080800000000 +03C6:00000001027E8991A17E408000000000 +2022:000000000000183C3C18000000000000 +203C:00004242424242424200424200000000 +207F:00D86444444444000000000000000000 +20A7:00F88484F884849E8484848600000000 +2190:00000000002040FE4020000000000000 +2191:000010387C1010101010101000000000 +2192:00000000000804FE0408000000000000 +2193:0000101010101010107C381000000000 +2194:0000000000286CFE6C28000000000000 +2195:000010387C1010107C38100000000000 +21A8:000010387C1010107C38107C00000000 +2219:00000000000000001800000000000000 +221A:000F0808080808E82828281800000000 +221E:00000000007E9999997E000000000000 +221F:000000000000808080FE000000000000 +2229:0000007C828282828282828200000000 +2248:000000000076DC0076DC000000000000 +2261:00000000FE0000FE0000FE0000000000 +2264:00000008102040201008007E00000000 +2265:00000010080402040810007E00000000 +2302:00000000102844828282FE0000000000 +2310:000000000000FEC0C0C0C00000000000 +2320:00000E11111010101010101010101010 +2321:08080808080808080888887070000000 +2500:00000000000000FF0000000000000000 +2502:18181818181818181818181818181818 +250C:000000000000001F1818181818181818 +2510:00000000000000F81818181818181818 +2514:181818181818181F0000000000000000 +2518:18181818181818F80000000000000000 +251C:181818181818181F1818181818181818 +2524:18181818181818F81818181818181818 +252C:00000000000000FF1818181818181818 +2534:18181818181818FF0000000000000000 +253C:18181818181818FF1818181818181818 +2550:0000000000FF00FF0000000000000000 +2551:36363636363636363636363636363636 +2552:00000000001F181F1818181818181818 +2553:000000000000003F3636363636363636 +2554:00000000003F30373636363636363636 +2555:0000000000F818F81818181818181818 +2556:00000000000000FE3636363636363636 +2557:0000000000FE06F63636363636363636 +2558:18181818181F181F0000000000000000 +2559:363636363636363F0000000000000000 +255A:363636363637303F0000000000000000 +255B:1818181818F818F80000000000000000 +255C:36363636363636FE0000000000000000 +255D:3636363636F606FE0000000000000000 +255E:18181818181F181F1818181818181818 +255F:36363636363636373636363636363636 +2560:36363636363730373636363636363636 +2561:1818181818F818F81818181818181818 +2562:36363636363636F63636363636363636 +2563:3636363636F606F63636363636363636 +2564:0000000000FF00FF1818181818181818 +2565:00000000000000FF3636363636363636 +2566:0000000000FF00F73636363636363636 +2567:1818181818FF00FF0000000000000000 +2568:36363636363636FF0000000000000000 +2569:3636363636F700FF0000000000000000 +256A:1818181818FF18FF1818181818181818 +256B:36363636363636FF3636363636363636 +256C:3636363636F700F73636363636363636 +2580:FFFFFFFFFFFFFF000000000000000000 +2584:00000000000000FFFFFFFFFFFFFFFFFF +2588:FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +258C:F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 +2590:0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F +2591:11441144114411441144114411441144 +2592:55AA55AA55AA55AA55AA55AA55AA55AA +2593:DD77DD77DD77DD77DD77DD77DD77DD77 +25A0:000000007C7C7C7C7C7C7C0000000000 +25AC:0000000000000000FEFEFEFE00000000 +25B2:000000001038387C7CFEFE0000000000 +25BA:0080C0E0F0F8FEF8F0E0C08000000000 +25BC:00000000FEFE7C7C3838100000000000 +25C4:0002060E1E3EFE3E1E0E060200000000 +25CB:00000000003C664242663C0000000000 +25D8:FFFFFFFFFFFFE7C3C3E7FFFFFFFFFFFF +25D9:FFFFFFFFFFC399BDBD99C3FFFFFFFFFF +263A:00007E81A58181BD9981817E00000000 +263B:00007EFFDBFFFFC3E7FFFF7E00000000 +263C:0000001010D638EE38D6101000000000 +2640:0000384444444438107C101000000000 +2642:00003E0A122278848484847800000000 +2660:000000183C7EFFFF7E18183C00000000 +2663:000000183C3CE7E7E718183C00000000 +2665:000000006CFEFEFEFE7C381000000000 +2666:0000000010387CFE7C38100000000000 +266A:00003F213F2020202060E0C000000000 +266C:00003F213F212121212367E6C0000000 Copied: projects/release-debugdist/share/vt/fonts/vgarom-thin-8x8.hex (from r267460, head/share/vt/fonts/vgarom-thin-8x8.hex) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-debugdist/share/vt/fonts/vgarom-thin-8x8.hex Sat Jun 14 01:24:22 2014 (r267462, copy of r267460, head/share/vt/fonts/vgarom-thin-8x8.hex) @@ -0,0 +1,258 @@ +# $FreeBSD$ +# Height: 8 +# Width: 8 +0020:0000000000000000 +0021:1038381010001000 +0022:2424240000000000 +0023:2424FF24FF242400 +0024:107C807804F81000 +0025:00C6CC183066C600 +0026:3844385684847600 +0027:2020400000000000 +0028:1020404040201000 +0029:2010080808102000 +002A:004438FE38440000 +002B:001010FE10100000 +002C:0000000000101020 +002D:000000FC00000000 +002E:0000000000101000 +002F:0204081020408000 +0030:7C82868A92A27C00 +0031:1030101010107C00 +0032:788404104084FC00 +0033:7884043804847800 +0034:08182848FE081C00 +0035:FC80F80404847800 +0036:384080F884847800 +0037:FC84081020202000 +0038:7884847884847800 +0039:7884847C04087000 +003A:0010100000101000 +003B:0010100000101020 +003C:1020408040201000 +003D:0000FC0000FC0000 +003E:2010080408102000 +003F:7884040810001000 +0040:7C829E929E807800 +0041:30488484FC848400 +0042:FC42427C4242FC00 +0043:3C42808080423C00 +0044:F84442424244F800 +0045:FE4248784842FE00 +0046:FE4248784840E000 +0047:3C4280808E423E00 +0048:848484FC84848400 +0049:3810101010103800 +004A:0E04040444443800 +004B:C24448704442C200 +004C:E04040404042FE00 +004D:82C6AA9282828200 +004E:82C2A2928A868200 +004F:3844828282443800 +0050:FC42427C4040E000 +0051:3844828282543804 +0052:FC42427C4442C200 +0053:3884807804847400 +0054:FE92101010103800 +0055:848484848484FC00 +0056:8484848484483000 +0057:82828292AAC68200 +0058:8244281028448200 +0059:8244281010103800 +005A:FE8488102242FE00 +005B:7840404040407800 +005C:8040201008040200 +005D:7808080808087800 +005E:1028448200000000 +005F:00000000000000FF +0060:2020100000000000 +0061:000078047C847600 +0062:C0407C424242DC00 +0063:0000788480847800 +0064:0C047C8484847600 +0065:00007884FC807800 +0066:384440E04040E000 +0067:00007684847C04F8 +0068:C0404C624242C200 +0069:1000301010103800 +006A:0400040404848478 +006B:C04042447844C200 +006C:3010101010103800 +006D:0000EC9292928200 +006E:0000F88484848400 +006F:0000788484847800 +0070:0000DC42427C40E0 +0071:00007684847C040E +0072:0000DC624040E000 +0073:00007C807804F800 +0074:10107C1010120C00 +0075:0000848484847600 +0076:0000848484483000 +0077:00008292AAC68200 +0078:0000844830488400 +0079:00008484847C04F8 +007A:0000FC883044FC00 +007B:182020C020201800 +007C:1010100010101000 +007D:6010100C10106000 +007E:6498000000000000 +00A0:0000000000000000 +00A1:1010001038381000 +00A2:10107E80807E1010 +00A3:384444E04082FC00 +00A5:4428107C107C1010 +00A7:3E61384444388C78 +00AA:3C44443A007E0000 +00AB:0022448844220000 +00AC:000000FC0C0C0000 +00B0:3844443800000000 +00B1:2020FC202000FC00 +00B2:3048102078000000 +00B5:00424242427C4080 +00B6:7F92927212121200 +00B7:0000001818000000 +00BA:38444438007C0000 +00BB:0044221122440000 +00BC:4244485365498F01 +00BD:424448566942840F +00BF:2000204080847800 +00C4:82384482FE828200 +00C5:30104482FE828200 +00C6:3F4888FF88888F00 +00C7:7884808478180478 +00C9:0CFC40784040FC00 +00D1:649884A494848400 +00D6:4218244242241800 +00DC:8400848484847800 +00DF:007884F884F88080 +00E0:C00078047C847A00 +00E1:1C0078047C847A00 +00E2:7E813C023E423D00 +00E4:840078047C847A00 +00E5:202078047C847A00 +00E6:000067197F987700 +00E7:0000788080780438 +00E8:60007884FC807800 +00E9:0C007884FC807800 +00EA:7E813C427E403C00 +00EB:84007884FC807800 +00EC:6000301010103800 +00ED:1800301010103800 +00EE:7C82301010103800 +00EF:4800301010103800 +00F1:6498B8C484848400 +00F2:C000788484847800 +00F3:0810788484847800 +00F4:7884788484847800 +00F6:8400788484847800 +00F7:202000F800202000 +00F9:2010424242423C00 +00FA:0810848484847A00 +00FB:7E81424242423C00 +00FC:0084008484847A00 +00FF:84008484847C04F8 +0192:0C12103810109060 +0393:00FC848080808000 +0398:384482FE82443800 +03A3:FC8440204084FC00 +03A6:F8207088887020F8 +03A9:3844828228286C00 +03B1:0000629488946200 +03B4:1C10087C84847800 +03B5:384080F880403800 +03C0:00FE282828282800 +03C3:00007E8888887000 +03C4:0076880808080800 +03C6:02047E89917E4080 +2022:0000183C3C180000 +203C:2424242424002400 +207F:5844444444000000 +20A7:F88484F882878283 +2190:002040FE40200000 +2191:10387C1010101000 +2192:000804FE04080000 +2193:101010107C381000 +2194:002466FF66240000 +2195:10387C10107C3810 +21A8:10387C107C3810FE +2219:0000000018000000 +221A:0704040464241C0C +221E:00007C92927C0000 +221F:0000808080FE0000 +2229:7884848484848400 +2248:0064980064980000 +2261:00FC00FC00FC0000 +2264:102040201000FC00 +2265:402010204000FC00 +2302:001028448282FE00 +2310:000000FCC0C00000 +2320:0E11111010101010 +2321:0808080808888870 +2500:00000000FF000000 +2502:1818181818181818 +250C:000000001F181818 +2510:00000000F8181818 +2514:181818181F000000 +2518:18181818F8000000 +251C:181818181F181818 +2524:18181818F8181818 +252C:00000000FF181818 +2534:18181818FF000000 +253C:18181818FF181818 +2550:0000FF00FF000000 +2551:3636363636363636 +2552:00001F181F181818 +2553:000000003F363636 +2554:00003F3037363636 +2555:0000F818F8181818 +2556:00000000FE363636 +2557:0000FE06F6363636 +2558:18181F181F000000 +2559:363636363F000000 +255A:363637303F000000 +255B:1818F818F8000000 +255C:36363636FE000000 +255D:3636F606FE000000 +255E:18181F181F181818 +255F:3636363637363636 +2560:3636373037363636 +2561:1818F818F8181818 +2562:36363636F6363636 +2563:3636F606F6363636 +2564:0000FF00FF181818 +2565:00000000FF363636 +2566:0000FF00F7363636 +2567:1818FF00FF000000 +2568:36363636FF000000 +2569:3636F700FF000000 +256A:1818FF18FF181818 +256B:36363636FF363636 +256C:3636F700F7363636 +2580:FFFFFFFF00000000 +2584:00000000FFFFFFFF +2588:FFFFFFFFFFFFFFFF +258C:F0F0F0F0F0F0F0F0 +2590:0F0F0F0F0F0F0F0F +2591:2288228822882288 +2592:55AA55AA55AA55AA +2593:77DD77DD77DD77DD +25A0:00003C3C3C3C0000 +25AC:000000007E7E7E00 +25B2:00183C7EFFFF0000 +25BA:80E0F8FEF8E08000 +25BC:00FFFF7E3C180000 +25C4:020E3EFE3E0E0200 +25CB:003C664242663C00 +25D8:FFFFE7C3C3E7FFFF +25D9:FFC399BDBD99C3FF +263A:7E81A581BD99817E +263B:7EFFDBFFC3E7FF7E +263C:995A3CE7E73C5A99 +2640:3E4141413E083E08 +2642:1F03057D84848478 +2660:101038ECFE7C107C +2663:387C38FED610107C +2665:6CFEFEFE7C381000 +2666:10387CFE7C381000 +266A:3F213F20202060C0 +266C:3F213F21212366C0 Modified: projects/release-debugdist/sys/arm/arm/gic.c ============================================================================== --- projects/release-debugdist/sys/arm/arm/gic.c Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/sys/arm/arm/gic.c Sat Jun 14 01:24:22 2014 (r267462) @@ -166,8 +166,9 @@ gic_init_secondary(void) /* Enable interrupt distribution */ gic_d_write_4(GICD_CTLR, 0x01); - /* Activate IRQ 29, ie private timer IRQ*/ + /* Activate IRQ 29-30, ie private timer (secure & non-secure) IRQs */ gic_d_write_4(GICD_ISENABLER(29 >> 5), (1UL << (29 & 0x1F))); + gic_d_write_4(GICD_ISENABLER(30 >> 5), (1UL << (30 & 0x1F))); } static int Modified: projects/release-debugdist/sys/arm/arm/pmap.c ============================================================================== --- projects/release-debugdist/sys/arm/arm/pmap.c Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/sys/arm/arm/pmap.c Sat Jun 14 01:24:22 2014 (r267462) @@ -3034,7 +3034,14 @@ pmap_remove_all(vm_page_t m) if (TAILQ_EMPTY(&m->md.pv_list)) return; rw_wlock(&pvh_global_lock); - pmap_remove_write(m); + + /* + * XXX This call shouldn't exist. Iterating over the PV list twice, + * once in pmap_clearbit() and again below, is both unnecessary and + * inefficient. The below code should itself write back the cache + * entry before it destroys the mapping. + */ + pmap_clearbit(m, PVF_WRITE); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { if (flush == FALSE && (pv->pv_pmap == curpm || @@ -3043,7 +3050,7 @@ pmap_remove_all(vm_page_t m) PMAP_LOCK(pv->pv_pmap); /* - * Cached contents were written-back in pmap_remove_write(), + * Cached contents were written-back in pmap_clearbit(), * but we still have to invalidate the cache entry to make * sure stale data are not retrieved when another page will be * mapped under this virtual address. Modified: projects/release-debugdist/sys/arm/at91/if_macb.c ============================================================================== --- projects/release-debugdist/sys/arm/at91/if_macb.c Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/sys/arm/at91/if_macb.c Sat Jun 14 01:24:22 2014 (r267462) @@ -258,14 +258,14 @@ macb_free_desc_dma_tx(struct macb_softc /* TX descriptor ring. */ if (sc->dmatag_data_tx != NULL) { - if (sc->dmamap_ring_tx != NULL) + if (sc->ring_paddr_tx != 0) bus_dmamap_unload(sc->dmatag_data_tx, sc->dmamap_ring_tx); - if (sc->dmamap_ring_tx != NULL && sc->desc_tx != NULL) + if (sc->desc_tx != NULL) bus_dmamem_free(sc->dmatag_data_tx, sc->desc_tx, sc->dmamap_ring_tx); - sc->dmamap_ring_tx = NULL; - sc->dmamap_ring_tx = NULL; + sc->ring_paddr_tx = 0; + sc->desc_tx = NULL; bus_dma_tag_destroy(sc->dmatag_data_tx); sc->dmatag_data_tx = NULL; } @@ -389,15 +389,14 @@ macb_free_desc_dma_rx(struct macb_softc } /* RX descriptor ring. */ if (sc->dmatag_data_rx != NULL) { - if (sc->dmamap_ring_rx != NULL) + if (sc->ring_paddr_rx != 0) bus_dmamap_unload(sc->dmatag_data_rx, sc->dmamap_ring_rx); - if (sc->dmamap_ring_rx != NULL && - sc->desc_rx != NULL) + if (sc->desc_rx != NULL) bus_dmamem_free(sc->dmatag_data_rx, sc->desc_rx, sc->dmamap_ring_rx); + sc->ring_paddr_rx = 0; sc->desc_rx = NULL; - sc->dmamap_ring_rx = NULL; bus_dma_tag_destroy(sc->dmatag_data_rx); sc->dmatag_data_rx = NULL; } Modified: projects/release-debugdist/sys/arm/cavium/cns11xx/if_ece.c ============================================================================== --- projects/release-debugdist/sys/arm/cavium/cns11xx/if_ece.c Sat Jun 14 01:24:16 2014 (r267461) +++ projects/release-debugdist/sys/arm/cavium/cns11xx/if_ece.c Sat Jun 14 01:24:22 2014 (r267462) @@ -565,13 +565,15 @@ ece_free_desc_dma_tx(struct ece_softc *s } } - if (sc->dmamap_ring_tx) { + if (sc->ring_paddr_tx) { bus_dmamap_unload(sc->dmatag_data_tx, sc->dmamap_ring_tx); - if (sc->desc_tx) { - bus_dmamem_free(sc->dmatag_data_tx, - sc->desc_tx, sc->dmamap_ring_tx); - } - sc->dmamap_ring_tx = 0; + sc->ring_paddr_tx = 0; + } + + if (sc->desc_tx) { + bus_dmamem_free(sc->dmatag_data_tx, + sc->desc_tx, sc->dmamap_ring_tx); + sc->desc_tx = NULL; } if (sc->dmatag_data_tx) { @@ -679,18 +681,24 @@ ece_free_desc_dma_rx(struct ece_softc *s for (i = 0; i < ECE_MAX_RX_BUFFERS; i++) { if (sc->rx_desc[i].buff) { m_freem(sc->rx_desc[i].buff); - sc->rx_desc[i].buff= 0; + sc->rx_desc[i].buff = NULL; } } - if (sc->dmatag_data_rx) { + if (sc->ring_paddr_rx) { bus_dmamap_unload(sc->dmatag_data_rx, sc->dmamap_ring_rx); + sc->ring_paddr_rx = 0; + } + + if (sc->desc_rx) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***