Date: Wed, 2 Aug 2017 01:23:17 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321898 - in projects/make-check-sandbox: . share/examples/ppp share/misc share/mk share/vt/keymaps sys/boot/fdt/dts/arm sys/contrib/ena-com sys/dev/ichwd sys/dev/pci sys/kern sys/modul... Message-ID: <201708020123.v721NHiV043791@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Aug 2 01:23:17 2017 New Revision: 321898 URL: https://svnweb.freebsd.org/changeset/base/321898 Log: MFhead@r321897 Added: projects/make-check-sandbox/share/vt/keymaps/tr.f.kbd - copied unchanged from r321897, head/share/vt/keymaps/tr.f.kbd Modified: projects/make-check-sandbox/Makefile.inc1 projects/make-check-sandbox/share/examples/ppp/ppp.conf.sample projects/make-check-sandbox/share/misc/organization.dot projects/make-check-sandbox/share/mk/bsd.compiler.mk projects/make-check-sandbox/share/vt/keymaps/INDEX.keymaps projects/make-check-sandbox/share/vt/keymaps/Makefile projects/make-check-sandbox/sys/boot/fdt/dts/arm/nanopi-neo.dts projects/make-check-sandbox/sys/contrib/ena-com/ena_plat.h projects/make-check-sandbox/sys/dev/ichwd/ichwd.c projects/make-check-sandbox/sys/dev/pci/pci.c projects/make-check-sandbox/sys/kern/subr_witness.c projects/make-check-sandbox/sys/modules/dtb/allwinner/Makefile projects/make-check-sandbox/tools/tools/bootparttest/stub.c projects/make-check-sandbox/tools/tools/zfsboottest/zfsboottest.c projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd Directory Properties: projects/make-check-sandbox/ (props changed) projects/make-check-sandbox/sys/contrib/ena-com/ (props changed) Modified: projects/make-check-sandbox/Makefile.inc1 ============================================================================== --- projects/make-check-sandbox/Makefile.inc1 Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/Makefile.inc1 Wed Aug 2 01:23:17 2017 (r321898) @@ -444,7 +444,7 @@ BUILD_ARCH!= uname -p .endif .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin +BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -760,10 +760,12 @@ _worldtmp: .PHONY rm -rf ${LIBCOMPATTMP} .endif .else +.if exists(${WORLDTMP}) @echo ">>> Deleting stale files in build tree..." ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ delete-old delete-old-libs >/dev/null -.if defined(LIBCOMPAT) +.endif +.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP}) ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ DESTDIR=${LIBCOMPATTMP} \ delete-old delete-old-libs >/dev/null @@ -2759,9 +2761,6 @@ CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/u CD2MAKE+= BUILD_TOOLS_META=.NOMETA .endif XDDESTDIR=${DESTDIR}/${XDTP} -.if !defined(OSREL) -OSREL!= uname -r | sed -e 's/[-(].*//' -.endif .ORDER: xdev-build xdev-install xdev-links xdev: xdev-build xdev-install .PHONY @@ -2855,7 +2854,7 @@ xdev-links: .PHONY ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ ln -sf ../../${XDTP}/usr/bin/$$i \ - ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ + ../../../../usr/bin/${XDDIR}${_REVISION}-$$i; \ done .else xdev xdev-build xdev-install xdev-links: .PHONY Modified: projects/make-check-sandbox/share/examples/ppp/ppp.conf.sample ============================================================================== --- projects/make-check-sandbox/share/examples/ppp/ppp.conf.sample Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/share/examples/ppp/ppp.conf.sample Wed Aug 2 01:23:17 2017 (r321898) @@ -523,7 +523,7 @@ compuserve: # such as `rlogin' is involved, you may need to ``set escape 0xff'' # tcp-client: - set device tcpsrv.mynet:1234 + set device tcpsrv.mynet:6671 set dial set login set ifaddr 10.0.5.1 10.0.4.1 255.255.255.0 @@ -538,10 +538,10 @@ tcp-server: # # and this in /etc/services: # -# ppp 6671/tcp +# ppp 6671/udp # udp-client: - set device udpsrv.mynet:1234/udp + set device udpsrv.mynet:6671/udp set dial set login set ifaddr 10.0.5.1 10.0.4.1 255.255.255.0 Modified: projects/make-check-sandbox/share/misc/organization.dot ============================================================================== --- projects/make-check-sandbox/share/misc/organization.dot Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/share/misc/organization.dot Wed Aug 2 01:23:17 2017 (r321898) @@ -28,15 +28,15 @@ _misc [label="Miscellaneous Hats"] core [label="Core Team\ncore@FreeBSD.org\nallanjude, bapt, bcr,\nbenno, emaste, gnn,\nhrs, jhb, kmoore"] coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\nmatthew"] doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] -doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"] +doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs,\nwblock"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nadamw, antoine, bapt, bdrewery\nfeld, mat, rene, swills"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"] -re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"] +re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib,\nbdrewery, blackend,\nrgrimes, delphij,\nhrs, glebius,\nmarius, rwatson"] secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, gavin, gjb,\nglebius, remko"] portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, feld, jgh, junovitch, rea, sbz, simon, swills, zi"] secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"] -securityofficer [label="Security Officer Team\nsecurity-officer@FreeBSD.org\ncperciva, simon, nectar"] +securityofficer [label="Security Officer Team\nsecurity-officer@FreeBSD.org\ndelphij, des,\ngavin, gjb,\nglebius, remko"] srccommitters [label="Src Committers\nsrc-committers@FreeBSD.org"] # Admin teams go here alphabetically sorted @@ -44,7 +44,7 @@ srccommitters [label="Src Committers\nsrc-committers@F accounts [label="Accounts Team\naccounts@FreeBSD.org\nmarkm, simon, kensmith,\ndhw"] backups [label="Backup Administrators\nbackups@FreeBSD.org\nsimon, kensmith,\ndhw"] bugmeister [label="Bugmeister Team\nbugmeister@FreeBSD.org\neadler, gavin, gonzo"] -clusteradm [label="Cluster Administrators\nclusteradm@FreeBSD.org\nbrd, simon, ps,\nkensmith, peter"] +clusteradm [label="Cluster Administrators\nclusteradm@FreeBSD.org\nallanjude, brd,\ndhw, gavin,\ngjb, peter,\nsbruno, simon,\nzi"] cvsupmaster [label="CVSup Mirror Site Coordinators\ncvsup-master@FreeBSD.org\nkuriyama, jdp,\nkensmith"] dnsadm [label="DNS Administrators\ndnsadm@FreeBSD.org\nbillf, dg, ps,\nkensmith, peter"] mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-admin@FreeBSD.org\nkuriyama, kensmith"] @@ -52,11 +52,11 @@ ncvs [label="CVS src Repository Managers\nncvs@FreeBSD perforceadmin [label="Perforce Repository Administrators\nperforce-admin@FreeBSD.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"] postmaster [label="Postmaster Team\npostmaster@FreeBSD.org\njmb, brd, sahil, dhw"] refadm [label="Reference Systems Administrators\nrefadm@FreeBSD.org\njake, billf, markm, simon,\nobrien, ps, kensmith,\npeter, dhw"] -webmaster [label="Webmaster Team\nwebmaster@FreeBSD.org\nnik, kuriyama, simon,\njesusr, wosch"] +webmaster [label="Webmaster Team\nwebmaster@FreeBSD.org\ngjb, wblock, blackend,\ngabor, hrs, wosch"] # Misc hats go here alphabetically sorted -donations [label="Donations Team\ndonations@FreeBSD.org\ngjb, wilko, gahr, pgolluci,\nobrien, trhodes, ds,\nrwatson"] +donations [label="Donations Team\ndonations@FreeBSD.org\nwilko, gahr, pgolluci,\nobrien, trhodes, ds,\nrwatson"] marketing [label="Marketing Team\nmarketing@FreeBSD.org\nSteven Beedle, Denise Ebery, deb,\njkoshy, Dru Lavigne, mwlucas, imp,\nKris Moore, murray, mattt,\nJeremy C. Reed, rwatson"] vendorrelations [label="Vendor Relations\nvendor-relations@FreeBSD.org\ncore, FreeBSD Foundation"] Modified: projects/make-check-sandbox/share/mk/bsd.compiler.mk ============================================================================== --- projects/make-check-sandbox/share/mk/bsd.compiler.mk Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/share/mk/bsd.compiler.mk Wed Aug 2 01:23:17 2017 (r321898) @@ -31,6 +31,9 @@ __<bsd.compiler.mk>__: .include <bsd.opts.mk> +# command = /usr/local/bin/ccache cc ... +# wrapper = /usr/local/libexec/ccache/cc ... +CCACHE_BUILD_TYPE?= command # Handle ccache after CC is determined, but not if CC/CXX are already # overridden with a manual setup. .if ${MK_CCACHE_BUILD:Uno} == "yes" && \ @@ -65,19 +68,26 @@ CCACHE_COMPILERCHECK?= content CCACHE_COMPILERCHECK?= mtime .endif .export CCACHE_COMPILERCHECK -# Remove ccache from the PATH to prevent double calls and wasted CPP/LD time. -PATH:= ${PATH:C,:?${CCACHE_WRAPPER_PATH}(/world)?(:$)?,,g} # Ensure no bogus CCACHE_PATH leaks in which might avoid the in-tree compiler. .if !empty(CCACHE_PATH) CCACHE_PATH= .export CCACHE_PATH .endif +.if ${CCACHE_BUILD_TYPE} == "command" +# Remove ccache from the PATH to prevent double calls and wasted CPP/LD time. +PATH:= ${PATH:C,:?${CCACHE_WRAPPER_PATH}(/world)?(:$)?,,g} # Override various toolchain vars. .for var in CC CXX HOST_CC HOST_CXX .if defined(${var}) && ${${var}:M${CCACHE_BIN}} == "" ${var}:= ${CCACHE_BIN} ${${var}} .endif .endfor +.else +# Need to ensure CCACHE_WRAPPER_PATH is the first in ${PATH} +PATH:= ${PATH:C,:?${CCACHE_WRAPPER_PATH}(/world)?(:$)?,,g} +PATH:= ${CCACHE_WRAPPER_PATH}:${PATH} +CCACHE_WRAPPER_PATH_PFX= ${CCACHE_WRAPPER_PATH}: +.endif # ${CCACHE_BUILD_TYPE} == "command" # GCC does not need the CCACHE_CPP2 hack enabled by default in devel/ccache. # The port enables it due to ccache passing preprocessed C to clang # which fails with -Wparentheses-equality, -Wtautological-compare, and Modified: projects/make-check-sandbox/share/vt/keymaps/INDEX.keymaps ============================================================================== --- projects/make-check-sandbox/share/vt/keymaps/INDEX.keymaps Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/share/vt/keymaps/INDEX.keymaps Wed Aug 2 01:23:17 2017 (r321898) @@ -15,7 +15,7 @@ # german.iso.kbd:en:german # # See also setlocal -# /usr/share/locale, /usr/X11/lib/X11/locale/locale.alias +# /usr/share/locale, /usr/local/lib/X11/locale/locale.alias # # # Language support: MENU, FONT @@ -31,6 +31,7 @@ MENU:he:ךלש תדלקמה תפש תא רחב MENU:uk:Оберiть розкладку клавіатури MENU:el:Επιλέξτε το πληκτρολόγιο της κονσόλας MENU:hy:Ընտրեք ստեղնաշարի դասավորությունը +MENU:tr:Klavye düzeninizi seçiniz # # The font definition for "en" is the fall-back font for @@ -210,6 +211,7 @@ de.kbd:de:Deutsch de.kbd:fr:Allemand de.kbd:pt:Alemão de.kbd:es:Alemán +de.kbd:tr:Almanca de.kbd:uk:Німецька de.acc.kbd:en:German (accent keys) @@ -488,11 +490,18 @@ ch.macbook.acc.kbd:fr:Suisse-Allemand Macbook/Macbook ch.macbook.acc.kbd:pt:Suiço-Alemão Macbook/Macbook Pro (com acentos) ch.macbook.acc.kbd:es:Germanosuizo Macbook/Macbook Pro (con acentos) -tr.kbd:en:Turkish -tr.kbd:de:Türkisch -tr.kbd:fr:Turc -tr.kbd:uk:Турецька +tr.kbd:en:Turkish (Q) +tr.kbd:de:Türkisch (Q) +tr.kbd:fr:Turc (Q) +tr.kbd:uk:Турецька (Q) +tr.kbd:tr:Türkçe (Q) +tr.f.kbd:en:Turkish (F) +tr.f.kbd:de:Türkisch (F) +tr.f.kbd:fr:Turc (F) +tr.f.kbd:uk:Турецька (F) +tr.f.kbd:tr:Türkçe (F) + uk.kbd:en:United Kingdom uk.kbd:de:Vereinigtes Königreich uk.kbd:fr:Royaume Uni @@ -501,9 +510,9 @@ uk.kbd:es:Británico uk.capsctrl.kbd:en:United Kingdom (Caps Lock acts as Left Ctrl) uk.capsctrl.kbd:de:Vereinigtes Königreich (Caps Lock als linke Strg) -#uk.iso-ctrl.kbd:fr:Royaume Uni (caps lock acts as Left Ctrl) -#uk.iso-ctrl.kbd:pt:Reino Unido (caps lock acts as Left Ctrl) -#uk.iso-ctrl.kbd:es:Británico (caps lock acts as Left Ctrl) +#uk.capsctrl.kbd:fr:Royaume Uni (caps lock acts as Left Ctrl) +#uk.capsctrl.kbd:pt:Reino Unido (caps lock acts as Left Ctrl) +#uk.capsctrl.kbd:es:Británico (caps lock acts as Left Ctrl) uk.dvorak.kbd:en:United Kingdom Dvorak uk.dvorak.kbd:de:Vereinigtes Königreich Dvorak Modified: projects/make-check-sandbox/share/vt/keymaps/Makefile ============================================================================== --- projects/make-check-sandbox/share/vt/keymaps/Makefile Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/share/vt/keymaps/Makefile Wed Aug 2 01:23:17 2017 (r321898) @@ -67,6 +67,7 @@ FILES= INDEX.keymaps \ se.kbd \ si.kbd \ sk.kbd \ + tr.f.kbd \ tr.kbd \ ua.kbd \ ua.shift.alt.kbd \ Copied: projects/make-check-sandbox/share/vt/keymaps/tr.f.kbd (from r321897, head/share/vt/keymaps/tr.f.kbd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/make-check-sandbox/share/vt/keymaps/tr.f.kbd Wed Aug 2 01:23:17 2017 (r321898, copy of r321897, head/share/vt/keymaps/tr.f.kbd) @@ -0,0 +1,121 @@ +# Turkish F Keyboard (01-08-2017) +# +# $FreeBSD$ +# +# Ufuk Guler +# ufukguler@yahoo.com +# +# Mobile : +(90) 544 848 39 09 +# alt +# scan cntrl alt alt cntrl lock +# code base shift cntrl shift alt shift cntrl shift state +# ------------------------------------------------------------------ + 000 nop nop nop nop nop nop nop nop O + 001 esc esc esc esc esc esc debug esc O + 002 '1' '!' '1' '!' 0xB9 0xA1 '1' '!' O + 003 '2' '"' nul '"' 0xB2 nop '2' nul O + 004 '3' '^' nop nop '#' 0xB3 '#' '#' O + 005 '4' '$' nop '$' 0xBC nop '4' '$' O + 006 '5' '%' nop '%' 0xBD nop '5' '%' O + 007 '6' '&' nop '&' 0xBE nop '6' nop O + 008 '7' ''' nop ''' '{' nop nop '&' O + 009 '8' '(' nop '(' '[' nop nop '*' O + 010 '9' ')' '9' ')' ']' 0xB1 gs '(' O + 011 '0' '=' nop '=' '}' 0xB0 nop ')' O + 012 '/' '?' nop nop '\' 0xBF fs nop O + 013 '-' '_' nop nop '|' nop nop '+' O + 014 bs bs del del bs bs del del O + 015 ht btab nop nop ht btab nop nop O + 016 'f' 'F' ack ack '@' nop ack ack C + 017 'g' 'G' bel bel bel bel bel bel C + 018 0x011F 0x011E nop nop nop nop nop nop C + 019 0x0131 'I' ht ht 0xB6 ht ht ht C + 020 'o' 'O' si si 0xF4 0xD4 si si C + 021 'd' 'D' eot eot 0xA5 eot eot eot C + 022 'r' 'R' dc2 dc2 0xAE dc2 dc2 dc2 C + 023 'n' 'N' so so so so so so C + 024 'h' 'H' bs bs 0xB0 bs bs bs C + 025 'p' 'P' dle dle 0xA3 dle dle dle C + 026 'q' 'Q' dc1 dc1 0xA8 dc1 dc1 dc1 C + 027 'w' 'W' etb etb 0x7E nop nop nop C + 028 cr cr nl nl cr cr nl nl O + 029 lctrl lctrl lctrl lctrl lctrl lctrl lctrl lctrl O + 030 'u' 'U' nak nak 0xFB 0xDB nak nak C + 031 'i' 0x0130 nop nop 0xEE 0x0130 nop nop C + 032 'e' 'E' enq enq 0x20AC enq enq enq C + 033 'a' 'A' soh soh 0xE2 0xC2 soh soh C + 034 0xFC 0xDC nop nop 0xFB 0xDB nop nop C + 035 't' 'T' dc4 dc4 0x2122 dc4 dc4 dc4 C + 036 'k' 'K' vt vt vt vt vt vt C + 037 'm' 'M' cr cr 0xB5 cr cr cr C + 038 'l' 'L' ff ff ff ff ff ff C + 039 'y' 'Y' em em 0xB4 em ';' ':' C + 040 0x015F 0x015E ''' '"' '#' 0x02C7 '#' '"' C + 041 '+' '*' nop '*' 0xAC 0xB1 nop nop C + 042 lshift lshift lshift lshift lshift lshift lshift lshift O + 043 'x' 'X' can can 0x60 0x60 can can C + 044 'j' 'J' nl nl 0xAB 'J' nl nl C + 045 0xF6 0xD6 nop nop 0xBB nop nop nop C + 046 'v' 'V' syn 0x60 0x201C syn syn syn C + 047 'c' 'C' etx etx 0xA2 0xA9 etx etx C + 048 0xE7 0xC7 nop nop 0x201D nop nop nop C + 049 'z' 'Z' sub sub sub sub sub sub C + 050 's' 'S' dc3 dc3 0xA7 dc3 dc3 dc3 C + 051 'b' 'B' stx stx 0xD7 stx ',' '<' C + 052 '.' ':' '.' ':' 0xF7 0x2022 '.' '>' C + 053 ',' ';' ',' ';' 0x2022 nop '/' '?' O + 054 rshift rshift rshift rshift rshift rshift rshift rshift O + 055 '*' '*' '*' '*' '*' '*' '*' '*' O + 056 lalt lalt lalt lalt lalt lalt lalt lalt O + 057 ' ' ' ' nul ' ' ' ' ' ' susp ' ' O + 058 clock clock clock clock clock clock clock clock O + 059 fkey01 fkey13 fkey25 fkey37 scr01 scr11 scr01 scr11 O + 060 fkey02 fkey14 fkey26 fkey38 scr02 scr12 scr02 scr12 O + 061 fkey03 fkey15 fkey27 fkey39 scr03 scr13 scr03 scr13 O + 062 fkey04 fkey16 fkey28 fkey40 scr04 scr14 scr04 scr14 O + 063 fkey05 fkey17 fkey29 fkey41 scr05 scr15 scr05 scr15 O + 064 fkey06 fkey18 fkey30 fkey42 scr06 scr16 scr06 scr16 O + 065 fkey07 fkey19 fkey31 fkey43 scr07 scr07 scr07 scr07 O + 066 fkey08 fkey20 fkey32 fkey44 scr08 scr08 scr08 scr08 O + 067 fkey09 fkey21 fkey33 fkey45 scr09 scr09 scr09 scr09 O + 068 fkey10 fkey22 fkey34 fkey46 scr10 scr10 scr10 scr10 O + 069 nlock nlock nlock nlock nlock nlock nlock nlock O + 070 slock slock slock slock slock slock slock slock O + 071 fkey49 '7' '7' '7' '7' '7' '7' '7' N + 072 fkey50 '8' '8' '8' '8' '8' '8' '8' N + 073 fkey51 '9' '9' '9' '9' '9' '9' '9' N + 074 fkey52 '-' '-' '-' '-' '-' '-' '-' N + 075 fkey53 '4' '4' '4' '4' '4' '4' '4' N + 076 fkey54 '5' '5' '5' '5' '5' '5' '5' N + 077 fkey55 '6' '6' '6' '6' '6' '6' '6' N + 078 fkey56 '+' '+' '+' '+' '+' '+' '+' N + 079 fkey57 '1' '1' '1' '1' '1' '1' '1' N + 080 fkey58 '2' '2' '2' '2' '2' '2' '2' N + 081 fkey59 '3' '3' '3' '3' '3' '3' '3' N + 082 fkey60 '0' '0' '0' '0' '0' '0' '0' N + 083 del ',' ',' ',' ',' ',' boot boot N + 084 nop nop nop nop nop nop nop nop O + 085 nop nop nop nop nop nop nop nop O + 086 '<' '>' '<' '>' '|' 0xA6 nop 0xA6 O + 087 fkey11 fkey23 fkey35 fkey47 scr11 scr11 scr11 scr11 O + 088 fkey12 fkey24 fkey36 fkey48 scr12 scr12 scr12 scr12 O + 089 cr cr nl nl cr cr nl nl O + 090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O + 091 '/' '/' '/' '/' '/' '/' '/' '/' N + 092 nscr pscr debug debug nop nop nop nop O + 093 ralt ralt ralt ralt ralt ralt ralt ralt O + 094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O + 095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O + 096 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 O + 097 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 O + 098 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 O + 099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O + 100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O + 101 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 O + 102 fkey60 paste fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O + 103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O + 104 slock saver slock saver susp nop susp nop O + 105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O + 106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O + 107 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 O + 108 nop nop nop nop nop nop nop nop O Modified: projects/make-check-sandbox/sys/boot/fdt/dts/arm/nanopi-neo.dts ============================================================================== --- projects/make-check-sandbox/sys/boot/fdt/dts/arm/nanopi-neo.dts Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/sys/boot/fdt/dts/arm/nanopi-neo.dts Wed Aug 2 01:23:17 2017 (r321898) @@ -46,10 +46,6 @@ }; }; -&r_i2c { - status = "okay"; -}; - &emac { phy = <&phy1>; phy-mode = "mii"; Modified: projects/make-check-sandbox/sys/contrib/ena-com/ena_plat.h ============================================================================== --- projects/make-check-sandbox/sys/contrib/ena-com/ena_plat.h Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/sys/contrib/ena-com/ena_plat.h Wed Aug 2 01:23:17 2017 (r321898) @@ -139,21 +139,12 @@ extern struct ena_bus_space ebs; #define MAX_ERRNO 4095 #define IS_ERR_VALUE(x) unlikely((x) <= (unsigned long)MAX_ERRNO) -#define WARN_ON(condition) \ - do { \ - int __ret_warn_on = !!(condition); \ - if (unlikely(__ret_warn_on)) \ - printf("%s %s", __FUNCTION__, __FILE__); \ - unlikely(__ret_warn_on); \ - } while (0) - #define ENA_ASSERT(cond, format, arg...) \ do { \ if (unlikely(!(cond))) { \ ena_trc_err( \ "Assert failed on %s:%s:%d:" format, \ __FILE__, __func__, __LINE__, ##arg); \ - WARN_ON(cond); \ } \ } while (0) Modified: projects/make-check-sandbox/sys/dev/ichwd/ichwd.c ============================================================================== --- projects/make-check-sandbox/sys/dev/ichwd/ichwd.c Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/sys/dev/ichwd/ichwd.c Wed Aug 2 01:23:17 2017 (r321898) @@ -536,11 +536,14 @@ static device_t ichwd_find_ich_lpc_bridge(device_t isa, struct ichwd_device **id_p) { struct ichwd_device *id; - device_t isab; + device_t isab, pci; uint16_t devid; /* Check whether parent ISA bridge looks familiar. */ isab = device_get_parent(isa); + pci = device_get_parent(isab); + if (pci == NULL || device_get_devclass(pci) != devclass_find("pci")) + return (NULL); if (pci_get_vendor(isab) != VENDORID_INTEL) return (NULL); devid = pci_get_device(isab); Modified: projects/make-check-sandbox/sys/dev/pci/pci.c ============================================================================== --- projects/make-check-sandbox/sys/dev/pci/pci.c Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/sys/dev/pci/pci.c Wed Aug 2 01:23:17 2017 (r321898) @@ -2902,13 +2902,21 @@ pci_read_bar(device_t dev, int reg, pci_addr_t *mapp, * Determine the BAR's length by writing all 1's. The bottom * log_2(size) bits of the BAR will stick as 0 when we read * the value back. + * + * NB: according to the PCI Local Bus Specification, rev. 3.0: + * "Software writes 0FFFFFFFFh to both registers, reads them back, + * and combines the result into a 64-bit value." (section 6.2.5.1) + * + * Writes to both registers must be performed before attempting to + * read back the size value. */ + testval = 0; pci_write_config(dev, reg, 0xffffffff, 4); - testval = pci_read_config(dev, reg, 4); if (ln2range == 64) { pci_write_config(dev, reg + 4, 0xffffffff, 4); testval |= (pci_addr_t)pci_read_config(dev, reg + 4, 4) << 32; } + testval |= pci_read_config(dev, reg, 4); /* * Restore the original value of the BAR. We may have reprogrammed Modified: projects/make-check-sandbox/sys/kern/subr_witness.c ============================================================================== --- projects/make-check-sandbox/sys/kern/subr_witness.c Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/sys/kern/subr_witness.c Wed Aug 2 01:23:17 2017 (r321898) @@ -1849,12 +1849,14 @@ enroll(const char *description, struct lock_class *loc return (w); found: w->w_refcount++; + if (w->w_refcount == 1) + w->w_class = lock_class; mtx_unlock_spin(&w_mtx); if (lock_class != w->w_class) kassert_panic( - "lock (%s) %s does not match earlier (%s) lock", - description, lock_class->lc_name, - w->w_class->lc_name); + "lock (%s) %s does not match earlier (%s) lock", + description, lock_class->lc_name, + w->w_class->lc_name); return (w); } Modified: projects/make-check-sandbox/sys/modules/dtb/allwinner/Makefile ============================================================================== --- projects/make-check-sandbox/sys/modules/dtb/allwinner/Makefile Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/sys/modules/dtb/allwinner/Makefile Wed Aug 2 01:23:17 2017 (r321898) @@ -14,6 +14,7 @@ DTS= \ sun7i-a20-olimex-som-evb.dts \ sun7i-a20-pcduino3.dts \ sun8i-h2-plus-orangepi-zero.dts \ + sun8i-h3-nanopi-m1.dts \ sun8i-h3-orangepi-one.dts LINKS= \ @@ -23,6 +24,7 @@ LINKS= \ ${DTBDIR}/sun7i-a20-bananapi.dtb ${DTBDIR}/bananapi.dtb \ ${DTBDIR}/sun7i-a20-cubieboard2.dtb ${DTBDIR}/cubieboard2.dtb \ ${DTBDIR}/sun7i-a20-olimex-som-evb.dtb ${DTBDIR}/olimex-a20-som-evb.dtb \ - ${DTBDIR}/sun7i-a20-pcduino3.dtb ${DTBDIR}/pcduino3.dtb + ${DTBDIR}/sun7i-a20-pcduino3.dtb ${DTBDIR}/pcduino3.dtb \ + ${DTBDIR}/nanopi-neo.dtb ${DTBDIR}/sun8i-h3-nanopi-neo.dtb .include <bsd.dtb.mk> Modified: projects/make-check-sandbox/tools/tools/bootparttest/stub.c ============================================================================== --- projects/make-check-sandbox/tools/tools/bootparttest/stub.c Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/tools/tools/bootparttest/stub.c Wed Aug 2 01:23:17 2017 (r321898) @@ -48,5 +48,6 @@ int pager_output(const char *s) { - return (printf("%s", s)); + printf("%s", s); + return (0); } Modified: projects/make-check-sandbox/tools/tools/zfsboottest/zfsboottest.c ============================================================================== --- projects/make-check-sandbox/tools/tools/zfsboottest/zfsboottest.c Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/tools/tools/zfsboottest/zfsboottest.c Wed Aug 2 01:23:17 2017 (r321898) @@ -28,7 +28,9 @@ /* $FreeBSD$ */ #include <sys/param.h> +#include <sys/disk.h> #include <sys/queue.h> +#include <sys/stat.h> #include <err.h> #include <errno.h> #include <fcntl.h> @@ -47,7 +49,22 @@ int pager_output(const char *line) { - return (fprintf(stderr, "%s", line)); + fprintf(stderr, "%s", line); + return (0); +} + +uint64_t +ldi_get_size(void *priv) +{ + struct stat sb; + int fd; + + fd = *(int *)priv; + if (fstat(fd, &sb) != 0) + return (0); + if (S_ISCHR(sb.st_mode) && ioctl(fd, DIOCGMEDIASIZE, &sb.st_size) != 0) + return (0); + return (sb.st_size); } #define ZFS_TEST Modified: projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd Wed Aug 2 00:51:56 2017 (r321897) +++ projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd Wed Aug 2 01:23:17 2017 (r321898) @@ -8,6 +8,7 @@ #define _calendar_freebsd_ 01/01 Dimitry Andric <dim@FreeBSD.org> born in Utrecht, the Netherlands, 1969 +01/01 Lev Serebryakov <lev@FreeBSD.org> born in Leningrad, USSR, 1979 01/01 Alexander Langer <alex@FreeBSD.org> born in Duesseldorf, Nordrhein-Westfalen, Germany, 1981 01/02 Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org> born in Bucharest, Romania, 1980 01/02 Patrick Li <pat@FreeBSD.org> born in Beijing, People's Republic of China, 1985 @@ -21,6 +22,7 @@ 01/12 Kristof Provost <kp@FreeBSD.org> born in Aalst, Belgium, 1983 01/13 Ruslan Bukin <br@FreeBSD.org> born in Dudinka, Russian Federation, 1985 01/14 Yi-Jheng Lin <yzlin@FreeBSD.org> born in Taichung, Taiwan, Republic of China, 1985 +01/15 Anne Dickison <anne@FreeBSD.org> born in Madison, Indiana, United States, 1976 01/16 Ariff Abdullah <ariff@FreeBSD.org> born in Kuala Lumpur, Malaysia, 1978 01/16 Dmitry Sivachenko <demon@FreeBSD.org> born in Moscow, USSR, 1978 01/16 Vanilla I. Shu <vanilla@FreeBSD.org> born in Taipei, Taiwan, Republic of China, 1978 @@ -167,6 +169,7 @@ 05/10 Markus Brueffer <markus@FreeBSD.org> born in Gronau, Nordrhein-Westfalen, Germany, 1977 05/11 Kurt Lidl <lidl@FreeBSD.org> born in Rockville, Maryland, United States, 1968 05/11 Jesus Rodriguez <jesusr@FreeBSD.org> born in Barcelona, Spain, 1972 +05/11 Marcin Wojtas <mw@FreeBSD.org> born in Krakow, Poland, 1986 05/11 Roman Kurakin <rik@FreeBSD.org> born in Moscow, USSR, 1979 05/11 Ulrich Spoerlein <uqs@FreeBSD.org> born in Schesslitz, Bayern, Germany, 1981 05/13 Pete Fritchman <petef@FreeBSD.org> born in Lansdale, Pennsylvania, United States, 1983 @@ -325,6 +328,7 @@ 09/14 Matthew Seaman <matthew@FreeBSD.org> born in Bristol, United Kingdom, 1965 09/15 Aleksandr Rybalko <ray@FreeBSD.org> born in Odessa, Ukraine, 1977 09/15 Dima Panov <fluffy@FreeBSD.org> born in Khabarovsk, Russian Federation, 1978 +09/16 Maksim Yevmenkin <emax@FreeBSD.org> born in Taganrog, USSR, 1974 09/17 Maxim Bolotin <mb@FreeBSD.org> born in Rostov-on-Don, Russian Federation, 1976 09/18 Matthew Fleming <mdf@FreeBSD.org> born in Cleveland, Ohio, United States, 1975 09/20 Kevin Lo <kevlo@FreeBSD.org> born in Taipei, Taiwan, Republic of China, 1972 @@ -352,9 +356,10 @@ 10/16 Remko Lodder <remko@FreeBSD.org> born in Rotterdam, the Netherlands, 1983 10/17 Maho NAKATA <maho@FreeBSD.org> born in Osaka, Japan, 1974 10/18 Sheldon Hearn <sheldonh@FreeBSD.org> born in Cape Town, Western Cape, South Africa, 1974 +10/18 Vladimir Kondratyev <wulf@FreeBSD.org> born in Ryazan, USSR, 1975 10/19 Nicholas Souchu <nsouch@FreeBSD.org> born in Suresnes, Hauts-de-Seine, France, 1972 10/19 Nick Barkas <snb@FreeBSD.org> born in Longview, Washington, United States, 1981 -10/19 Pedro Giffuni <pfg@FreeBSD.org> born in Bogot, Colombia, 1968 +10/19 Pedro Giffuni <pfg@FreeBSD.org> born in Bogotá, Colombia, 1968 10/20 Joel Dahl <joel@FreeBSD.org> born in Bitterna, Skaraborg, Sweden, 1983 10/20 Dmitry Marakasov <amdmi3@FreeBSD.org> born in Moscow, Russian Federation, 1984 10/21 Ben Smithurst <ben@FreeBSD.org> born in Sheffield, South Yorkshire, United Kingdom, 1981 @@ -368,7 +373,9 @@ 10/26 Matthew Ahrens <mahrens@FreeBSD.org> born in United States, 1979 10/26 Philip M. Gollucci <pgollucci@FreeBSD.org> born in Silver Spring, Maryland, United States, 1979 10/27 Takanori Watanabe <takawata@FreeBSD.org> born in Numazu, Shizuoka, Japan, 1972 +10/31 Taras Korenko <taras@FreeBSD.org> born in Cherkasy region, Ukraine, 1980 11/05 M. Warner Losh <imp@FreeBSD.org> born in Kansas City, Kansas, United States, 1966 +11/06 Michael Zhilin <mizhka@FreeBSD.org> born in Stary Oskol, USSR, 1985 11/08 Joseph R. Mingrone <jrm@FreeBSD.org> born in Charlottetown, Prince Edward Island, Canada, 1976 11/09 Coleman Kane <cokane@FreeBSD.org> born in Cincinnati, Ohio, United States, 1980 11/09 Antoine Brodin <antoine@FreeBSD.org> born in Bagnolet, France, 1981 @@ -400,6 +407,7 @@ 12/04 Mariusz Zaborski <oshogbo@FreeBSD.org> born in Skierniewice, Poland, 1990 12/05 Ivan Voras <ivoras@FreeBSD.org> born in Slavonski Brod, Croatia, 1981 12/06 Stefan Farfeleder <stefanf@FreeBSD.org> born in Wien, Austria, 1980 +12/08 Michael Tuexen <tuexen@FreeBSD.org> born in Oldenburg, Germany, 1966 12/11 Ganael Laplanche <martymac@FreeBSD.org> born in Reims, France, 1980 12/15 James FitzGibbon <jfitz@FreeBSD.org> born in Amersham, Buckinghamshire, United Kingdom, 1974 12/15 Timur I. Bakeyev <timur@FreeBSD.org> born in Kazan, Republic of Tatarstan, USSR, 1974 @@ -413,6 +421,7 @@ 12/22 Maxim Sobolev <sobomax@FreeBSD.org> born in Dnepropetrovsk, Ukraine, 1976 12/23 Sean Chittenden <seanc@FreeBSD.org> born in Seattle, Washington, United States, 1979 12/23 Alejandro Pulver <alepulver@FreeBSD.org> born in Buenos Aires, Argentina, 1989 +12/24 Jochen Neumeister <joneum@FreeBSD.org> born in Heidenheim, Germany, 1975 12/24 Guido Falsi <madpilot@FreeBSD.org> born in Firenze, Italy, 1978 12/25 Niclas Zeising <zeising@FreeBSD.org> born in Stockholm, Sweden, 1986 12/28 Soren Schmidt <sos@FreeBSD.org> born in Maribo, Denmark, 1960
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708020123.v721NHiV043791>