| History log of /src/etc/etc.sandpoint |
| Revision | Date | Author | Comments |
| 1.38 | 24-Oct-2003 |
jdolecek | switch over to unified MAKEDEV
|
| 1.37 | 10-Oct-2003 |
jdolecek | reassing majors for crypto and pf to use the newly defined MI major range
|
| 1.36 | 03-Oct-2003 |
dsl | Add a /dev/constty == /dev/console but with minor 1. Use for tty sessions on 'console' so that output doesn't pinched by anyone using TIOCCONS to get kernel and system messages.
|
| 1.35 | 19-Sep-2003 |
pooka | add isdn telephony dialout devices
|
| 1.34 | 30-Aug-2003 |
dsl | Change the way pseudo tty devices are generated in order to avoid any pipes and running other commands (eg dd). Measurable speeds up creating pseudo ttys. (there has to be a better way than editing 51 files! - tedious at only 6 key presses per file)
|
| 1.33 | 22-Aug-2003 |
itojun | create /dev/crypto
|
| 1.32 | 27-Jul-2003 |
itojun | reserve cdev major # for PF. ok'ed by technical-exec
|
| 1.31 | 27-Apr-2003 |
ragge | Add ksyms to "std" devices.
|
| 1.30 | 17-Apr-2003 |
fvdl | Add an 'init' target, that creates the device nodes in the case where MAKEDEV is being called from init(8) to create an MFS /dev. For most ports, this is the same as 'all'. The only exceptions are i386 and x86_64.
|
| 1.29 | 31-Mar-2003 |
perry | make ipl consistently "IP Filter"
|
| 1.28 | 30-Mar-2003 |
wiz | Miscellaneous fixes from Igor Sobrado, in PRs 20943-20959.
|
| 1.27 | 23-Oct-2002 |
jdolecek | don't bother creating /dev/io on archs which don't support it
|
| 1.26 | 21-Oct-2002 |
lukem | whitespace consistency cleanup
|
| 1.25 | 04-Oct-2002 |
elric | Include cgd on the list of things to be mknod(8)ed on all arches.
|
| 1.24 | 09-Aug-2002 |
lukem | - in local), only run $0.local if it is an existing file (prevents spurious warning for mfs /dev, amongst other things) - for mipsco, news68k, newsmips: ensure that "umask 77" is run after $0.local - for playstation2: add local) target, and use in all) (for consistency)
|
| 1.23 | 18-Jun-2002 |
wiz | Update comment on how to regenerate MAKEDEV(8) after changing the MAKEDEV script. Not that anybody acts on it, but it's nicer if it's correct.
|
| 1.22 | 17-Jun-2002 |
christos | Add device creation support for systrace.
|
| 1.21 | 18-Apr-2002 |
wiz | branches: 1.21.2; Remove /dev/pms0 creation from ports that do not have the driver; obsolete it on the ones that had it in the 'all' target.
|
| 1.20 | 12-Apr-2002 |
briggs | Remove devices from 'all' that we can't make.
|
| 1.19 | 16-Mar-2002 |
martin | Rename ISDN devices, per discussion on tech-kern. The network devices become ippp (ISDN ppp) and irip (ISDN raw IP). The character device now are called: /dev/isdn (isdnd <-> kernel communication), /dev/isdnctl (dialing and other control), /dev/isdntrc* (tracing), /dev/isdnbchan* (raw B channel access, i.e. for user land PPP) and /dev/isdntel* (telephone devices, i.e. for answering machines).
|
| 1.18 | 13-Mar-2002 |
simonb | Remove trailing semicolons from lines that don't need them. TABify many lines.
|
| 1.17 | 04-Mar-2002 |
lukem | various cleanups inspired by etc.i386/MAKEDEV:
* use "ln -fs foo bar" instead of "rm -f bar; ln -s foo bar"
* remove unnecessary chown root or chgrp wheel directives; older code here didn't bother doing this, so why be inconsistent
* when making directories, don't use -p and don't redirect stdout to /dev/null
* clean up whitespace
* wrap the main parser code in a function makedev(), and call makedev instead of "sh $0". (this is a bit faster)
* don't barf when we have fdesc mounted; just skip the devices fdesc provides
(these files should really be automagically generated...)
|
| 1.16 | 03-Mar-2002 |
toshii | Use a tab instead of 7 spaces.
|
| 1.15 | 26-Feb-2002 |
kleink | Bring pseudo terminal devices' major numbers in sync with reality again.
|
| 1.14 | 25-Feb-2002 |
atatat | Change a 62 to a 16, so that the proper number of slots is skipped. Fixes PR 15650.
|
| 1.13 | 02-Feb-2002 |
tls | Fix minor mistake made while increasing number of pty devices: where we had "pty0 pty1 pty2 pty3" before, for a total of 64 device nodes, we now want just "pty0" for a total of 62 -- the original commit had "pty0 pty1" for a total of 124, which ate too many inodes and made "ls /dev" a bit messy.
|
| 1.12 | 02-Feb-2002 |
tls | Add support for many more (930 or 992) ptys than the current 256.
Changes taken from the i386 MAKEDEV. Note that the unusual use of 'dd' to index an array was chosen because 'dd' is on all ports' install media.
This form of this change comes from Andrew Brown; the original idea to bump the number of ptys this way comes from Brian Marcotte at Panix.
|
| 1.11 | 19-Jan-2002 |
oster | Update the various MAKEDEV's to reflect the default of 8 RAIDframe devices.
|
| 1.10 | 13-Jan-2002 |
manu | Added clockctl
|
| 1.9 | 08-Jan-2002 |
lukem | fix a couple of spelling mistakes in the i4b* descriptions
|
| 1.8 | 19-Dec-2001 |
wiz | Standardize ch* and uk* descriptions.
|
| 1.7 | 19-Dec-2001 |
wiz | Standardize scsibus* description.
|
| 1.6 | 07-Dec-2001 |
briggs | 16 partitions
|
| 1.5 | 29-Oct-2001 |
augustss | Create wsmuxN and wsmuxctlN together. Use separate nodes for wsmouse and wskbd.
|
| 1.4 | 13-Oct-2001 |
augustss | Allow creation of wsmuxctl devices.
|
| 1.3 | 10-Sep-2001 |
augustss | Add an entry to make wsmux devices.
|
| 1.2 | 10-May-2001 |
lukem | remove all reference to ttyv* to pccons, since the kernels for these ports don't implement a character device at the referenced major number (12).
|
| 1.1 | 09-Feb-2001 |
briggs | Support files for the sandpoint
|
| 1.21.2.1 | 10-Aug-2002 |
lukem | Pull up revision 1.24 (requested by lukem): - in local), only run $0.local if it is an existing file (prevents spurious warning for mfs /dev, amongst other things) - for mipsco, news68k, newsmips: ensure that "umask 77" is run after $0.local - for playstation2: add local) target, and use in all) (for consistency)
|
| 1.17 | 07-Sep-2015 |
phx | Create /dev/flashN device nodes for all_md.
|
| 1.16 | 16-Aug-2012 |
abs | Add 'bpf' to all ramdisk targets (*), or floppy targets if ramdisk calls that. Sort bpf to come directly after 'std' where relevant. * (apart from etc.evbppc who's ramdisk target *only* builds md0, which just doesn't make sense). Should allow a fighting chance for dhcpcd to get an IP address.
|
| 1.15 | 21-Jun-2012 |
jdc | Add raid0 to init), in case we have /tmp on mfs.
|
| 1.14 | 06-Sep-2011 |
apb | branches: 1.14.2; Change foo*) case patterns to foo[0-9]*) in MD MAKEDEV.conf files, as was done earlier today for the MI MAKEDEV.tmpl. There are also a few instances of slightly different changes in the case patterns.
|
| 1.13 | 08-Jun-2011 |
phx | Also create device nodes for wd2 and wd3. Up to 4 disks in a NAS system are not unusual.
|
| 1.12 | 20-Mar-2011 |
phx | branches: 1.12.2; Added missing devices: usb, sysmon, altq
|
| 1.11 | 01-Mar-2011 |
phx | Revert the major number for satmgr(4) back to 100 and allocate it from majors.powerpc, as suggested by matt@.
|
| 1.10 | 26-Feb-2011 |
phx | Changed satmgr(4) device major number from 100 to 144, which is reserved for local/vendor use according to src/sys/conf/majors. This prevents problems when the shared PowerPC device majors list gets another entry.
|
| 1.9 | 30-May-2010 |
phx | Make /dev/satmgr (Sandpoint-MPC824x specific) and /dev/power devices.
|
| 1.8 | 26-May-2010 |
phx | Make sure tty00 and tty01 are linked to com(4). The default for the unified PPC devices was to set a hard link to ttyZ*, which uses the zstty(4) driver (not used on any Sandpoint board so far).
|
| 1.7 | 13-Sep-2008 |
tsutsui | Move "makedev cfs" for the vcoda device from MI MAKEDEV.tmpl to MD MAKEDEV.conf. Not all ports have vcoda in their majors.foo files and we shouldn't (re)assign major numbers on all ports before 5.0.
Should close PR port-sgimips/38962.
|
| 1.6 | 11-Dec-2007 |
nisimura | branches: 1.6.4; 1.6.8; 1.6.12; - more arrangement to have minimal devices for init) and ramdisk) cases. - make sure to have four tty[00-03] and assign 115200bps for the first.
|
| 1.5 | 25-Oct-2007 |
nisimura | - add minimalist init) clause for the case of empty /dev directory. - since no floppy drive is useful even with standard SP3 and EnCorePP1 configuration, floppy related descriptions will be removed in future. installation procedure needs to have renovations.
|
| 1.4 | 15-Jan-2007 |
hubertf | branches: 1.4.4; Fix MAKEDEV on shark: Move ses(4) devices from MI code (MAKEDEV.tmpl) to those platforms that actually have the driver.
See also: http://mail-index.netbsd.org/tech-userlevel/2007/01/08/0001.html
Fixes PR 26511 properly.
OK'd by wrstuden@
|
| 1.3 | 19-Oct-2003 |
jdolecek | branches: 1.3.16; determine the platform number of disk partitions by looking at MAXPARTITIONS/OLDMAXPARTITIONS in kernel sources, so that it wouldn't need to be specified separately in MAKEDEV.conf
change platform MAKEDEV.conf to contain only MD targets and nothing else; simplify the parsing in MAKEDEV.awk accordingly
|
| 1.2 | 19-Oct-2003 |
jdolecek | use target 'wscons' to create wscons-related devices; this creates also some additional control devices besides the terminal devices, which are needed for full operation
|
| 1.1 | 15-Oct-2003 |
jdolecek | MD part of unified MAKEDEV this contains information about disk partitions used by platform, and MD MAKEDEV targets, such as 'init', MD part of 'all', as well as any other MD-specific targets not covered by MAKEDEV.tmpl
|
| 1.3.16.1 | 18-Feb-2007 |
tron | Pull up following revision(s) (requested by hubertf in ticket #429): etc/etc.bebox/MAKEDEV.conf: revision 1.5 etc/etc.x68k/MAKEDEV.conf: revision 1.8 etc/etc.next68k/MAKEDEV.conf: revision 1.3 etc/etc.ofppc/MAKEDEV.conf: revision 1.5 etc/etc.hpcmips/MAKEDEV.conf: revision 1.4 etc/etc.amd64/MAKEDEV.conf: revision 1.8 etc/etc.algor/MAKEDEV.conf: revision 1.4 etc/etc.sparc64/MAKEDEV.conf: revision 1.12 etc/etc.hp300/MAKEDEV.conf: revision 1.11 etc/etc.sgimips/MAKEDEV.conf: revision 1.8 etc/etc.pc532/MAKEDEV.conf: revision 1.5 etc/etc.mvmeppc/MAKEDEV.conf: revision 1.6 etc/etc.mvme68k/MAKEDEV.conf: revision 1.6 etc/etc.pmppc/MAKEDEV.conf: revision 1.6 etc/etc.cobalt/MAKEDEV.conf: revision 1.4 etc/etc.evbmips/MAKEDEV.conf: revision 1.4 etc/etc.sparc/MAKEDEV.conf: revision 1.11 etc/etc.hpcarm/MAKEDEV.conf: revision 1.7 etc/etc.i386/MAKEDEV.conf: revision 1.12 etc/etc.acorn32/MAKEDEV.conf: revision 1.8 etc/etc.evbppc/MAKEDEV.conf: revision 1.5 etc/etc.amiga/MAKEDEV.conf: revision 1.10 etc/etc.prep/MAKEDEV.conf: revision 1.4 etc/etc.sandpoint/MAKEDEV.conf: revision 1.4 etc/MAKEDEV.tmpl: revision 1.71 etc/etc.alpha/MAKEDEV.conf: revision 1.7 etc/etc.ibmnws/MAKEDEV.conf: revision 1.6 etc/etc.macppc/MAKEDEV.conf: revision 1.7 etc/etc.mmeye/MAKEDEV.conf: revision 1.5 etc/etc.mac68k/MAKEDEV.conf: revision 1.7 etc/etc.vax/MAKEDEV.conf: revision 1.10 etc/etc.arc/MAKEDEV.conf: revision 1.6 etc/etc.hp700/MAKEDEV.conf: revision 1.4 etc/etc.mipsco/MAKEDEV.conf: revision 1.3 etc/etc.atari/MAKEDEV.conf: revision 1.7 Fix MAKEDEV on shark: Move ses(4) devices from MI code (MAKEDEV.tmpl) to those platforms that actually have the driver. See also: http://mail-index.netbsd.org/tech-userlevel/2007/01/08/0001.html Fixes PR 26511 properly. OK'd by wrstuden@
|
| 1.4.4.2 | 09-Jan-2008 |
matt | sync with HEAD
|
| 1.4.4.1 | 06-Nov-2007 |
matt | sync with HEAD
|
| 1.6.12.1 | 24-Sep-2008 |
wrstuden | Merge in changes between wrstuden-revivesa-base-2 and wrstuden-revivesa-base-3.
|
| 1.6.8.1 | 05-Oct-2008 |
mjf | Sync with HEAD.
|
| 1.6.4.2 | 11-Dec-2007 |
nisimura | - more arrangement to have minimal devices for init) and ramdisk) cases. - make sure to have four tty[00-03] and assign 115200bps for the first.
|
| 1.6.4.1 | 11-Dec-2007 |
nisimura | file MAKEDEV.conf was added on branch mjf-devfs on 2007-12-11 05:05:17 +0000
|
| 1.12.2.1 | 23-Jun-2011 |
cherry | Catchup with rmind-uvmplock merge.
|
| 1.14.2.1 | 30-Oct-2012 |
yamt | sync with head
|
| 1.13 | 09-Jun-2010 |
phx | The sandpoint port is now focussed on 824x based NAS boxes. Replaced GENERIC by GENERIC.NAS. Added INSTALL_KURO for KuroBox. GENERIC.NAS and RAMDISK are no longer needed.
|
| 1.12 | 17-May-2010 |
phx | Excluded KUROBOX from GENERIC.NAS because console is on a different port. Add INET6 option to GENERIC(.NAS). Build KUROBOX kernel together with GENERIC and GENERIC.NAS. Patch submitted by Toru Nishimura.
|
| 1.11 | 24-Aug-2009 |
nisimura | - add GENERIC.NAS to a standard sandpoint distribution.
|
| 1.10 | 22-Oct-2007 |
nisimura | dismiss GENERIC.X2 kernel to build as the conf file has gone.
|
| 1.9 | 24-Jul-2007 |
pavel | branches: 1.9.4; 1.9.6; Add a comment reminding to update the release notes if the list of kernels change.
|
| 1.8 | 02-Dec-2002 |
lukem | - add snap_post, which makes "clean depend all release" in ../distrib/ for all platforms. - remove now unnecessary replicated code in the various snap_md_post targets - remove snap_md_pre; nothing uses it any more - use ${NETBSDSRCDIR} and ${KERNSRCDIR} as appropriate
|
| 1.7 | 16-May-2002 |
briggs | Make GENERIC.X2 as well as GENERIC, and include the srec versions.
|
| 1.6 | 02-May-2002 |
lukem | - consistency cleanup - ensure INSTALLATION_DIRS contains the appropriate extra directories for a given platform
|
| 1.5 | 17-Dec-2001 |
briggs | Supply a snap_md_post for sandpoint.
|
| 1.4 | 07-Dec-2001 |
briggs | Add INSTALL as a BUILD_KERNEL.
|
| 1.3 | 29-Nov-2001 |
thorpej | Change the way kernel sets are specified, and make them more consistent. To quote the comment in etc/Makefile that describes how it's done:
# This target builds the kernels specified by each port. A port may # specify the following kernels: # # KERNEL_SETS The list of kernels that will be # packaged into sets, named # kern-${kernel}.tgz. These kernels # are also placed in the binary/kernels # area of the release package as # netbsd-${kernel}.gz. # # EXTRA_KERNELS Additional kernels to place in the # binary/kernels area of the release # package as netbsd-${kernel}.gz, but # which are not placed into sets. This # allows a port to provide e.g. a netbootable # installation kernel containing a ramdisk. # # BUILD_KERNELS Additional kernels to build which are # not placed into sets nor into the # binary/kernels area of the release # package. These are typically kernels # that are built for inclusion only in # installation disk/CD-ROM/tape images. #
|
| 1.2 | 12-Mar-2001 |
wiz | Reflect correct architecture in comment.
|
| 1.1 | 09-Feb-2001 |
briggs | Support files for the sandpoint
|
| 1.9.6.2 | 24-Jul-2007 |
pavel | Add a comment reminding to update the release notes if the list of kernels change.
|
| 1.9.6.1 | 24-Jul-2007 |
pavel | file Makefile.inc was added on branch matt-mips64 on 2007-07-24 10:49:28 +0000
|
| 1.9.4.1 | 06-Nov-2007 |
matt | sync with HEAD
|
| 1.5 | 19-Dec-2002 |
jdolecek | use single minimal default disktab file for most archs, replacing MD disktab where possible (everything but vax) the MD disktab was often either empty, or contained entries even for disks which support geometry autodetection (SCSI), and/or non-interesting/long obsolete entries
the old records are still available in example disktab in /usr/share/examples/disktab/disktab in case anyone would need them
|
| 1.4 | 09-Apr-2002 |
tron | Back out last change because we now have a special disktab for the FFS regression test.
|
| 1.3 | 09-Apr-2002 |
tron | Add missing "floppy288" entry required for FFS regression test.
|
| 1.2 | 07-Dec-2001 |
briggs | Add a floppyinstfs
|
| 1.1 | 09-Feb-2001 |
briggs | Support files for the sandpoint
|
| 1.2 | 04-May-2002 |
jdolecek | Move the sample fstab files to /usr/share/examples/fstab/. Duplicates or very similar configs removed.
|
| 1.1 | 07-Jun-2001 |
briggs | Add template fstabs for NFS and scsi disk.
|
| 1.2 | 04-May-2002 |
jdolecek | Move the sample fstab files to /usr/share/examples/fstab/. Duplicates or very similar configs removed.
|
| 1.1 | 07-Jun-2001 |
briggs | Add template fstabs for NFS and scsi disk.
|
| 1.3 | 04-May-2002 |
jdolecek | Move the sample fstab files to /usr/share/examples/fstab/. Duplicates or very similar configs removed.
|
| 1.2 | 26-Nov-2001 |
lukem | fix mfs examples
|
| 1.1 | 09-Feb-2001 |
briggs | Support files for the sandpoint
|
| 1.8 | 25-Sep-2019 |
abs | Switch default console tty from /dev/console to /dev/constty
With this switch processes (such as xconsole) can open /dev/console without breaking login on the text or serial console. This can be trivially triggered by enabling xdm in rc.conf and hitting Ctrl+Alt+F1 or equivalent once booted.
The changes: - Add entry for /dev/console or /dev/constty if missing - If a port's had /dev/console 'on' switch it off and enable /dev/constty - If a port did not have /dev/console 'on', leave /dev/constty off
Some ports had /dev/console off and /dev/ttyE0 enabled, presumably to avoid just this issue. It may make sense to adjust these also (but not in this pass)
As discussed on current-users
|
| 1.7 | 13-Jun-2010 |
phx | branches: 1.7.48; 1.7.50; Adapted for NAS systems. Use vt100 with 115200bps instead of Pc3 console.
|
| 1.6 | 07-Oct-2008 |
abs | Add a constty entry, marked 'off', with otherwise the same settings as the console. Now when coming up in single user mode the tset in /.profile can set the terminal type correctly. Note: I believe constty should be 'on' and console 'off', but thats a separate discussion
|
| 1.5 | 11-Dec-2007 |
nisimura | branches: 1.5.4; 1.5.8; - more arrangement to have minimal devices for init) and ramdisk) cases. - make sure to have four tty[00-03] and assign 115200bps for the first.
|
| 1.4 | 20-Jun-2004 |
christos | branches: 1.4.16; remove ad-hok list of pty's from port tty files, and auto-generate it so that it is consistent, and in the proper order.
|
| 1.3 | 04-Oct-2003 |
dsl | Revert 'console' back to /dev/console (from /dev/constty)
|
| 1.2 | 03-Oct-2003 |
dsl | Change 'console' login to use /dev/constty so that its output isn't stolen by code that requests system messages using TIOCCONS.
|
| 1.1 | 09-Feb-2001 |
briggs | Support files for the sandpoint
|
| 1.4.16.1 | 09-Jan-2008 |
matt | sync with HEAD
|
| 1.5.8.1 | 17-Jan-2009 |
mjf | Sync with HEAD.
|
| 1.5.4.2 | 11-Dec-2007 |
nisimura | - more arrangement to have minimal devices for init) and ramdisk) cases. - make sure to have four tty[00-03] and assign 115200bps for the first.
|
| 1.5.4.1 | 11-Dec-2007 |
nisimura | file ttys was added on branch mjf-devfs on 2007-12-11 05:05:17 +0000
|
| 1.7.50.1 | 28-Oct-2019 |
martin | Pull up following revision(s) (requested by abs in ticket #384):
etc/etc.evbmips/ttys: revision 1.7 etc/etc.sparc64/ttys: revision 1.12 etc/etc.shark/ttys: revision 1.9 etc/etc.amiga/ttys: revision 1.25 etc/etc.arc/ttys: revision 1.9 etc/etc.sbmips/ttys: revision 1.6 etc/etc.landisk/ttys: revision 1.4 etc/etc.alpha/ttys: revision 1.13 etc/etc.amigappc/ttys: revision 1.4 etc/etc.mmeye/ttys: revision 1.8 etc/etc.ia64/ttys: revision 1.2 etc/etc.sandpoint/ttys: revision 1.8 etc/etc.hp300/ttys: revision 1.17 etc/etc.riscv/ttys: revision 1.2 etc/etc.i386/ttys: revision 1.21 etc/etc.aarch64/ttys: revision 1.2 etc/etc.algor/ttys: revision 1.6 etc/etc.sparc/ttys: revision 1.17 etc/etc.mipsco/ttys: revision 1.7 etc/etc.luna68k/ttys: revision 1.9 etc/etc.iyonix/ttys: revision 1.5 etc/etc.evbcf/ttys: revision 1.3 etc/etc.netwinder/ttys: revision 1.9 etc/etc.mvme68k/ttys: revision 1.10 etc/etc.evbarm/ttys: revision 1.8 etc/etc.evbsh3/ttys: revision 1.7 etc/etc.pmax/ttys: revision 1.16 etc/etc.hpcmips/ttys: revision 1.12 etc/etc.vax/ttys: revision 1.10 etc/etc.news68k/ttys: revision 1.10 etc/etc.mvmeppc/ttys: revision 1.7 etc/etc.hppa/ttys: revision 1.2 etc/etc.next68k/ttys: revision 1.11 etc/etc.ews4800mips/ttys: revision 1.3 etc/etc.epoc32/ttys: revision 1.2 etc/etc.emips/ttys: revision 1.2 etc/etc.evbppc/ttys: revision 1.7 etc/etc.sgimips/ttys: revision 1.11 etc/etc.or1k/ttys: revision 1.2 etc/etc.cesfic/ttys: revision 1.6 etc/etc.amd64/ttys: revision 1.7 etc/etc.playstation2/ttys: revision 1.7 etc/etc.zaurus/ttys: revision 1.4 etc/etc.newsmips/ttys: revision 1.10
Switch default console tty from /dev/console to /dev/constty
With this switch processes (such as xconsole) can open /dev/console without breaking login on the text or serial console. This can be trivially triggered by enabling xdm in rc.conf and hitting Ctrl+Alt+F1 or equivalent once booted.
The changes: - Add entry for /dev/console or /dev/constty if missing - If a port's had /dev/console 'on' switch it off and enable /dev/constty - If a port did not have /dev/console 'on', leave /dev/constty off
Some ports had /dev/console off and /dev/ttyE0 enabled, presumably to avoid just this issue. It may make sense to adjust these also (but not in this pass)
As discussed on current-users
|
| 1.7.48.1 | 13-Apr-2020 |
martin | Mostly merge changes from HEAD upto 20200411
|