socsvn commit: r285687 - in soc2015/pratiksinghal/cubie-head: . contrib/tzdata etc etc/rc.d etc/rc.d/tests etc/tests gnu/lib gnu/usr.bin/groff/src/preproc/soelim lib/libc lib/libc/db/hash lib/libed...
pratiksinghal at FreeBSD.org
pratiksinghal at FreeBSD.org
Tue May 19 01:37:37 UTC 2015
Author: pratiksinghal
Date: Tue May 19 01:37:25 2015
New Revision: 285687
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285687
Log:
Merged against r285641
Added:
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/ahtable.c
- copied unchanged from r285686, mirror/FreeBSD/head/sys/contrib/dev/acpica/common/ahtable.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acuuid.h
- copied unchanged from r285686, mirror/FreeBSD/head/sys/contrib/dev/acpica/include/acuuid.h
soc2015/pratiksinghal/cubie-head/tests/etc/
- copied from r285686, mirror/FreeBSD/head/tests/etc/
Deleted:
soc2015/pratiksinghal/cubie-head/etc/rc.d/tests/
soc2015/pratiksinghal/cubie-head/etc/tests/Makefile
soc2015/pratiksinghal/cubie-head/gnu/usr.bin/groff/src/preproc/soelim/
Modified:
soc2015/pratiksinghal/cubie-head/ (props changed)
soc2015/pratiksinghal/cubie-head/contrib/tzdata/ (props changed)
soc2015/pratiksinghal/cubie-head/contrib/tzdata/africa
soc2015/pratiksinghal/cubie-head/contrib/tzdata/northamerica
soc2015/pratiksinghal/cubie-head/etc/ (props changed)
soc2015/pratiksinghal/cubie-head/etc/Makefile
soc2015/pratiksinghal/cubie-head/etc/rc.d/Makefile
soc2015/pratiksinghal/cubie-head/gnu/lib/ (props changed)
soc2015/pratiksinghal/cubie-head/gnu/lib/Makefile
soc2015/pratiksinghal/cubie-head/lib/libc/ (props changed)
soc2015/pratiksinghal/cubie-head/lib/libc/db/hash/hash.c
soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.c
soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.h
soc2015/pratiksinghal/cubie-head/lib/libedit/edit/readline/readline.h
soc2015/pratiksinghal/cubie-head/lib/libedit/el.c
soc2015/pratiksinghal/cubie-head/lib/libedit/eln.c
soc2015/pratiksinghal/cubie-head/lib/libedit/map.c
soc2015/pratiksinghal/cubie-head/lib/libedit/readline.c
soc2015/pratiksinghal/cubie-head/lib/libedit/tty.c
soc2015/pratiksinghal/cubie-head/sbin/ (props changed)
soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/geom_mountver.c
soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/gmountver.8
soc2015/pratiksinghal/cubie-head/sys/ (props changed)
soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_machdep.c
soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pic.c
soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726
soc2015/pratiksinghal/cubie-head/sys/arm/conf/ALPINE
soc2015/pratiksinghal/cubie-head/sys/arm/conf/AML8726
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/VSATV102
soc2015/pratiksinghal/cubie-head/sys/boot/ (props changed)
soc2015/pratiksinghal/cubie-head/sys/boot/arm/uboot/Makefile
soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.c
soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.h
soc2015/pratiksinghal/cubie-head/sys/boot/uboot/lib/net.c
soc2015/pratiksinghal/cubie-head/sys/conf/ (props changed)
soc2015/pratiksinghal/cubie-head/sys/conf/options.arm
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/ (props changed)
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/changes.txt
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/adisasm.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/ahpredef.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/dmextern.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/dmtable.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/dmtbdump.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/dmtbinfo.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslascii.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslcompiler.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslcompiler.l
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/asldefine.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslfiles.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslmessages.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslmessages.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslprepkg.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslstartup.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslutils.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtcompile.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtcompiler.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtio.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtsubtable.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dttable.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dttemplate.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dttemplate.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtutils.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/preprocess.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/prscan.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/prutils.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/debugger/dbfileio.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/debugger/dbinput.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/hardware/hwpci.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/namespace/nsrepair.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/parser/psopinfo.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/utilities/utfileio.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/utilities/uthex.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/utilities/utxferror.c
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acdebug.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acdisasm.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/aclocal.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acparser.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acpixf.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acpredef.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actbl.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actbl1.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actbl2.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actbl3.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actypes.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acutils.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/platform/acenv.h
soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/platform/acenvex.h
soc2015/pratiksinghal/cubie-head/sys/ddb/db_break.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_input.c
soc2015/pratiksinghal/cubie-head/sys/ddb/db_main.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_sym.c
soc2015/pratiksinghal/cubie-head/sys/ddb/db_textdump.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/dev/hyperv/ (props changed)
soc2015/pratiksinghal/cubie-head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
soc2015/pratiksinghal/cubie-head/sys/dev/hyperv/storvsc/hv_vstorage.h
soc2015/pratiksinghal/cubie-head/sys/dev/sfxge/sfxge.c
soc2015/pratiksinghal/cubie-head/sys/dev/sfxge/sfxge_tx.c
soc2015/pratiksinghal/cubie-head/sys/dev/sound/pci/hda/hdaa.c
soc2015/pratiksinghal/cubie-head/sys/dev/usb/controller/dwc_otg.c
soc2015/pratiksinghal/cubie-head/sys/dev/usb/controller/dwc_otg.h
soc2015/pratiksinghal/cubie-head/sys/kern/kern_descrip.c
soc2015/pratiksinghal/cubie-head/sys/kern/vfs_syscalls.c
soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf.c
soc2015/pratiksinghal/cubie-head/tests/Makefile
soc2015/pratiksinghal/cubie-head/tools/build/mk/OptionalObsoleteFiles.inc
soc2015/pratiksinghal/cubie-head/usr.bin/m4/extern.h
soc2015/pratiksinghal/cubie-head/usr.bin/m4/gnum4.c
soc2015/pratiksinghal/cubie-head/usr.bin/m4/look.c
soc2015/pratiksinghal/cubie-head/usr.bin/m4/m4.1
soc2015/pratiksinghal/cubie-head/usr.bin/m4/main.c
soc2015/pratiksinghal/cubie-head/usr.bin/m4/mdef.h
soc2015/pratiksinghal/cubie-head/usr.bin/m4/misc.c
soc2015/pratiksinghal/cubie-head/usr.bin/m4/parser.y
soc2015/pratiksinghal/cubie-head/usr.bin/netstat/route.c
soc2015/pratiksinghal/cubie-head/usr.bin/time/time.c
soc2015/pratiksinghal/cubie-head/usr.sbin/acpi/acpidb/acpidb.c
soc2015/pratiksinghal/cubie-head/usr.sbin/acpi/iasl/Makefile
soc2015/pratiksinghal/cubie-head/usr.sbin/bhyveload/ (props changed)
soc2015/pratiksinghal/cubie-head/usr.sbin/bhyveload/bhyveload.c
Modified: soc2015/pratiksinghal/cubie-head/contrib/tzdata/africa
==============================================================================
--- soc2015/pratiksinghal/cubie-head/contrib/tzdata/africa Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/contrib/tzdata/africa Tue May 19 01:37:25 2015 (r285687)
@@ -328,35 +328,20 @@
# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
-# From Paul Eggert (2015-04-08):
-# For now, guess that later spring and fall transitions will use
-# 2014's rules, and guess that Egypt will switch to standard time at
-# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
-# first Friday after Ramadan. To implement this,
-# transition dates for 2015 through 2037 were determined by running
-# the following program under GNU Emacs 24.4, with the results integrated
-# by hand into the table below. Ramadan again intrudes on the guessed
-# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
-# (let ((islamic-year 1436))
-# (while (< islamic-year 1460)
-# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-# (friday 5))
-# (while (/= friday (mod a 7))
-# (setq a (1- a)))
-# (while (/= friday (mod b 7))
-# (setq b (1+ b)))
-# (setq a (1- a))
-# (setq b (1- b))
-# (setq a (calendar-gregorian-from-absolute a))
-# (setq b (calendar-gregorian-from-absolute b))
-# (insert
-# (format
-# (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
-# "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
-# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
-# (setq islamic-year (+ 1 islamic-year))))
+# From Ahmed Nazmy (2015-04-20):
+# Egypt's ministers cabinet just announced ... that it will cancel DST at
+# least for 2015.
+#
+# From Tim Parenti (2015-04-20):
+# http://english.ahram.org.eg/WriterArticles/NewsContentP/1/128195/Egypt/No-daylight-saving-this-summer-Egypts-prime-minist.aspx
+# "Egypt's cabinet agreed on Monday not to switch clocks for daylight saving
+# time this summer, and carry out studies on the possibility of canceling the
+# practice altogether in future years."
+#
+# From Paul Eggert (2015-04-20):
+# For now, assume DST will be canceled. Any resumption would likely
+# use different rules anyway.
+
Rule Egypt 2008 only - Aug lastThu 24:00 0 -
Rule Egypt 2009 only - Aug 20 24:00 0 -
Rule Egypt 2010 only - Aug 10 24:00 0 -
@@ -365,22 +350,7 @@
Rule Egypt 2014 only - May 15 24:00 1:00 S
Rule Egypt 2014 only - Jun 26 24:00 0 -
Rule Egypt 2014 only - Jul 31 24:00 1:00 S
-Rule Egypt 2014 max - Sep lastThu 24:00 0 -
-Rule Egypt 2015 2019 - Apr lastThu 24:00 1:00 S
-Rule Egypt 2015 only - Jun 11 24:00 0 -
-Rule Egypt 2015 only - Jul 23 24:00 1:00 S
-Rule Egypt 2016 only - Jun 2 24:00 0 -
-Rule Egypt 2016 only - Jul 7 24:00 1:00 S
-Rule Egypt 2017 only - May 25 24:00 0 -
-Rule Egypt 2017 only - Jun 29 24:00 1:00 S
-Rule Egypt 2018 only - May 10 24:00 0 -
-Rule Egypt 2018 only - Jun 14 24:00 1:00 S
-Rule Egypt 2019 only - May 2 24:00 0 -
-Rule Egypt 2019 only - Jun 6 24:00 1:00 S
-Rule Egypt 2020 only - May 28 24:00 1:00 S
-Rule Egypt 2021 only - May 13 24:00 1:00 S
-Rule Egypt 2022 only - May 5 24:00 1:00 S
-Rule Egypt 2023 max - Apr lastThu 24:00 1:00 S
+Rule Egypt 2014 only - Sep lastThu 24:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
Modified: soc2015/pratiksinghal/cubie-head/contrib/tzdata/northamerica
==============================================================================
--- soc2015/pratiksinghal/cubie-head/contrib/tzdata/northamerica Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/contrib/tzdata/northamerica Tue May 19 01:37:25 2015 (r285687)
@@ -227,9 +227,14 @@
# The law doesn't give abbreviations.
#
# From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
-# Public law 106-564 (2000-12-23) introduced the abbreviation
-# "Chamorro Standard Time" for time in Guam and the Northern Marianas.
-# See the file "australasia".
+# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
+# for time in Guam and the Northern Marianas. See the file "australasia".
+#
+# From Paul Eggert (2015-04-17):
+# HST and HDT are standardized abbreviations for Hawaii-Aleutian
+# standard and daylight times. See section 9.47 (p 234) of the
+# U.S. Government Printing Office Style Manual (2008)
+# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
# From Arthur David Olson, 2005-08-09
# The following was signed into law on 2005-08-08.
@@ -536,7 +541,7 @@
-11:00 - BST 1969
-11:00 US B%sT 1983 Oct 30 2:00
-10:00 US AH%sT 1983 Nov 30
- -10:00 US HA%sT
+ -10:00 US H%sT
# The following switches don't quite make our 1970 cutoff.
#
# Shanks writes that part of southwest Alaska (e.g. Aniak)
@@ -1841,17 +1846,115 @@
# Dawson switched to PST in 1973. Inuvik switched to MST in 1979.
# Mathew Englander (1996-10-07) gives the following refs:
# * 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
-# c. 7 defines Yukon standard time as UTC-9. This is still valid;
+# c. 7 defines Yukon standard time as UTC-9....
# see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
+# [http://canlii.ca/t/7vhg]
# * C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
# * O.I.C. 1980/02 established DST.
# * O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
-# Shanks & Pottenger say Yukon's 1973-10-28 switch was at 2:00; go
-# with Englander.
-# From Chris Walton (2006-06-26):
-# Here is a link to the old daylight saving portion of the interpretation
-# act which was last updated in 1987:
-# http://www.gov.yk.ca/legislation/regs/oic1987_056.pdf
+
+# From Brian Inglis (2015-04-14):
+#
+# I tried to trace the history of Yukon time and found the following
+# regulations, giving the reference title and URL if found, regulation name,
+# and relevant quote if available. Each regulation specifically revokes its
+# predecessor. The final reference is to the current Interpretation Act
+# authorizing and resulting from these regulatory changes.
+#
+# Only recent regulations were retrievable via Yukon government site search or
+# index, and only some via Canadian legal sources. Other sources used include
+# articles titled "Standard Time and Time Zones in Canada" from JRASC via ADS
+# Abstracts, cited by ADO for 1932 ..., and updated versions from 1958 and
+# 1970 quoted below; each article includes current extracts from provincial
+# and territorial ST and DST regulations at the end, summaries and details of
+# standard times and daylight saving time at many locations across Canada,
+# with time zone maps, tables and calculations for Canadian Sunrise, Sunset,
+# and LMST; they also cover many countries and global locations, with a chart
+# and table showing current Universal Time offsets, and may be useful as
+# another source of information for 1970 and earlier.
+#
+# * Standard Time and Time Zones in Canada; Smith, C.C.; JRASC, Vol. 26,
+# pp.49-77; February 1932; SAO/NASA Astrophysics Data System (ADS)
+# http://adsabs.harvard.edu/abs/1932JRASC..26...49S from p.75:
+# Yukon Interpretation Ordinance
+# Yukon standard time is the local mean time at the one hundred and
+# thirty-fifth meridian.
+#
+# * Standard Time and Time Zones in Canada; Smith, C.C.; Thomson, Malcolm M.;
+# JRASC, Vol. 52, pp.193-223; October 1958; SAO/NASA Astrophysics Data System
+# (ADS) http://adsabs.harvard.edu/abs/1958JRASC..52..193S from pp.220-1:
+# Yukon Interpretation Ordinance, 1955, Chap. 16.
+#
+# (1) Subject to this section, standard time shall be reckoned as nine
+# hours behind Greenwich Time and called Yukon Standard Time.
+#
+# (2) Notwithstanding subsection (1), the Commissioner may make regulations
+# varying the manner of reckoning standard time.
+#
+# * Yukon Territory Commissioner's Order 1966-20 Interpretation Ordinance
+# http://? - no online source found
+#
+# * Standard Time and Time Zones in Canada; Thomson, Malcolm M.; JRASC,
+# Vol. 64, pp.129-162; June 1970; SAO/NASA Astrophysics Data System (ADS)
+# http://adsabs.harvard.edu/abs/1970JRASC..64..129T from p.156: Yukon
+# Territory Commissioner's Order 1967-59 Interpretation Ordinance ...
+#
+# 1. Commissioner's Order 1966-20 dated at Whitehorse in the Yukon
+# Territory on 27th January, 1966, is hereby revoked.
+#
+# 2. Yukon (East) Standard Time as defined by section 36 of the
+# Interpretation Ordinance from and after mid-night on the 28th day of May,
+# 1967 shall be reckoned in the same manner as Pacific Standard Time, that
+# is to say, eight hours behind Greenwich Time in the area of the Yukon
+# Territory lying east of the 138th degree longitude west.
+#
+# 3. In the remainder of the Territory, lying west of the 138th degree
+# longitude west, Yukon (West) Standard Time shall be reckoned as nine
+# hours behind Greenwich Time.
+#
+# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214
+# http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
+# C.O. 1973/214 INTERPRETATION ACT ...
+#
+# 1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby
+# revoked.
+#
+# 2. Yukon Standard Time as defined by section 36 of the Interpretation
+# Act from and after midnight on the twenty-eighth day of October, 1973
+# shall be reckoned in the same manner as Pacific Standard Time, that is
+# to say eight hours behind Greenwich Time.
+#
+# * O.I.C. 1980/02 INTERPRETATION ACT
+# http://? - no online source found
+#
+# * Yukon Daylight Saving Time, YOIC 1987/56
+# http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
+# O.I.C. 1987/056 INTERPRETATION ACT ...
+#
+# In every year between
+# (a) two o'clock in the morning in the first Sunday in April, and
+# (b) two o'clock in the morning in the last Sunday in October,
+# Standard Time shall be reckoned as seven hours behind Greenwich Time and
+# called Yukon Daylight Saving Time.
+# ...
+# Dated ... 9th day of March, A.D., 1987.
+#
+# * Yukon Daylight Saving Time 2006, YOIC 2006/127
+# http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
+# O.I.C. 2006/127 INTERPRETATION ACT ...
+#
+# 1. In Yukon each year the time for general purposes shall be 7 hours
+# behind Greenwich mean time during the period commencing at two o'clock
+# in the forenoon on the second Sunday of March and ending at two o'clock
+# in the forenoon on the first Sunday of November and shall be called
+# Yukon Daylight Saving Time.
+#
+# 2. Order-in-Council 1987/56 is revoked.
+#
+# 3. This order comes into force January 1, 2007.
+#
+# * Interpretation Act, RSY 2002, c 125
+# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
# From Rives McDow (1999-09-04):
# Nunavut ... moved ... to incorporate the whole territory into one time zone.
@@ -2077,7 +2180,7 @@
-7:00 NT_YK M%sT 1980
-7:00 Canada M%sT
Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1966 Jul 1 2:00
+ -9:00 NT_YK Y%sT 1967 May 28 0:00
-8:00 NT_YK P%sT 1980
-8:00 Canada P%sT
Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
Modified: soc2015/pratiksinghal/cubie-head/etc/Makefile
==============================================================================
--- soc2015/pratiksinghal/cubie-head/etc/Makefile Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/etc/Makefile Tue May 19 01:37:25 2015 (r285687)
@@ -10,10 +10,6 @@
SUBDIR+=sendmail
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
-
BIN1= crontab \
devd.conf \
devfs.conf \
Modified: soc2015/pratiksinghal/cubie-head/etc/rc.d/Makefile
==============================================================================
--- soc2015/pratiksinghal/cubie-head/etc/rc.d/Makefile Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/etc/rc.d/Makefile Tue May 19 01:37:25 2015 (r285687)
@@ -263,10 +263,6 @@
FILES+= sendmail
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
.if ${MK_TIMED} != "no"
FILES+= timed
.endif
Modified: soc2015/pratiksinghal/cubie-head/gnu/lib/Makefile
==============================================================================
--- soc2015/pratiksinghal/cubie-head/gnu/lib/Makefile Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/gnu/lib/Makefile Tue May 19 01:37:25 2015 (r285687)
@@ -2,10 +2,10 @@
.include <src.opts.mk>
-SUBDIR= csu libgcc libgcov libdialog libregex libreadline
+SUBDIR= csu libgcc libdialog libregex
.if ${MK_GCC} != "no"
-SUBDIR+= libgomp
+SUBDIR+= libgcov libgomp
.endif
.if ${MK_SSP} != "no"
@@ -16,6 +16,10 @@
SUBDIR+= tests
.endif
+.if ${MK_GDB} != "no"
+SUBDIR+= libreadline
+.endif
+
# libsupc++ uses libstdc++ headers, although 'make includes' should
# have taken care of that already.
.if ${MK_GNUCXX} != "no"
Modified: soc2015/pratiksinghal/cubie-head/lib/libc/db/hash/hash.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libc/db/hash/hash.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libc/db/hash/hash.c Tue May 19 01:37:25 2015 (r285687)
@@ -808,7 +808,7 @@
hashp->DSIZE = dirsize << 1;
}
if ((hashp->dir[new_segnum] =
- (SEGMENT)calloc(hashp->SGSIZE, sizeof(SEGMENT))) == NULL)
+ calloc(hashp->SGSIZE, sizeof(SEGMENT))) == NULL)
return (-1);
hashp->exsegs++;
hashp->nsegs++;
@@ -877,7 +877,7 @@
int save_errno;
if ((hashp->dir =
- (SEGMENT *)calloc(hashp->DSIZE, sizeof(SEGMENT *))) == NULL) {
+ calloc(hashp->DSIZE, sizeof(SEGMENT *))) == NULL) {
save_errno = errno;
(void)hdestroy(hashp);
errno = save_errno;
@@ -887,8 +887,7 @@
if (nsegs == 0)
return (0);
/* Allocate segments */
- if ((store = (SEGMENT)calloc(nsegs << hashp->SSHIFT,
- sizeof(SEGMENT))) == NULL) {
+ if ((store = calloc(nsegs << hashp->SSHIFT, sizeof(SEGMENT))) == NULL) {
save_errno = errno;
(void)hdestroy(hashp);
errno = save_errno;
Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.c Tue May 19 01:37:25 2015 (r285687)
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.c,v 1.10 2011/08/16 16:25:15 christos Exp $ */
+/* $NetBSD: chartype.c,v 1.12 2015/02/22 02:16:19 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.10 2011/08/16 16:25:15 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.12 2015/02/22 02:16:19 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -42,31 +42,46 @@
#define CT_BUFSIZ ((size_t)1024)
#ifdef WIDECHAR
-protected void
-ct_conv_buff_resize(ct_buffer_t *conv, size_t mincsize, size_t minwsize)
+protected int
+ct_conv_cbuff_resize(ct_buffer_t *conv, size_t csize)
{
void *p;
- if (mincsize > conv->csize) {
- conv->csize = mincsize;
- p = el_realloc(conv->cbuff, conv->csize * sizeof(*conv->cbuff));
- if (p == NULL) {
- conv->csize = 0;
- el_free(conv->cbuff);
- conv->cbuff = NULL;
- } else
- conv->cbuff = p;
+
+ if (csize <= conv->csize)
+ return 0;
+
+ conv->csize = csize;
+
+ p = el_realloc(conv->cbuff, conv->csize * sizeof(*conv->cbuff));
+ if (p == NULL) {
+ conv->csize = 0;
+ el_free(conv->cbuff);
+ conv->cbuff = NULL;
+ return -1;
}
+ conv->cbuff = p;
+ return 0;
+}
- if (minwsize > conv->wsize) {
- conv->wsize = minwsize;
- p = el_realloc(conv->wbuff, conv->wsize * sizeof(*conv->wbuff));
- if (p == NULL) {
- conv->wsize = 0;
- el_free(conv->wbuff);
- conv->wbuff = NULL;
- } else
- conv->wbuff = p;
+protected int
+ct_conv_wbuff_resize(ct_buffer_t *conv, size_t wsize)
+{
+ void *p;
+
+ if (wsize <= conv->wsize)
+ return 0;
+
+ conv->wsize = wsize;
+
+ p = el_realloc(conv->wbuff, conv->wsize * sizeof(*conv->wbuff));
+ if (p == NULL) {
+ conv->wsize = 0;
+ el_free(conv->wbuff);
+ conv->wbuff = NULL;
+ return -1;
}
+ conv->wbuff = p;
+ return 0;
}
@@ -74,26 +89,22 @@
ct_encode_string(const Char *s, ct_buffer_t *conv)
{
char *dst;
- ssize_t used = 0;
+ ssize_t used;
if (!s)
return NULL;
- if (!conv->cbuff)
- ct_conv_buff_resize(conv, CT_BUFSIZ, (size_t)0);
- if (!conv->cbuff)
- return NULL;
dst = conv->cbuff;
- while (*s) {
- used = (ssize_t)(conv->csize - (size_t)(dst - conv->cbuff));
- if (used < 5) {
- used = dst - conv->cbuff;
- ct_conv_buff_resize(conv, conv->csize + CT_BUFSIZ,
- (size_t)0);
- if (!conv->cbuff)
+ for (;;) {
+ used = (ssize_t)(dst - conv->cbuff);
+ if ((conv->csize - (size_t)used) < 5) {
+ if (ct_conv_cbuff_resize(conv,
+ conv->csize + CT_BUFSIZ) == -1)
return NULL;
dst = conv->cbuff + used;
}
+ if (!*s)
+ break;
used = ct_encode_char(dst, (size_t)5, *s);
if (used == -1) /* failed to encode, need more buffer space */
abort();
@@ -107,22 +118,19 @@
public Char *
ct_decode_string(const char *s, ct_buffer_t *conv)
{
- size_t len = 0;
+ size_t len;
if (!s)
return NULL;
- if (!conv->wbuff)
- ct_conv_buff_resize(conv, (size_t)0, CT_BUFSIZ);
- if (!conv->wbuff)
- return NULL;
len = ct_mbstowcs(NULL, s, (size_t)0);
if (len == (size_t)-1)
return NULL;
- if (len > conv->wsize)
- ct_conv_buff_resize(conv, (size_t)0, len + 1);
- if (!conv->wbuff)
- return NULL;
+
+ if (conv->wsize < ++len)
+ if (ct_conv_wbuff_resize(conv, len + CT_BUFSIZ) == -1)
+ return NULL;
+
ct_mbstowcs(conv->wbuff, s, conv->wsize);
return conv->wbuff;
}
@@ -141,9 +149,9 @@
* the argv strings. */
for (i = 0, bufspace = 0; i < argc; ++i)
bufspace += argv[i] ? strlen(argv[i]) + 1 : 0;
- ct_conv_buff_resize(conv, (size_t)0, bufspace);
- if (!conv->wsize)
- return NULL;
+ if (conv->wsize < ++bufspace)
+ if (ct_conv_wbuff_resize(conv, bufspace + CT_BUFSIZ) == -1)
+ return NULL;
wargv = el_malloc((size_t)argc * sizeof(*wargv));
Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.h
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.h Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.h Tue May 19 01:37:25 2015 (r285687)
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.h,v 1.10 2011/11/16 01:45:10 christos Exp $ */
+/* $NetBSD: chartype.h,v 1.15 2015/05/17 13:14:41 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
* supports non-BMP code points without requiring UTF-16, but nothing
* seems to actually advertise this properly, despite Unicode 3.1 having
* been around since 2001... */
-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__FreeBSD__)
+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
#ifndef __STDC_ISO_10646__
/* In many places it is assumed that the first 127 code points are ASCII
* compatible, so ensure wchar_t indeed does ISO 10646 and not some other
@@ -67,6 +67,7 @@
#define FUN(prefix,rest) prefix ## _w ## rest
#define FUNW(type) type ## _w
#define TYPE(type) type ## W
+#define FCHAR "%lc"
#define FSTR "%ls"
#define STR(x) L ## x
#define UC(c) c
@@ -121,6 +122,7 @@
#define FUN(prefix,rest) prefix ## _ ## rest
#define FUNW(type) type
#define TYPE(type) type
+#define FCHAR "%c"
#define FSTR "%s"
#define STR(x) x
#define UC(c) (unsigned char)(c)
@@ -184,7 +186,8 @@
protected Char **ct_decode_argv(int, const char *[], ct_buffer_t *);
/* Resizes the conversion buffer(s) if needed. */
-protected void ct_conv_buff_resize(ct_buffer_t *, size_t, size_t);
+protected int ct_conv_cbuff_resize(ct_buffer_t *, size_t);
+protected int ct_conv_wbuff_resize(ct_buffer_t *, size_t);
protected ssize_t ct_encode_char(char *, size_t, Char);
protected size_t ct_enc_width(Char);
@@ -194,7 +197,8 @@
#define ct_encode_string(s, b) (s)
#define ct_decode_string(s, b) (s)
#define ct_decode_argv(l, s, b) (s)
-#define ct_conv_buff_resize(b, os, ns)
+#define ct_conv_cbuff_resize(b, s) ((s) == (0))
+#define ct_conv_wbuff_resize(b, s) ((s) == (0))
#define ct_encode_char(d, l, s) (*d = s, 1)
#define ct_free_argv(s)
#endif
Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/edit/readline/readline.h
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libedit/edit/readline/readline.h Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libedit/edit/readline/readline.h Tue May 19 01:37:25 2015 (r285687)
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.h,v 1.31 2010/08/04 20:29:18 christos Exp $ */
+/* $NetBSD: readline.h,v 1.34 2013/05/28 00:10:34 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/el.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libedit/el.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libedit/el.c Tue May 19 01:37:25 2015 (r285687)
@@ -96,7 +96,7 @@
*/
el->el_flags = 0;
#ifdef WIDECHAR
- if (setlocale(LC_CTYPE, NULL) != NULL) {
+ if (setlocale(LC_CTYPE, NULL) != NULL){
if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0)
el->el_flags |= CHARSET_IS_UTF8;
}
Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/eln.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libedit/eln.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libedit/eln.c Tue May 19 01:37:25 2015 (r285687)
@@ -1,4 +1,4 @@
-/* $NetBSD: eln.c,v 1.17 2014/06/18 18:12:28 christos Exp $ */
+/* $NetBSD: eln.c,v 1.19 2015/05/18 15:07:04 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.17 2014/06/18 18:12:28 christos Exp $");
+__RCSID("$NetBSD: eln.c,v 1.19 2015/05/18 15:07:04 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -77,18 +77,18 @@
el_gets(EditLine *el, int *nread)
{
const wchar_t *tmp;
- int nwread;
-
- *nread = 0;
if (!(el->el_flags & CHARSET_IS_UTF8))
el->el_flags |= IGNORE_EXTCHARS;
- tmp = el_wgets(el, &nwread);
+ tmp = el_wgets(el, nread);
+ if (tmp != NULL) {
+ size_t nwread = 0;
+ for (int i = 0; i < *nread; i++)
+ nwread += ct_enc_width(tmp[i]);
+ *nread = (int)nwread;
+ }
if (!(el->el_flags & CHARSET_IS_UTF8))
el->el_flags &= ~IGNORE_EXTCHARS;
- for (int i = 0; i < nwread; i++)
- *nread += ct_enc_width(tmp[i]);
-
return ct_encode_string(tmp, &el->el_lgcyconv);
}
Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/map.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libedit/map.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libedit/map.c Tue May 19 01:37:25 2015 (r285687)
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $ */
+/* $NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
#include <sys/cdefs.h>
@@ -1302,8 +1302,8 @@
return 0;
default:
(void) fprintf(el->el_errfile,
- "" FSTR ": Invalid switch `%c'.\n",
- argv[0], p[1]);
+ "" FSTR ": Invalid switch `" FCHAR "'.\n",
+ argv[0], (Int)p[1]);
}
else
break;
Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/readline.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libedit/readline.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libedit/readline.c Tue May 19 01:37:25 2015 (r285687)
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.113 2014/10/18 08:33:23 snj Exp $ */
+/* $NetBSD: readline.c,v 1.115 2015/04/01 15:23:15 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.113 2014/10/18 08:33:23 snj Exp $");
+__RCSID("$NetBSD: readline.c,v 1.115 2015/04/01 15:23:15 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -364,6 +364,37 @@
_el_rl_tstp);
el_set(e, EL_BIND, "^Z", "rl_tstp", NULL);
+ /*
+ * Set some readline compatible key-bindings.
+ */
+ el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL);
+
+ /*
+ * Allow the use of Home/End keys.
+ */
+ el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
+ el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
+ el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL);
+ el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL);
+ el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL);
+ el_set(e, EL_BIND, "\\e[F", "ed-move-to-end", NULL);
+
+ /*
+ * Allow the use of the Delete/Insert keys.
+ */
+ el_set(e, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
+ el_set(e, EL_BIND, "\\e[2~", "ed-quoted-insert", NULL);
+
+ /*
+ * Ctrl-left-arrow and Ctrl-right-arrow for word moving.
+ */
+ el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
+ el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
+ el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL);
+ el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL);
+ el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
+ el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);
+
/* read settings from configuration file */
el_source(e, NULL);
@@ -950,7 +981,8 @@
for (; str[j]; j++) {
if (str[j] == '\\' &&
str[j + 1] == history_expansion_char) {
- (void)strcpy(&str[j], &str[j + 1]);
+ len = strlen(&str[j + 1]) + 1;
+ memmove(&str[j], &str[j + 1], len);
continue;
}
if (!loop_again) {
Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/tty.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/lib/libedit/tty.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/lib/libedit/tty.c Tue May 19 01:37:25 2015 (r285687)
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $ */
+/* $NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
#include <sys/cdefs.h>
@@ -1173,8 +1173,8 @@
break;
default:
(void) fprintf(el->el_errfile,
- "%s: Unknown switch `%c'.\n",
- name, argv[0][1]);
+ "%s: Unknown switch `" FCHAR "'.\n",
+ name, (Int)argv[0][1]);
return -1;
}
Modified: soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/geom_mountver.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/geom_mountver.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/geom_mountver.c Tue May 19 01:37:25 2015 (r285687)
@@ -43,14 +43,14 @@
{
G_OPT_SENTINEL
},
- "[-v] dev ..."
+ "[-v] prov ..."
},
{ "destroy", G_FLAG_VERBOSE, NULL,
{
{ 'f', "force", NULL, G_TYPE_BOOL },
G_OPT_SENTINEL
},
- "[-fv] prov ..."
+ "[-fv] name"
},
G_CMD_SENTINEL
};
Modified: soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/gmountver.8
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/gmountver.8 Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/gmountver.8 Tue May 19 01:37:25 2015 (r285687)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 27, 2015
+.Dd May 18, 2015
.Dt GMOUNTVER 8
.Os
.Sh NAME
@@ -35,11 +35,11 @@
.Nm
.Cm create
.Op Fl v
-.Ar dev ...
+.Ar prov ...
.Nm
.Cm destroy
.Op Fl fv
-.Ar prov ...
+.Ar name
.Nm
.Cm list
.Nm
@@ -66,8 +66,11 @@
indicates an action to be performed:
.Bl -tag -width ".Cm destroy"
.It Cm create
-Cache the given devices with specified
-.Ar name .
+Enable mount verification for the given provider.
+If the operation succeeds, a new GEOM provider will be created using the
+given provider's name with a
+.Ql .mountver
+suffix.
The kernel module
.Pa geom_mountver.ko
will be loaded if it is not loaded already.
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_machdep.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_machdep.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_machdep.c Tue May 19 01:37:25 2015 (r285687)
@@ -40,6 +40,7 @@
#include <machine/bus.h>
#include <machine/cpufunc.h>
#include <machine/devmap.h>
+#include <machine/intr.h>
#include <machine/machdep.h>
#include <machine/platform.h>
@@ -181,43 +182,31 @@
{ NULL, NULL }
};
+#ifndef DEV_GIC
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
{
/*
- * The single core chips have just an Amlogic PIC. However the
- * multi core chips also have a GIC.
+ * The single core chips have just an Amlogic PIC.
*/
-#ifdef SMP
- if (!fdt_is_compatible_strict(node, "arm,cortex-a9-gic"))
-#else
if (!fdt_is_compatible_strict(node, "amlogic,aml8726-pic"))
-#endif
return (ENXIO);
*interrupt = fdt32_to_cpu(intr[1]);
*trig = INTR_TRIGGER_EDGE;
*pol = INTR_POLARITY_HIGH;
- switch (*interrupt) {
- case 30: /* INT_USB_A */
- case 31: /* INT_USB_B */
- *trig = INTR_TRIGGER_LEVEL;
- break;
- default:
- break;
- }
-
-#ifdef SMP
- *interrupt += 32;
-#endif
-
return (0);
}
+#endif
fdt_pic_decode_t fdt_pic_table[] = {
+#ifdef DEV_GIC
+ &gic_decode_fdt,
+#else
&fdt_pic_decode_ic,
+#endif
NULL
};
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pic.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pic.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pic.c Tue May 19 01:37:25 2015 (r285687)
@@ -169,7 +169,7 @@
CSR_WRITE_4(sc, AML_PIC_0_FIRQ_SEL + i * 16, 0);
}
-#ifndef SMP
+#ifndef DEV_GIC
arm_post_filter = aml8726_pic_eoi;
#else
device_printf(dev, "disabled in favor of gic\n");
@@ -207,7 +207,7 @@
EARLY_DRIVER_MODULE(pic, simplebus, aml8726_pic_driver, aml8726_pic_devclass,
0, 0, BUS_PASS_INTERRUPT);
-#ifndef SMP
+#ifndef DEV_GIC
int
arm_get_next_irq(int last)
{
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726 Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726 Tue May 19 01:37:25 2015 (r285687)
@@ -13,7 +13,7 @@
arm/amlogic/aml8726/aml8726_identsoc.c standard
arm/amlogic/aml8726/aml8726_ccm.c standard
arm/amlogic/aml8726/aml8726_clkmsr.c standard
-arm/amlogic/aml8726/aml8726_pic.c standard
+arm/amlogic/aml8726/aml8726_pic.c optional aml_pic
arm/amlogic/aml8726/aml8726_rtc.c standard
arm/amlogic/aml8726/aml8726_timer.c standard
arm/amlogic/aml8726/aml8726_wdt.c standard
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/ALPINE
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/conf/ALPINE Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/ALPINE Tue May 19 01:37:25 2015 (r285687)
@@ -19,8 +19,8 @@
ident ALPINE
-include "std.armv6"
-include "../annapurna/alpine/std.alpine"
+include "std.armv6"
+include "../annapurna/alpine/std.alpine"
makeoptions MODULES_OVERRIDE=""
makeoptions WERROR="-Werror"
@@ -35,11 +35,6 @@
options KDB
options DDB #Enable the kernel debugger
-# NFS support
-options NFSCL #Network Filesystem Client
-options NFSLOCKD #Network Lock Manager
-options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-
# Interrupt controller
device gic
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/AML8726
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/conf/AML8726 Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/AML8726 Tue May 19 01:37:25 2015 (r285687)
@@ -27,7 +27,6 @@
options SCHED_ULE # ULE scheduler
options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
options LINUX_BOOT_ABI
-options SMP # Enable multiple cores
# Debugging
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
@@ -52,6 +51,9 @@
#options BOOTP_NFSV3
#options BOOTP_WIRED_TO=axe0
+# Interrupt controller
+device aml_pic
+
# MMC/SD/SDIO Card slot support
device mmc # mmc/sd bus
device mmcsd # mmc/sd flash cards
@@ -59,9 +61,6 @@
# Boot device is 2nd slice on MMC/SD card
options ROOTDEVNAME=\"ufs:mmcsd0s2\"
-# Interrupt controller
-device gic
-
# GPIO
device gpio
device gpioled
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Tue May 19 01:37:25 2015 (r285687)
@@ -96,8 +96,6 @@
device loop
device ether
device mii
-device smscphy
-#device cpsw
device bpf
device emac
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2 Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2 Tue May 19 01:37:25 2015 (r285687)
@@ -100,8 +100,6 @@
device loop
device ether
device mii
-device smscphy
-#device cpsw
device bpf
device emac
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1 Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1 Tue May 19 01:37:25 2015 (r285687)
@@ -22,5 +22,8 @@
include "AML8726"
ident ODROIDC1
+# Interrupt controller
+device gic
+
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=odroidc1.dts
Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102 Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102 Tue May 19 01:37:25 2015 (r285687)
@@ -22,5 +22,8 @@
include "AML8726"
ident VSATV102
+# Interrupt controller
+device gic
+
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=vsatv102-m6.dts
Modified: soc2015/pratiksinghal/cubie-head/sys/boot/arm/uboot/Makefile
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/boot/arm/uboot/Makefile Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/boot/arm/uboot/Makefile Tue May 19 01:37:25 2015 (r285687)
@@ -77,6 +77,8 @@
LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
.endif
+CFLAGS+= -DNETIF_OPEN_CLOSE_ONCE
+
.if ${MK_FORTH} != "no"
# Enable BootForth
BOOT_FORTH= yes
Modified: soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.c Mon May 18 23:46:11 2015 (r285686)
+++ soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.c Tue May 19 01:37:25 2015 (r285687)
@@ -111,6 +111,8 @@
static int
net_open(struct open_file *f, ...)
{
+ char temp[FNAME_SIZE];
+ struct iodesc *d;
va_list args;
char *devname; /* Device part of file name (or NULL). */
int error = 0;
@@ -140,6 +142,10 @@
printf("net_open: netif_open() succeeded\n");
#endif
}
+ /*
+ * If network params were not set by netif_open(), try to get
+ * them via bootp, rarp, etc.
+ */
if (rootip.s_addr == 0) {
/* Get root IP address, and path, etc. */
error = net_getparams(netdev_sock);
@@ -151,6 +157,20 @@
return (error);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-soc-all
mailing list