Re: arm (bsp=xilinx_zynq_a9_qemu ) task in 'testsuites/fstests/fsdosfsname01.exe' failed
Hello Heinz, On 19/03/2022 16:54, Heinz Junkes wrote: Waf: Leaving directory `/home/rtems/ARM_TST/kernel/build/arm/xilinx_zynq_a9_qemu' Build failed -> task in 'testsuites/fstests/fsdosfsname01.exe' failed with exit status 1 (run with -v to display more information) [1714/4241] Linking build/arm/xilinx_zynq_a9_qemu/testsuites/fstests/mimfs_fspermission.exe [1715/4241] Linking build/arm/xilinx_zynq_a9_qemu/testsuites/fstests/mdosfs_fsrdwr.exe /home/rtems/ARM_WORK/rtems/6/lib/gcc/arm-rtems6/10.3.1/../../../../arm-rtems6/bin/ld: /home/rtems/ARM_WORK/rtems/6/lib/gcc/arm-rtems6/10.3.1/../../../../arm-rtems6/lib/thumb/armv7-a+simd/hard/libc.a(libc_a-ucsconv.o): in function `ucs_based_conversion_open': this should be fixed in the latest RSB. The update of the Newlib build system should be complete now. -- embedded brains GmbH Herr Sebastian HUBER Dornierstr. 4 82178 Puchheim Germany email: sebastian.hu...@embedded-brains.de phone: +49-89-18 94 741 - 16 fax: +49-89-18 94 741 - 08 Registergericht: Amtsgericht München Registernummer: HRB 157899 Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler Unsere Datenschutzerklärung finden Sie hier: https://embedded-brains.de/datenschutzerklaerung/ ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
[PATCH 3/3] Update Eric Norum contact info and start to normalize file headers
--- bsps/arm/csb337/umon/tfsDriver.c | 8 +++-- bsps/m68k/gen68360/README | 9 +- bsps/m68k/gen68360/btimer/btimer.c| 30 +++ bsps/m68k/gen68360/clock/clock.c | 10 +++ bsps/m68k/gen68360/console/console.c | 17 --- bsps/m68k/gen68360/include/bsp.h | 23 -- bsps/m68k/gen68360/start/alloc360.c | 10 +++ bsps/m68k/gen68360/start/init68360.c | 6 +--- bsps/m68k/gen68360/start/start.S | 25 +++- bsps/m68k/mcf5206elite/start/gdbinit | 4 +-- bsps/m68k/mcf52235/btimer/btimer.c| 16 +- bsps/m68k/mcf5225x/btimer/btimer.c| 16 +- bsps/m68k/mcf5329/btimer/btimer.c | 16 +- bsps/m68k/shared/fpsp/README | 2 +- bsps/m68k/shared/fpsp/rtems_skel.S| 2 +- bsps/m68k/uC5282/btimer/btimer.c | 16 +- bsps/m68k/uC5282/clock/clock.c| 16 +- bsps/m68k/uC5282/console/console.c| 17 ++- bsps/m68k/uC5282/include/bsp.h| 14 - bsps/m68k/uC5282/include/tm27.h | 12 bsps/m68k/uC5282/start/bspclean.c | 16 +- bsps/m68k/uC5282/start/bspstart.c | 12 bsps/m68k/uC5282/start/init5282.c | 12 bsps/m68k/uC5282/start/linkcmds | 16 +- bsps/powerpc/gen5200/console/console.c| 3 +- bsps/powerpc/include/mpc5xx.h | 9 +- bsps/powerpc/include/mpc8260.h| 9 +- bsps/powerpc/include/mpc8xx.h | 9 +- bsps/powerpc/mpc8260ads/dev/console-generic.c | 6 +--- bsps/powerpc/mpc8260ads/start/brg.c | 6 +--- bsps/powerpc/mpc8260ads/start/cp.c| 2 +- bsps/powerpc/mpc8260ads/start/dpram.c | 2 +- bsps/powerpc/ss555/dev/console-generic.c | 6 +--- bsps/powerpc/ss555/start/start.S | 2 +- bsps/powerpc/tqm8xx/console/console.c | 23 ++ bsps/powerpc/tqm8xx/start/cp.c| 2 +- bsps/powerpc/tqm8xx/start/dpram.c | 2 +- 37 files changed, 170 insertions(+), 236 deletions(-) diff --git a/bsps/arm/csb337/umon/tfsDriver.c b/bsps/arm/csb337/umon/tfsDriver.c index caf3a4bd0d..8481c07daf 100644 --- a/bsps/arm/csb337/umon/tfsDriver.c +++ b/bsps/arm/csb337/umon/tfsDriver.c @@ -1,6 +1,10 @@ -/* - * tfsDriver.c - MicroMonitor TFS Hookup to RTEMS FS +/** + * @file * + * @brief MicroMonitor TFS Hookup to RTEMS FS + */ + +/* * Initial release: Oct 1, 2004 by Ed Sutter * * Modifications to support reference counting in the file system are diff --git a/bsps/m68k/gen68360/README b/bsps/m68k/gen68360/README index 0c595deb77..eec7d1554f 100644 --- a/bsps/m68k/gen68360/README +++ b/bsps/m68k/gen68360/README @@ -3,14 +3,7 @@ # # -# Please send any comments, improvements, or bug reports to: -# W. Eric Norum -# Deparment of Electrical Engineering -# 53 Campus Driver -# University of Saskatchewan -# Saskatoon, Saskatchewan, CANADA -# S7N 5A9 -# eric.no...@usask.ca +# Copyright (c) 1996 Eric Norum # # diff --git a/bsps/m68k/gen68360/btimer/btimer.c b/bsps/m68k/gen68360/btimer/btimer.c index 40a3e0a4c1..db9d9b4ef4 100644 --- a/bsps/m68k/gen68360/btimer/btimer.c +++ b/bsps/m68k/gen68360/btimer/btimer.c @@ -2,31 +2,23 @@ * Use TIMER 1 and TIMER 2 for Timing Test Suite * The hardware on the MC68360 makes these routines very simple. * - * Based on the `gen68302' board support package, and covered by the - * original distribution terms. + * NOTE: It is important that the timer start/stop overhead be + *determined when porting or modifying this code. * - * W. Eric Norum - * Saskatchewan Accelerator Laboratory - * University of Saskatchewan - * Saskatoon, Saskatchewan, CANADA - * e...@skatter.usask.ca */ /* + * Based on the `gen68302' board support package, and covered by the + * original distribution terms. * - * Input parameters: NONE - * - * Output parameters: NONE - * - * NOTE: It is important that the timer start/stop overhead be - *determined when porting or modifying this code. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). + * Copyright (c) 1996 Eric Norum + * + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. */ #include diff --git a/bsps/m68k/gen68360/clock/clock.c b/bsps/m68k/gen68360/clock/clock.c index 4bd3204fcb..966b20dae4 100644 ---
[PATCH 2/3] testsuites/: Update Eric Norum contact info and normalize file headers
--- testsuites/libtests/termios/README | 5 + testsuites/libtests/termios/init.c | 16 +--- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/testsuites/libtests/termios/README b/testsuites/libtests/termios/README index 2b8fcab856..7ff007c778 100644 --- a/testsuites/libtests/termios/README +++ b/testsuites/libtests/termios/README @@ -82,10 +82,7 @@ Clear??? --- Eric Norum -e...@skatter.usask.ca -Saskatchewan Accelerator Laboratory -University of Saskatchewan -Saskatoon, Canada. +e...@norum.ca Charles-Antoine Gauthier Software Engineering Group diff --git a/testsuites/libtests/termios/init.c b/testsuites/libtests/termios/init.c index 558f095449..81ca5b75e6 100644 --- a/testsuites/libtests/termios/init.c +++ b/testsuites/libtests/termios/init.c @@ -1,19 +1,13 @@ /* * RTEMS configuration/initialization - * + */ + +/* * This program may be distributed and used for any purpose. - * I ask only that you: - * 1. Leave this author information intact. - * 2. Document any changes you make. * - * W. Eric Norum - * Saskatchewan Accelerator Laboratory - * University of Saskatchewan - * Saskatoon, Saskatchewan, CANADA - * e...@skatter.usask.ca + * Copyright (c) 1997 Eric Norum * - * Additions: - * Charles-Antoine Gauthier + * Copyright (c) 2000 Charles-Antoine Gauthier * Software Engineering Group * Institute for Information Technology * National Research Council of Canada -- 2.24.4 ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
[PATCH 1/3] cpukit/: Update Eric Norum contact info and normalize file headers
--- cpukit/include/rtems/tftp.h | 35 +++--- cpukit/libcsupport/src/getgrent.c | 2 +- cpukit/libcsupport/src/getgrnam.c | 2 +- cpukit/libcsupport/src/getpwent.c | 2 +- cpukit/libcsupport/src/pwdgrp.c | 2 +- cpukit/libcsupport/src/termios.c | 13 ++ cpukit/libcsupport/src/termiosinitialize.c| 13 ++ cpukit/libfs/src/ftpfs/tftpDriver.c | 2 +- .../cpu/m68k/include/rtems/m68k/m68360.h | 46 ++- 9 files changed, 66 insertions(+), 51 deletions(-) diff --git a/cpukit/include/rtems/tftp.h b/cpukit/include/rtems/tftp.h index ed3ebd7865..8fa516042b 100644 --- a/cpukit/include/rtems/tftp.h +++ b/cpukit/include/rtems/tftp.h @@ -1,13 +1,34 @@ -/* - * Trivial File Transfer Protocol (TFTP) +/** + * @file + * + * @brief * Trivial File Transfer Protocol (TFTP) * * Transfer file to/from remote host + */ + +/* + * Copyright (c) 1998 Eric Norum + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. * - * W. Eric Norum - * Saskatchewan Accelerator Laboratory - * University of Saskatchewan - * Saskatoon, Saskatchewan, CANADA - * e...@skatter.usask.ca + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ /* diff --git a/cpukit/libcsupport/src/getgrent.c b/cpukit/libcsupport/src/getgrent.c index d4d3705115..e52724edf3 100644 --- a/cpukit/libcsupport/src/getgrent.c +++ b/cpukit/libcsupport/src/getgrent.c @@ -9,7 +9,7 @@ * Copyright (c) 1999-2009 Ralf Corsepius * Copyright (c) 1999-2013 Joel Sherrill * Copyright (c) 2000-2001 Fernando Ruiz Casas - * Copyright (c) 2002 Eric Norum + * Copyright (c) 2002 Eric Norum * Copyright (c) 2003 Till Straumann * Copyright (c) 2012 Alex Ivanov * diff --git a/cpukit/libcsupport/src/getgrnam.c b/cpukit/libcsupport/src/getgrnam.c index 71c613499a..6ab7fe5d31 100644 --- a/cpukit/libcsupport/src/getgrnam.c +++ b/cpukit/libcsupport/src/getgrnam.c @@ -9,7 +9,7 @@ * Copyright (c) 1999-2009 Ralf Corsepius * Copyright (c) 1999-2013 Joel Sherrill * Copyright (c) 2000-2001 Fernando Ruiz Casas - * Copyright (c) 2002 Eric Norum + * Copyright (c) 2002 Eric Norum * Copyright (c) 2003 Till Straumann * Copyright (c) 2012 Alex Ivanov * diff --git a/cpukit/libcsupport/src/getpwent.c b/cpukit/libcsupport/src/getpwent.c index 400a53e5f3..ce2b5a59da 100644 --- a/cpukit/libcsupport/src/getpwent.c +++ b/cpukit/libcsupport/src/getpwent.c @@ -9,7 +9,7 @@ * Copyright (c) 1999-2009 Ralf Corsepius * Copyright (c) 1999-2013 Joel Sherrill * Copyright (c) 2000-2001 Fernando Ruiz Casas - * Copyright (c) 2002 Eric Norum + * Copyright (c) 2002 Eric Norum * Copyright (c) 2003 Till Straumann * Copyright (c) 2012 Alex Ivanov * diff --git a/cpukit/libcsupport/src/pwdgrp.c b/cpukit/libcsupport/src/pwdgrp.c index d686829e05..258978a0ac 100644 --- a/cpukit/libcsupport/src/pwdgrp.c +++ b/cpukit/libcsupport/src/pwdgrp.c @@ -9,7 +9,7 @@ * Copyright (c) 1999-2009 Ralf Corsepius * Copyright (c) 1999-2013 Joel Sherrill * Copyright (c) 2000-2001 Fernando Ruiz Casas - * Copyright (c) 2002 Eric Norum + * Copyright (c) 2002 Eric Norum * Copyright (c) 2003 Till Straumann * Copyright (c) 2012 Alex Ivanov * diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c index 4a4a7e77ac..fe006219dd 100644 --- a/cpukit/libcsupport/src/termios.c +++ b/cpukit/libcsupport/src/termios.c @@ -4,16 +4,11 @@ */ /* - * Author: - *W. Eric Norum - *Saskatchewan Accelerator Laboratory - *University of Saskatchewan - *Saskatoon, Saskatchewan, CANADA - *e...@skatter.usask.ca + * Copyright (c) 1997 Eric Norum * - * The license and distribution terms for this file may be
[PATCH 0/3] Update Eric Norum Contact Info
Hi, In doing the previous rounds of changes, I noticed that Eric Norum also had a full address (old) and multiple out of date email addresses. With his permission, I have made a sweep at updating this info and a bit of file header normalization. Disclaimers: (1) I discovered that COPYRIGHT and Copyright are used indiscimimately. (2) There are BSP files in the list without license terms. I can only assume they are under the old license but did not address that. (3) I formatted most of thes with 1 space on the comments. --joel Joel Sherrill (3): cpukit/: Update Eric Norum contact info and normalize file headers testsuites/: Update Eric Norum contact info and normalize file headers Update Eric Norum contact info and start to normalize file headers bsps/arm/csb337/umon/tfsDriver.c | 8 +++- bsps/m68k/gen68360/README | 9 +--- bsps/m68k/gen68360/btimer/btimer.c| 30 +--- bsps/m68k/gen68360/clock/clock.c | 10 ++-- bsps/m68k/gen68360/console/console.c | 17 +++ bsps/m68k/gen68360/include/bsp.h | 23 +++--- bsps/m68k/gen68360/start/alloc360.c | 10 ++-- bsps/m68k/gen68360/start/init68360.c | 6 +-- bsps/m68k/gen68360/start/start.S | 25 -- bsps/m68k/mcf5206elite/start/gdbinit | 4 +- bsps/m68k/mcf52235/btimer/btimer.c| 16 --- bsps/m68k/mcf5225x/btimer/btimer.c| 16 --- bsps/m68k/mcf5329/btimer/btimer.c | 16 --- bsps/m68k/shared/fpsp/README | 2 +- bsps/m68k/shared/fpsp/rtems_skel.S| 2 +- bsps/m68k/uC5282/btimer/btimer.c | 16 --- bsps/m68k/uC5282/clock/clock.c| 16 --- bsps/m68k/uC5282/console/console.c| 17 +++ bsps/m68k/uC5282/include/bsp.h| 14 +++--- bsps/m68k/uC5282/include/tm27.h | 12 ++--- bsps/m68k/uC5282/start/bspclean.c | 16 --- bsps/m68k/uC5282/start/bspstart.c | 12 ++--- bsps/m68k/uC5282/start/init5282.c | 12 ++--- bsps/m68k/uC5282/start/linkcmds | 16 --- bsps/powerpc/gen5200/console/console.c| 3 +- bsps/powerpc/include/mpc5xx.h | 9 +--- bsps/powerpc/include/mpc8260.h| 9 +--- bsps/powerpc/include/mpc8xx.h | 9 +--- bsps/powerpc/mpc8260ads/dev/console-generic.c | 6 +-- bsps/powerpc/mpc8260ads/start/brg.c | 6 +-- bsps/powerpc/mpc8260ads/start/cp.c| 2 +- bsps/powerpc/mpc8260ads/start/dpram.c | 2 +- bsps/powerpc/ss555/dev/console-generic.c | 6 +-- bsps/powerpc/ss555/start/start.S | 2 +- bsps/powerpc/tqm8xx/console/console.c | 23 -- bsps/powerpc/tqm8xx/start/cp.c| 2 +- bsps/powerpc/tqm8xx/start/dpram.c | 2 +- cpukit/include/rtems/tftp.h | 35 +++--- cpukit/libcsupport/src/getgrent.c | 2 +- cpukit/libcsupport/src/getgrnam.c | 2 +- cpukit/libcsupport/src/getpwent.c | 2 +- cpukit/libcsupport/src/pwdgrp.c | 2 +- cpukit/libcsupport/src/termios.c | 13 ++ cpukit/libcsupport/src/termiosinitialize.c| 13 ++ cpukit/libfs/src/ftpfs/tftpDriver.c | 2 +- .../cpu/m68k/include/rtems/m68k/m68360.h | 46 ++- testsuites/libtests/termios/README| 5 +- testsuites/libtests/termios/init.c| 16 ++- 48 files changed, 242 insertions(+), 302 deletions(-) -- 2.24.4 ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH 01/26] cpukit/libdl/rtl-alloc-check.py: Change to BSD-2 by hand
On Tue, Mar 22, 2022 at 2:36 AM Christian MAUDERER < christian.maude...@embedded-brains.de> wrote: > Shouldn't there be a SPDX-line added to this file? > Yep. I went back and reviewed all the manual edits and ensured also had SPDX notation. Another example where a pass after all this is over with scripts and regular expressions to verify things will be good. Thanks. > > Am 18.03.22 um 17:21 schrieb Joel Sherrill: > > Updates #3053. > > --- > > cpukit/libdl/rtl-alloc-check.py | 30 +++--- > > 1 file changed, 23 insertions(+), 7 deletions(-) > > > > diff --git a/cpukit/libdl/rtl-alloc-check.py > b/cpukit/libdl/rtl-alloc-check.py > > index c2145a768e..3d6b024442 100644 > > --- a/cpukit/libdl/rtl-alloc-check.py > > +++ b/cpukit/libdl/rtl-alloc-check.py > > @@ -1,11 +1,4 @@ > > # > > -# Copyright (c) 2019 Chris Johns . > > -# All rights reserved. > > -# > > -# The license and distribution terms for this file may be > > -# found in the file LICENSE in this distribution or at > > -# http://www.rtems.org/license/LICENSE. > > -# > > # Check the allocations for libdl: > > # > > # 1. Turn on the allocation trace. > > @@ -13,7 +6,30 @@ > > # 2. Load and unload object files. > > # > > # 3. Capture the trace output and feed to this tool > > + > > +# Copyright (c) 2019 Chris Johns . > > +# All rights reserved. > > +# > > +# Redistribution and use in source and binary forms, with or without > > +# modification, are permitted provided that the following conditions > > +# are met: > > +# 1. Redistributions of source code must retain the above copyright > > +#notice, this list of conditions and the following disclaimer. > > +# 2. Redistributions in binary form must reproduce the above copyright > > +#notice, this list of conditions and the following disclaimer in the > > +#documentation and/or other materials provided with the > distribution. > > # > > +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > "AS IS" > > +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, > THE > > +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > PURPOSE > > +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS > BE > > +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > > +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > > +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > BUSINESS > > +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER > IN > > +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR > OTHERWISE) > > +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > OF THE > > +# POSSIBILITY OF SUCH DAMAGE. > > > > from __future__ import print_function > > > > -- > > embedded brains GmbH > Herr Christian MAUDERER > Dornierstr. 4 > 82178 Puchheim > Germany > email: christian.maude...@embedded-brains.de > phone: +49-89-18 94 741 - 18 > fax: +49-89-18 94 741 - 08 > > Registergericht: Amtsgericht München > Registernummer: HRB 157899 > Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler > Unsere Datenschutzerklärung finden Sie hier: > https://embedded-brains.de/datenschutzerklaerung/ > ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH 07/26] cpukit/libds/src/ftpfs/tftpDriver.c: Manually update license to BSD-2
On Tue, Mar 22, 2022 at 2:43 AM Christian MAUDERER < christian.maude...@embedded-brains.de> wrote: > Am 18.03.22 um 17:21 schrieb Joel Sherrill: > > Eric Norum granted permission plus git log archeology to get year for > > his copyright. > > > > Updates #3053. > > --- > > cpukit/libfs/src/ftpfs/tftpDriver.c | 38 +++-- > > 1 file changed, 30 insertions(+), 8 deletions(-) > > > > diff --git a/cpukit/libfs/src/ftpfs/tftpDriver.c > b/cpukit/libfs/src/ftpfs/tftpDriver.c > > index bc0e74ad86..ef8dc33351 100644 > > --- a/cpukit/libfs/src/ftpfs/tftpDriver.c > > +++ b/cpukit/libfs/src/ftpfs/tftpDriver.c > > @@ -1,17 +1,39 @@ > > -/* > > - * Trivial File Transfer Protocol (RFC 1350) > > +/* SPDX-License-Identifier: BSD-2-Clause */ > > + > > +/** > > + * @file > >* > > - * Transfer file to/from remote host > > + * Trivial File Transfer Protocol file system (TFTP client) for RFC > 1350. > >* > > - * W. Eric Norum > > - * Saskatchewan Accelerator Laboratory > > - * University of Saskatchewan > > - * Saskatoon, Saskatchewan, CANADA > > - * e...@skatter.usask.ca > > + * Transfer file to/from remote host > > + */ > > + > > +/* > > + * Copyright 1998 W. Eric Norum > > Not entirely sure but in later copyright lines, Eric Norum added his > mail address. For example 2002: > > https://git.rtems.org/rtems/tree/cpukit/libcsupport/src/getgrent.c > > Shouldn't we prefer that form here too? > Fixed that here. He also is not at that email address any longer. I need to make a sweep to remove his address from the files. I'll add that to my list as well as asking him if that should be a current email address. But at least this matches the one you cited which would have been right when he submitted this code. > > >* > >* Modifications to support reference counting in the file system are > >* Copyright (c) 2012 embedded brains GmbH. > >* > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are met: > > + * 1. Redistributions of source code must retain the above copyright > > + *notice, this list of conditions and the following disclaimer. > > + * 2. Redistributions in binary form must reproduce the above copyright > > + *notice, this list of conditions and the following disclaimer in > the > > + *documentation and/or other materials provided with the > distribution. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > "AS IS" > > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED > TO, THE > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > PURPOSE > > + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR > CONTRIBUTORS BE > > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > > + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > BUSINESS > > + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER > IN > > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR > OTHERWISE) > > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > OF THE > > + * POSSIBILITY OF SUCH DAMAGE. > >*/ > > > > #ifdef HAVE_CONFIG_H > > -- > > embedded brains GmbH > Herr Christian MAUDERER > Dornierstr. 4 > 82178 Puchheim > Germany > email: christian.maude...@embedded-brains.de > phone: +49-89-18 94 741 - 18 > fax: +49-89-18 94 741 - 08 > > Registergericht: Amtsgericht München > Registernummer: HRB 157899 > Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler > Unsere Datenschutzerklärung finden Sie hier: > https://embedded-brains.de/datenschutzerklaerung/ > ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH 14/26] cpukit/libmisc/capture: Manually change license to BSD-2
On Tue, Mar 22, 2022 at 2:49 AM Christian MAUDERER < christian.maude...@embedded-brains.de> wrote: > Am 18.03.22 um 17:21 schrieb Joel Sherrill: > > These files did not follow the standard format and needed to be > > changed manually. > > > > Updates #3053. > > --- > > cpukit/libmisc/capture/README | 4 +- > > cpukit/libmisc/capture/capture-cli.c | 57 --- > > cpukit/libmisc/capture/capture.c | 55 +++--- > > cpukit/libmisc/capture/capture_buffer.c | 49 ++-- > > cpukit/libmisc/capture/capture_buffer.h | 42 +- > > cpukit/libmisc/capture/capture_support.c | 57 --- > > .../libmisc/capture/capture_user_extension.c | 51 +++-- > > 7 files changed, 200 insertions(+), 115 deletions(-) > > > > diff --git a/cpukit/libmisc/capture/README > b/cpukit/libmisc/capture/README > > index 3e59637149..806bb37d1f 100644 > > --- a/cpukit/libmisc/capture/README > > +++ b/cpukit/libmisc/capture/README > > @@ -1,7 +1,7 @@ > > RTEMS Performance Monitoring and Measurement Framework > > > > - Copyright 2002-2007 Chris Johns ( > chr...@rtems.org) > > - 23 > April 2002 > > + Copyright 2002-2007 Chris Johns (chr...@rtems.org) > > + 23 April 2002 > > > > This directory contains the source code for the performance monitoring > and > > measurement framework. It is more commonly know as the capture engine. > > diff --git a/cpukit/libmisc/capture/capture-cli.c > b/cpukit/libmisc/capture/capture-cli.c > > index d489d9f32a..d8afc982a1 100644 > > --- a/cpukit/libmisc/capture/capture-cli.c > > +++ b/cpukit/libmisc/capture/capture-cli.c > > @@ -1,25 +1,40 @@ > > -/* > > - > > > - > > - Copyright 2002, 2015 Chris Johns > > - All rights reserved. > > - > > - COPYRIGHT (c) 2014. > > - On-Line Applications Research Corporation (OAR). > > - > > - The license and distribution terms for this file may be > > - found in the file LICENSE in this distribution. > > - > > - This software with is provided ``as is'' and with NO WARRANTY. > > - > > - > > > - > > - RTEMS Performance Monitoring and Measurement Framework. > > - > > - This is the Target Interface Command Line Interface. You need > > - start the RTEMS monitor. > > +/** > > + * @file > > + * > > + * @brief RTEMS Performance Monitoring and Measurement Framework. > > + * > > + * This is the Target Interface Command Line Interface. You need > > + * start the RTEMS monitor. > > + */ > > > > -*/ > > +/* > > + * Copyright 2002, 2015 Chris Johns . > > + * All rights reserved. > > + * > > + * COPYRIGHT (c) 2014. > > + * On-Line Applications Research Corporation (OAR). > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are met: > > + * 1. Redistributions of source code must retain the above copyright > > + *notice, this list of conditions and the following disclaimer. > > + * 2. Redistributions in binary form must reproduce the above copyright > > + *notice, this list of conditions and the following disclaimer in > the > > + *documentation and/or other materials provided with the > distribution. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > "AS IS" > > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED > TO, THE > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > PURPOSE > > + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR > CONTRIBUTORS BE > > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > > + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > BUSINESS > > + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER > IN > > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR > OTHERWISE) > > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > OF THE > > + * POSSIBILITY OF SUCH DAMAGE. > > + */ > > > > #ifdef HAVE_CONFIG_H > > #include "config.h" > > diff --git a/cpukit/libmisc/capture/capture.c > b/cpukit/libmisc/capture/capture.c > > index bba7d91396..2ed607ecaf 100644 > > --- a/cpukit/libmisc/capture/capture.c > > +++ b/cpukit/libmisc/capture/capture.c > > @@ -1,24 +1,39 @@ > > -/* > > - > > > - > > - Copyright 2002, 2016 Chris Johns . > > - All rights reserved. > > - > > - COPYRIGHT (c) 1989-2014. > > - On-Line Applications Research Corporation (OAR). > > - > > - The license and distribution terms
Re: [PATCH 22/26] cpukit/libmisc/redirector: Manually change license to BSD-2
On Tue, Mar 22, 2022 at 2:51 AM Christian MAUDERER < christian.maude...@embedded-brains.de> wrote: > Am 18.03.22 um 17:21 schrieb Joel Sherrill: > > Updates #3053. > > --- > > cpukit/libmisc/redirector/stdio-redirect.c | 33 -- > > 1 file changed, 25 insertions(+), 8 deletions(-) > > > > diff --git a/cpukit/libmisc/redirector/stdio-redirect.c > b/cpukit/libmisc/redirector/stdio-redirect.c > > index 7f3e9138a7..712968ac2d 100644 > > --- a/cpukit/libmisc/redirector/stdio-redirect.c > > +++ b/cpukit/libmisc/redirector/stdio-redirect.c > > @@ -1,16 +1,33 @@ > > -/* > > - * Copyright (C) 2014 Chris Johns (chr...@rtems.org) > > +/** > > + * @file > >* > > - * The license and distribution terms for this file may be > > - * found in the file LICENSE in this distribution. > > - * > > - * This software with is provided ``as is'' and with NO WARRANTY. > > + * @brief RTEMS std redirector. > >*/ > > > > /* > > - * RTEMS std redirector. > > + * Copyright (C) 2014 Chris Johns (chr...@rtems.org) > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are met: > > + * 1. Redistributions of source code must retain the above copyright > > + *notice, this list of conditions and the following disclaimer. > > + * 2. Redistributions in binary form must reproduce the above copyright > > + *notice, this list of conditions and the following disclaimer in > the > > + *documentation and/or other materials provided with the > distribution. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > "AS IS" > > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED > TO, THE > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > PURPOSE > > + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR > CONTRIBUTORS BE > > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > > + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > BUSINESS > > + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER > IN > > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR > OTHERWISE) > > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > OF THE > > + * POSSIBILITY OF SUCH DAMAGE. > >*/ > > - > > Is removing that line correct? I think most files have one empty line > between the license and the first code line. > It isn't correct. I have updated this patch and will commit the fixed version. There appear to be 42 files in cpukit/ which have the end of a comment before #include. I will try to catch these in the patch set but follow up with a difference patch to address those that are copyright blocks. > > > #include > > #include > > #include > > -- > > embedded brains GmbH > Herr Christian MAUDERER > Dornierstr. 4 > 82178 Puchheim > Germany > email: christian.maude...@embedded-brains.de > phone: +49-89-18 94 741 - 18 > fax: +49-89-18 94 741 - 08 > > Registergericht: Amtsgericht München > Registernummer: HRB 157899 > Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler > Unsere Datenschutzerklärung finden Sie hier: > https://embedded-brains.de/datenschutzerklaerung/ > ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH 00/26] Bulk Relicense to BSD-2
Hello Joel, I didn't re-check the authors for all files and whether you have the permission from them. I'm sure that you checked that thoroughly. I added comments for a few minor formal details. Apart from these, the patches look good. Best regards Christian Am 18.03.22 um 17:21 schrieb Joel Sherrill: Hi This is another large patch set which changes most of the cpukit source that is easily possible to BSD-2. I have emailed at least a half dozen more contributors to get permission. That will unblock some files/directories I didn't touch. There is still a fair amount in cpukit which can be changed to BSD-2 (I think). Known issues we can address are: + cpukit/include needs a sweep + cpukit/dev needs a sweep + cpukit/libcsupport needs a file by file review + cpukit/libmisc/shell needs a file by file review + cpukit/libmisc/monitor is going to require Chris' attention + cpukit/libdl has NetBSD code with no license + sometimes files are BSD-2 but SPDX line is in the copyright block + some files have no license (md4.c, des.h stick out) + imported files with permissive license have no SPDX I have not looked at libbsp and intend to do testsuites next because they should be easier. Most are single contributor. This patch set is mostly automated but I did fix a few things by hand. Help is always appreciated if someone wants to do an analysis of one of the directories I listed above and see what can be changed. Thanks. --joel Joel Sherrill (26): cpukit/libdl/rtl-alloc-check.py: Change to BSD-2 by hand cpukit/libdl Change license to BSD-2 cpukit/libdrvmsg: Change license to BSD-2 cpukit/libfs/src/defaults: Change license to BSD-2 cpukit/libdl: Manual file header reordering (SPDX, Doxygen, Copyright) cpukit/libfs/src/imfs: Change license to BSD-2 cpukit/libds/src/ftpfs/tftpDriver.c: Manually update license to BSD-2 cpukit/libfs/src/rfs: Change license to BSD-2 cpukit/libgnat: Change license to BSD-2. cpukit/libpci: Change license to BSD-2 cpukit/libtest: Change license to BSD-2 cpukit/libmisc/bspcmdline: Change license to BSD-2 cpukit/capture: Change license to BSD-2 cpukit/libmisc/capture: Manually change license to BSD-2 cpukit/libmisc/cpuuse: Change license to BSD-2 cpukit/libmisc/devnull/devzero.c: Change license to BSD-2 cpukit/libmisc/dummy: Change license to BSD-2. cpukit/libmisc/dumpbuf: Change license to BSD-2 cpukit/libmisc/fsmount: Change license to BSD-2. cpukit/libmisc/fsmount/fsmount.c: Manual header clean up cpukit/libmisc/mouse: Change license to BSD-2 cpukit/libmisc/redirector: Manually change license to BSD-2 cpukit/libmisc/rtems-fdt: Change license to BSD-2 cpukit/libmisc/serdbg: Change to BSD-2 cpukit/libmisc/check: Change license to BSD-2 cpukit/libmisc/untar: Change license to BSD-2 cpukit/libdl/dlfcn-shell.c| 34 --- cpukit/libdl/dlfcn.c | 34 --- cpukit/libdl/rap-shell.c | 34 --- cpukit/libdl/rap.c| 34 --- cpukit/libdl/rtl-alloc-check.py | 30 +++--- cpukit/libdl/rtl-alloc-heap.c | 34 --- cpukit/libdl/rtl-alloc-heap.h | 34 --- cpukit/libdl/rtl-allocator.c | 34 --- cpukit/libdl/rtl-archive.c| 34 --- cpukit/libdl/rtl-bit-alloc.c | 34 --- cpukit/libdl/rtl-bit-alloc.h | 34 --- cpukit/libdl/rtl-chain-iterator.c | 34 --- cpukit/libdl/rtl-chain-iterator.h | 34 --- cpukit/libdl/rtl-debugger.c | 34 --- cpukit/libdl/rtl-elf.c| 34 --- cpukit/libdl/rtl-elf.h| 34 --- cpukit/libdl/rtl-error.c | 34 --- cpukit/libdl/rtl-error.h | 34 --- cpukit/libdl/rtl-find-file.c | 34 --- cpukit/libdl/rtl-find-file.h | 34 --- cpukit/libdl/rtl-obj-cache.c | 34 --- cpukit/libdl/rtl-obj-comp.c | 34 --- cpukit/libdl/rtl-obj.c| 34 --- cpukit/libdl/rtl-rap.c| 34 --- cpukit/libdl/rtl-rap.h| 34 --- cpukit/libdl/rtl-shell.c | 34 --- cpukit/libdl/rtl-string.c | 34 --- cpukit/libdl/rtl-string.h | 34 --- cpukit/libdl/rtl-sym.c| 34 --- cpukit/libdl/rtl-trace.c | 34 --- cpukit/libdl/rtl-trampoline.h | 34 --- cpukit/libdl/rtl-unresolved.c | 34 --- cpukit/libdl/rtl-unwind-dw2.c | 34 ---
Re: [PATCH 22/26] cpukit/libmisc/redirector: Manually change license to BSD-2
Am 18.03.22 um 17:21 schrieb Joel Sherrill: Updates #3053. --- cpukit/libmisc/redirector/stdio-redirect.c | 33 -- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/cpukit/libmisc/redirector/stdio-redirect.c b/cpukit/libmisc/redirector/stdio-redirect.c index 7f3e9138a7..712968ac2d 100644 --- a/cpukit/libmisc/redirector/stdio-redirect.c +++ b/cpukit/libmisc/redirector/stdio-redirect.c @@ -1,16 +1,33 @@ -/* - * Copyright (C) 2014 Chris Johns (chr...@rtems.org) +/** + * @file * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution. - * - * This software with is provided ``as is'' and with NO WARRANTY. + * @brief RTEMS std redirector. */ /* - * RTEMS std redirector. + * Copyright (C) 2014 Chris Johns (chr...@rtems.org) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ - Is removing that line correct? I think most files have one empty line between the license and the first code line. #include #include #include -- embedded brains GmbH Herr Christian MAUDERER Dornierstr. 4 82178 Puchheim Germany email: christian.maude...@embedded-brains.de phone: +49-89-18 94 741 - 18 fax: +49-89-18 94 741 - 08 Registergericht: Amtsgericht München Registernummer: HRB 157899 Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler Unsere Datenschutzerklärung finden Sie hier: https://embedded-brains.de/datenschutzerklaerung/ ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH 14/26] cpukit/libmisc/capture: Manually change license to BSD-2
Am 18.03.22 um 17:21 schrieb Joel Sherrill: These files did not follow the standard format and needed to be changed manually. Updates #3053. --- cpukit/libmisc/capture/README | 4 +- cpukit/libmisc/capture/capture-cli.c | 57 --- cpukit/libmisc/capture/capture.c | 55 +++--- cpukit/libmisc/capture/capture_buffer.c | 49 ++-- cpukit/libmisc/capture/capture_buffer.h | 42 +- cpukit/libmisc/capture/capture_support.c | 57 --- .../libmisc/capture/capture_user_extension.c | 51 +++-- 7 files changed, 200 insertions(+), 115 deletions(-) diff --git a/cpukit/libmisc/capture/README b/cpukit/libmisc/capture/README index 3e59637149..806bb37d1f 100644 --- a/cpukit/libmisc/capture/README +++ b/cpukit/libmisc/capture/README @@ -1,7 +1,7 @@ RTEMS Performance Monitoring and Measurement Framework - Copyright 2002-2007 Chris Johns (chr...@rtems.org) - 23 April 2002 + Copyright 2002-2007 Chris Johns (chr...@rtems.org) + 23 April 2002 This directory contains the source code for the performance monitoring and measurement framework. It is more commonly know as the capture engine. diff --git a/cpukit/libmisc/capture/capture-cli.c b/cpukit/libmisc/capture/capture-cli.c index d489d9f32a..d8afc982a1 100644 --- a/cpukit/libmisc/capture/capture-cli.c +++ b/cpukit/libmisc/capture/capture-cli.c @@ -1,25 +1,40 @@ -/* - - - Copyright 2002, 2015 Chris Johns - All rights reserved. - - COPYRIGHT (c) 2014. - On-Line Applications Research Corporation (OAR). - - The license and distribution terms for this file may be - found in the file LICENSE in this distribution. - - This software with is provided ``as is'' and with NO WARRANTY. - - - - RTEMS Performance Monitoring and Measurement Framework. - - This is the Target Interface Command Line Interface. You need - start the RTEMS monitor. +/** + * @file + * + * @brief RTEMS Performance Monitoring and Measurement Framework. + * + * This is the Target Interface Command Line Interface. You need + * start the RTEMS monitor. + */ -*/ +/* + * Copyright 2002, 2015 Chris Johns . + * All rights reserved. + * + * COPYRIGHT (c) 2014. + * On-Line Applications Research Corporation (OAR). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c index bba7d91396..2ed607ecaf 100644 --- a/cpukit/libmisc/capture/capture.c +++ b/cpukit/libmisc/capture/capture.c @@ -1,24 +1,39 @@ -/* - - - Copyright 2002, 2016 Chris Johns . - All rights reserved. - - COPYRIGHT (c) 1989-2014. - On-Line Applications Research Corporation (OAR). - - The license and distribution terms for this file may be - found in the file LICENSE in this distribution. - - This software with is provided ``as is'' and with NO WARRANTY. - - - - RTEMS Performance Monitoring and Measurement Framework. - - This is the Capture Engine component. +/** + * @file + * + * @brief RTEMS Performance Monitoring and Measurement Framework. + * + * This is the Capture Engine component. + */ -*/ +/* + * Copyright 2002, 2016 Chris Johns . + * All rights reserved. + * + * COPYRIGHT
Re: [PATCH 07/26] cpukit/libds/src/ftpfs/tftpDriver.c: Manually update license to BSD-2
Am 18.03.22 um 17:21 schrieb Joel Sherrill: Eric Norum granted permission plus git log archeology to get year for his copyright. Updates #3053. --- cpukit/libfs/src/ftpfs/tftpDriver.c | 38 +++-- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/cpukit/libfs/src/ftpfs/tftpDriver.c b/cpukit/libfs/src/ftpfs/tftpDriver.c index bc0e74ad86..ef8dc33351 100644 --- a/cpukit/libfs/src/ftpfs/tftpDriver.c +++ b/cpukit/libfs/src/ftpfs/tftpDriver.c @@ -1,17 +1,39 @@ -/* - * Trivial File Transfer Protocol (RFC 1350) +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file * - * Transfer file to/from remote host + * Trivial File Transfer Protocol file system (TFTP client) for RFC 1350. * - * W. Eric Norum - * Saskatchewan Accelerator Laboratory - * University of Saskatchewan - * Saskatoon, Saskatchewan, CANADA - * e...@skatter.usask.ca + * Transfer file to/from remote host + */ + +/* + * Copyright 1998 W. Eric Norum Not entirely sure but in later copyright lines, Eric Norum added his mail address. For example 2002: https://git.rtems.org/rtems/tree/cpukit/libcsupport/src/getgrent.c Shouldn't we prefer that form here too? * * Modifications to support reference counting in the file system are * Copyright (c) 2012 embedded brains GmbH. * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H -- embedded brains GmbH Herr Christian MAUDERER Dornierstr. 4 82178 Puchheim Germany email: christian.maude...@embedded-brains.de phone: +49-89-18 94 741 - 18 fax: +49-89-18 94 741 - 08 Registergericht: Amtsgericht München Registernummer: HRB 157899 Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler Unsere Datenschutzerklärung finden Sie hier: https://embedded-brains.de/datenschutzerklaerung/ ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH 01/26] cpukit/libdl/rtl-alloc-check.py: Change to BSD-2 by hand
Shouldn't there be a SPDX-line added to this file? Am 18.03.22 um 17:21 schrieb Joel Sherrill: Updates #3053. --- cpukit/libdl/rtl-alloc-check.py | 30 +++--- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/cpukit/libdl/rtl-alloc-check.py b/cpukit/libdl/rtl-alloc-check.py index c2145a768e..3d6b024442 100644 --- a/cpukit/libdl/rtl-alloc-check.py +++ b/cpukit/libdl/rtl-alloc-check.py @@ -1,11 +1,4 @@ # -# Copyright (c) 2019 Chris Johns . -# All rights reserved. -# -# The license and distribution terms for this file may be -# found in the file LICENSE in this distribution or at -# http://www.rtems.org/license/LICENSE. -# # Check the allocations for libdl: # # 1. Turn on the allocation trace. @@ -13,7 +6,30 @@ # 2. Load and unload object files. # # 3. Capture the trace output and feed to this tool + +# Copyright (c) 2019 Chris Johns . +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +#notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +#notice, this list of conditions and the following disclaimer in the +#documentation and/or other materials provided with the distribution. # +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. from __future__ import print_function -- embedded brains GmbH Herr Christian MAUDERER Dornierstr. 4 82178 Puchheim Germany email: christian.maude...@embedded-brains.de phone: +49-89-18 94 741 - 18 fax: +49-89-18 94 741 - 08 Registergericht: Amtsgericht München Registernummer: HRB 157899 Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler Unsere Datenschutzerklärung finden Sie hier: https://embedded-brains.de/datenschutzerklaerung/ ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: NTP client recommendation for RTEMS?
On 21/03/2022 22:28, Chris Johns wrote: On 21/3/2022 5:59 pm, Sebastian Huber wrote: On 20/03/2022 23:08, Chris Johns wrote: On 24/2/2022 2:03 am, Sebastian Huber wrote: On 22/02/2022 21:25, Joel Sherrill wrote: On Tue, Feb 22, 2022, 1:45 PM Sebastian Huber mailto:sebastian.hu...@embedded-brains.de>> wrote: On 22/02/2022 20:30, Joel Sherrill wrote: > On Tue, Feb 22, 2022 at 1:21 PM Sebastian Huber > mailto:sebastian.hu...@embedded-brains.de>> wrote: >> On 22/02/2022 19:22, Joel Sherrill wrote: >>> Are you planning to get the NTP server side of the freebsd-org code working? >>> >>> Or get it building but not testing it? >>> >>> Or just focusing on building and testing JUST the client part. >> I ported the ntpd from FreeBSD to an older version of the libbsd. I only >> tested the client part and this seems to work fine after some basic tests. > OK. That matches what I expected. Is the libbsd version to old to merge > against? Any plans to merge this? > > Alternatively, is your work available to be used as the basis for updating > to 6-freebsd-12? I have a very long TODO list. Actually, I started with the current 6-freebsd-12 branch, but it didn't work, so in principle generating patches for this branch should be easy. Thanks. If we end up working on this, we will sync with you to help and avoid duplicate work. I pushed the NTP work to my github repository: https://github.com/sebhub/rtems-libbsd/tree/6-freebsd-12-ntpd I think we have to revert some changes done for the NFS support. Please do not. I would prefer the problem be discussed and understood first and alternatives considered. Yes, I don't work this currently. For example, I don't know why the system call support for kqueue and the sockets> moved to a separate file and was changed to use the FreeBSD file descriptors. The change lets us use FreeBSD fd support and after this work I think the change is major improvement over the implementation I had to work with. Using RTEMS direct fd support in mixed ways with VFS in LibBSD would only make things confusing. Using the FreeBSD file descriptors for the FreeBSD file system support makes sense. I don't understand why this is required for the kqueue and sockets support. It just adds a runtime, memory, and code overhead. You need this RTEMS file descriptor to FreeBSD file descriptor mapping in every send() and recv() call. Not everyone is using libbsd with the NFS client. What is the hard reason for having the FreeBSD file descriptors for kqueue and socket? The code is in libbsd and part of the whole kernel framework we import and the changes I made bring it closer to the original FreeBSD sources. This is still a primary and overriding requirement for libbsd. Being close to the FreeBSD code is just one goal. I made a couple of updates in the past and the kqueue and socket modules didn't cause issues. The RTEMS-specific code were clearly isolated in well defined places. The changes cover: 1. Moving all the system calls into a single location [1] from a number of places. In FreeBSD this code is in the user land libraries and so there is a clear and defined boundary. Moving the system call glue to a separate file makes it more difficult to review. Previously, the glue code and the system call implementation was very close together in the code. There is a one-to-one relationship between the API function and the sys_*() or kern_*() implementation. Having the code in one module makes it possible to make the implementation static. This avoids a function call overhead and enables the compiler to optimize the parameter handover structure away. It avoids an extra stack frame. 2. Localised trace support. This makes working with the system calls and porting code to RTEMS and libbsd easier as you can see the system calls. The trace support could have been easily added to the existing kqueue and socket modules. Independent of this, why was there a specialize tracing support added? I thought the trace linker was the tool to trace applications? 3. Uniform interfacing and management of IOP. We now have a better abstraction which lets us change IOP or libio without a major impact on this code. This includes the various dispatch tables RTEMS's file system requires. This just adds another level of complexity for the kqueue and socket support. I am not talking here about the NFS file system code. 4. FreeBSD fd and file management and locking. This is important. What do you mean in detail here with respect to the socket support. What is the hard reason to have the FreeBSD file descriptors in this area? The primary goal was to rebase the code to make it easier and simpler to work with. I found a number of questionable subtle things hidden in the implementation that conflicted with our goals for this
