date:20200827

Re: [PATCH] Adding EPICS7 Package to RSB

2020-08-27 Thread Heinz Junkes

Dear Mritunjay,


> On 26. Aug 2020, at 23:34, Mritunjay Sharma  
> wrote:
> 
> > +Name:  epics-base-%{epics_version}-%{_host}-%{release}
> > +Summary:   EPICS v%{epics_version} for target %{_target} on host %{_host}
> > +Version:   %{epics_version}
> > +Release:   %{release}
> > +URL: https://epics.mpg.de/
> This doesn't look like the right url.
> 
> I cross-checked and it seems to be working. 


The link should be 
https://epics-controls.org/ 
please.


> 
> > +
> > +#
> > +# Source
> > +#
> > +%source set epics-base 
> > https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
> ditto
> 
> where do official EPICS releases go?
> 
> I think we need Heinz intervention in this and I am ready to help him get it 
> done.
> We have to use this repo for the time being.

Yes, please leave it like this temporarily. I am working on the integration 
into the official release and then
the link will change something like this:

git clone //https://github.com/epics-base/epics-base.git

or possibly then also set to a fix release, like:
https://github.com/epics-base/epics-base/releases/tag/R7.0.4.1

Heinz

smime.p7s
Description: S/MIME cryptographic signature
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] Adding EPICS7 Package to RSB

2020-08-27 Thread Mritunjay Sharma

On Thu, Aug 27, 2020 at 2:15 PM Heinz Junkes 
wrote:

> Dear Mritunjay,
>
>
> > On 26. Aug 2020, at 23:34, Mritunjay Sharma <
> mritunjaysharma...@gmail.com> wrote:
> >
> > > +Name:  epics-base-%{epics_version}-%{_host}-%{release}
> > > +Summary:   EPICS v%{epics_version} for target %{_target} on host
> %{_host}
> > > +Version:   %{epics_version}
> > > +Release:   %{release}
> > > +URL: https://epics.mpg.de/
> > This doesn't look like the right url.
> >
> > I cross-checked and it seems to be working.
>
>
> The link should be
> https://epics-controls.org/
> please.
>
> My apologies for this. I will update with the above link. Thank you so
much!

>
> >
> > > +
> > > +#
> > > +# Source
> > > +#
> > > +%source set epics-base
> https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
> > ditto
> >
> > where do official EPICS releases go?
> >
> > I think we need Heinz intervention in this and I am ready to help him
> get it done.
> > We have to use this repo for the time being.
>
> Yes, please leave it like this temporarily. I am working on the
> integration into the official release and then
> the link will change something like this:
>
> git clone //https://github.com/epics-base/epics-base.git
>
> or possibly then also set to a fix release, like:
> https://github.com/epics-base/epics-base/releases/tag/R7.0.4.1


Definitely, thank you so much!

Mritunjay


>
>
> Heinz
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v5] Pre-Release Strong-APA

2020-08-27 Thread Richi Dubey

Hi,

Thanks for your reviews so far. This patch implements the reviews suggested
in the following links:

https://lists.rtems.org/pipermail/devel/2020-August/061578.html
https://github.com/richidubey/rtems/pull/7/files

and my comments on resolving the issues are here:
https://lists.rtems.org/pipermail/devel/2020-August/061614.html

Please let me know how to improve this patch.

Thanks,
Richi.

On Thu, Aug 27, 2020 at 7:10 PM Richi Dubey  wrote:

> From 18982f8084f8d603ea0492e809d759d3c09ea263 Mon Sep 17 00:00:00 2001
> From: Richi Dubey 
> Date: Thu, 27 Aug 2020 19:07:46 +0530
> Subject: [PATCH v5] Pre-Release Strong-APA
>
> ---
>  cpukit/include/rtems/scheduler.h  |   6 +-
>  .../include/rtems/score/schedulerstrongapa.h  | 152 ++-
>  cpukit/score/src/schedulerstrongapa.c | 893 ++
>  3 files changed, 820 insertions(+), 231 deletions(-)
>
> diff --git a/cpukit/include/rtems/scheduler.h
> b/cpukit/include/rtems/scheduler.h
> index 955a83cfb4..6a05c2798a 100644
> --- a/cpukit/include/rtems/scheduler.h
> +++ b/cpukit/include/rtems/scheduler.h
> @@ -257,16 +257,14 @@
>#define RTEMS_SCHEDULER_STRONG_APA( name, prio_count ) \
>  static struct { \
>Scheduler_strong_APA_Context Base; \
> -  Chain_ControlReady[ ( prio_count ) ]; \
> +  Scheduler_strong_APA_CPU CPU[ CONFIGURE_MAXIMUM_PROCESSORS ]; \
>  } SCHEDULER_STRONG_APA_CONTEXT_NAME( name )
>
>#define RTEMS_SCHEDULER_TABLE_STRONG_APA( name, obj_name ) \
>  { \
>&SCHEDULER_STRONG_APA_CONTEXT_NAME( name ).Base.Base.Base, \
>SCHEDULER_STRONG_APA_ENTRY_POINTS, \
> -  RTEMS_ARRAY_SIZE( \
> -SCHEDULER_STRONG_APA_CONTEXT_NAME( name ).Ready \
> -  ) - 1, \
> +  SCHEDULER_STRONG_APA_MAXIMUM_PRIORITY, \
>( obj_name ) \
>SCHEDULER_CONTROL_IS_NON_PREEMPT_MODE_SUPPORTED( false ) \
>  }
> diff --git a/cpukit/include/rtems/score/schedulerstrongapa.h
> b/cpukit/include/rtems/score/schedulerstrongapa.h
> index 0ac28cb439..cfd79e932a 100644
> --- a/cpukit/include/rtems/score/schedulerstrongapa.h
> +++ b/cpukit/include/rtems/score/schedulerstrongapa.h
> @@ -6,31 +6,47 @@
>   * @brief Strong APA Scheduler API
>   */
>
> -/*
> - * Copyright (c) 2013, 2018 embedded brains GmbH.  All rights reserved.
> +/* SPDX-License-Identifier: BSD-2-Clause
>   *
> - *  embedded brains GmbH
> - *  Dornierstr. 4
> - *  82178 Puchheim
> - *  Germany
> - *  
> + * Copyright (C) 2020 Richi Dubey
> + * Copyright (c) 2013, 2018 embedded brains GmbH
>   *
> - * 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.
> + * 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.
>   */
>
>  #ifndef _RTEMS_SCORE_SCHEDULERSTRONGAPA_H
>  #define _RTEMS_SCORE_SCHEDULERSTRONGAPA_H
>
>  #include 
> -#include 
>  #include 
> +#include 
>
>  #ifdef __cplusplus
>  extern "C" {
>  #endif /* __cplusplus */
>
> +#define STRONG_SCHEDULER_NODE_OF_CHAIN( node ) \
> +  RTEMS_CONTAINER_OF( node, Scheduler_strong_APA_Node, Ready_node )
> +
>  /**
>   * @defgroup RTEMSScoreSchedulerStrongAPA Strong APA Scheduler
>   *
> @@ -38,42 +54,96 @@ extern "C" {
>   *
>   * @brief Strong APA Scheduler
>   *
> - * This is an implementation of the global fixed priority scheduler
> (G-FP).  It
> - * uses one ready chain per priority to ensure constant time insert
> operations.
> - * The scheduled chain uses linear insert operations and has at most
> processor
> - * count entries.  Since the processor and priority count are constants
> all
> - * scheduler operations complete in a bounded execution time.
> - *
>

Re: [PATCH] sb: Use shebang env python

2020-08-27 Thread Gedare Bloom

On Wed, Aug 26, 2020 at 10:35 PM Chris Johns  wrote:
>
> On 27/8/20 1:10 am, Gedare Bloom wrote:
> > thanks, some of this is rewriting shell script to python, and fixing
> > up imports. I'd prefer to have these separated, but it's probably fine
> > I took a quick skim over all of it.
>
> Changes to the imports are needed for the moved code to work. The code before 
> I
> moved to the script wrapper used the system path to manage the loading 
> however I
> always felt this was a hack and I was reluctant to use it again.
>
> I tested Python3 and Python2 and when commiting the changes I noticed the file
> `source-builder/sb/__init__.py` I had added when playing with options was 
> empty
> so I removed. It was empty so what purpose did it serve? It turns out this 
> file
> is needed on Python2. I failed to retest after removing the file. I am sorry 
> for
> the disruption it has caused.
>
> I have made some other changes to the imports, one to break a circular 
> reference
> between the setbulder and reports modules. This appeared as part of cleaning 
> up
> how imports are handled. I will post a patch for testing soon.
>
Thanks. Yes, that empty __init__ is an annoying artifact.

> Chris
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] sb: Fix the imports on Python2

2020-08-27 Thread Gedare Bloom

On Wed, Aug 26, 2020 at 11:54 PM  wrote:
>
> From: Chris Johns 
>
> Closes #4037
> ---
>  source-builder/sb-check |  2 --
>  source-builder/sb/__init__.py   | 20 
>  source-builder/sb/build.py  |  3 +--
>  source-builder/sb/config.py |  3 +--
>  source-builder/sb/getsources.py |  3 +--
>  source-builder/sb/linux.py  |  2 +-
>  source-builder/sb/reports.py|  9 +++--
>  source-builder/sb/setbuilder.py |  3 +--
>  source-builder/sb/shell.py  |  3 +--
>  source-builder/sb/simhost.py|  3 +--
>  source-builder/sb/track.py  |  3 +--
>  11 files changed, 31 insertions(+), 23 deletions(-)
>  create mode 100644 source-builder/sb/__init__.py
>
> diff --git a/source-builder/sb-check b/source-builder/sb-check
> index b75767e..8c60bf6 100755
> --- a/source-builder/sb-check
> +++ b/source-builder/sb-check
> @@ -20,8 +20,6 @@
>
>  from __future__ import print_function
>
> -import sb.check
> -
>  try:
>  import sb.check
>  sb.check.run()
> diff --git a/source-builder/sb/__init__.py b/source-builder/sb/__init__.py
> new file mode 100644
> index 000..c4275e2
> --- /dev/null
> +++ b/source-builder/sb/__init__.py
> @@ -0,0 +1,20 @@
> +#
> +# RTEMS Tools Project (http://www.rtems.org/)
> +# Copyright 2020 Chris Johns (chr...@rtems.org)
> +# All rights reserved.
> +#
> +# This file is part of the RTEMS Tools package in 'rtems-tools'.
> +#
> +# Permission to use, copy, modify, and/or distribute this software for any
> +# purpose with or without fee is hereby granted, provided that the above
> +# copyright notice and this permission notice appear in all copies.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> +
This doesn't follow the template. I guess probably it uses what is in
other rtems-tools files though.
https://docs.rtems.org/branches/master/eng/coding-file-hdr.html#python-file-template

This is MIT license?

> +from __future__ import print_function
> diff --git a/source-builder/sb/build.py b/source-builder/sb/build.py
> index f3253dd..16a495b 100644
> --- a/source-builder/sb/build.py
> +++ b/source-builder/sb/build.py
> @@ -48,8 +48,7 @@ except KeyboardInterrupt:
>  print('abort: user terminated')
>  sys.exit(1)
>  except:
> -print('error: unknown application load error')
> -sys.exit(1)
> +raise
>
>  def humanize_number(num, suffix):
>  for unit in ['','K','M','G','T','P','E','Z']:
> diff --git a/source-builder/sb/config.py b/source-builder/sb/config.py
> index db795b3..cd0bf94 100644
> --- a/source-builder/sb/config.py
> +++ b/source-builder/sb/config.py
> @@ -45,8 +45,7 @@ except KeyboardInterrupt:
>  print('user terminated', file = sys.stderr)
>  sys.exit(1)
>  except:
> -print('error: unknown application load error', file = sys.stderr)
> -sys.exit(1)
> +raise
>
>  def _check_bool(value):
>  istrue = None
> diff --git a/source-builder/sb/getsources.py b/source-builder/sb/getsources.py
> index 0ccf257..d348da4 100644
> --- a/source-builder/sb/getsources.py
> +++ b/source-builder/sb/getsources.py
> @@ -40,8 +40,7 @@ except KeyboardInterrupt:
>  print('abort: user terminated', file = sys.stderr)
>  sys.exit(1)
>  except:
> -print('error: unknown application load error', file = sys.stderr)
> -sys.exit(1)
> +raise
>
>  def run(args = sys.argv):
>  ec = 0
> diff --git a/source-builder/sb/linux.py b/source-builder/sb/linux.py
> index d773818..d89377b 100644
> --- a/source-builder/sb/linux.py
> +++ b/source-builder/sb/linux.py
> @@ -23,10 +23,10 @@
>  #
>
>  import multiprocessing
> +import platform
>  import pprint
>  import os
>
> -from . import platform
>  from . import path
>
>  def load():
> diff --git a/source-builder/sb/reports.py b/source-builder/sb/reports.py
> index 34474f3..a20b29e 100644
> --- a/source-builder/sb/reports.py
> +++ b/source-builder/sb/reports.py
> @@ -30,9 +30,6 @@ import datetime
>  import os
>  import sys
>
> -import pprint
> -pp = pprint.PrettyPrinter(indent = 2)
> -
>  try:
>  from . import build
>  from . import check
> @@ -42,15 +39,13 @@ try:
>  from . import log
>  from . import options
>  from . import path
> -from . import setbuilder
>  from . import sources
>  from . import version
>  except KeyboardInterrupt:
>  print('user terminated', file = sys.stderr)
>  sys.exit(1)
>  except:
> -print('error: unknown application load error', file = sys.stderr)
> -sys.exit(1)
> +raise
>
>  _line_len = 78
>
> @@ -865,6 +860,7 @@ class repor

Re: [PATCH v2] Adding EPICS7 Package to RSB

2020-08-27 Thread Gedare Bloom

Mritunjay,

On Wed, Aug 26, 2020 at 3:58 PM Mritunjay Sharma
 wrote:
>
> Modified as per the suggestions of Dr. Gedare. Please do review
> Signed-off-by: Mritunjay Sharma 
> ---
>  .../epics/{epics-7-1.cfg => epics-7.0-1.cfg}  |  5 ++--
>  rtems/config/epics/epics-base.bset| 14 +--
>  .../config/{epics-7-1.cfg => epics-7.0-1.cfg} | 24 ---
>  3 files changed, 19 insertions(+), 24 deletions(-)
>  rename rtems/config/epics/{epics-7-1.cfg => epics-7.0-1.cfg} (87%)
>  rename source-builder/config/{epics-7-1.cfg => epics-7.0-1.cfg} (64%)
>
> diff --git a/rtems/config/epics/epics-7-1.cfg 
> b/rtems/config/epics/epics-7.0-1.cfg
> similarity index 87%
> rename from rtems/config/epics/epics-7-1.cfg
> rename to rtems/config/epics/epics-7.0-1.cfg
> index 30ed9cb..34270ee 100644
> --- a/rtems/config/epics/epics-7-1.cfg
> +++ b/rtems/config/epics/epics-7.0-1.cfg
> @@ -1,5 +1,5 @@
>  #
> -# EPICS 7
> +# EPICS 7.0
>  #
>
>  %if %{release} == %{nil}
> @@ -15,8 +15,7 @@
>
>  %hash sha512 epics-base-%{epics_version}.tar.gz 
> 63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
>
> -#
>  #
>  # EPICS Build configuration
>  #
> -%include %{_configdir}/epics-7-1.cfg
> +%include %{_configdir}/epics-7.0-1.cfg
> diff --git a/rtems/config/epics/epics-base.bset 
> b/rtems/config/epics/epics-base.bset
> index e56fc6a..7ee3815 100644
> --- a/rtems/config/epics/epics-base.bset
> +++ b/rtems/config/epics/epics-base.bset
> @@ -1,26 +1,14 @@
>  #
>  # Build set for EPICS
>  #
> -
>  %define release 1
>
> -#
> -# RTEMS Version
> -#
> -%define rtems_version 5
> -
> -#
> -# The RTEMS URL paths.
> -#
> -%include rtems-urls.bset
> -
>  #
>  # The RTEMS Package defines
>  #
>  %include rtems-package.bset
>
> -
>  #
>  # Build EPICS.
>  #
> -epics/epics-7-1 .
> \ No newline at end of file
> +epics/epics-7.0-1
> diff --git a/source-builder/config/epics-7-1.cfg 
> b/source-builder/config/epics-7.0-1.cfg
> similarity index 64%
> rename from source-builder/config/epics-7-1.cfg
> rename to source-builder/config/epics-7.0-1.cfg
> index 2a52ea5..2a06008 100644
> --- a/source-builder/config/epics-7-1.cfg
> +++ b/source-builder/config/epics-7.0-1.cfg
> @@ -27,7 +27,7 @@ URL:https://epics.mpg.de/
>  %prep
>build_top=$(pwd)
>
> -  source_dir_epics="epics-base-%{epics_version}"
> + # source_dir_epics="epics-base-%{epics_version}"
you can keep this variable, that wasn't my point.

>
>%source setup epics-base -q -n epics-base-%{epics_version}
I was wondering if you should/could use the variable here?

>
> @@ -36,22 +36,30 @@ URL:  https://epics.mpg.de/
>  %build
>build_top=$(pwd)
>
> -  cd ${source_dir_epics}
> +  cd epics-base-%{epics_version}

and here. not that the name is likely to change, but it is good
programming to use a variable to store something that gets used
repeatedly.

>
>%{build_build_flags}
>
>#
> -  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using 
> --with-rtems-bsp
> +  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using
> +  # --with-rtems-bsp
>#
> -  %{__make} RTEMS_BASE=%{_prefix} RTEMS_VERSION=%{rtems_version} 
> CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
> +  %{__make} RTEMS_BASE=%{_prefix} \
> +   RTEMS_VERSION=%{rtems_version} \
> +   CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
indent these broken lines, probably two "nesting levels" (maybe 4 spaces?)

>
>cd ${build_top}
>
> -%install
> +#%install
>build_top=$(pwd)
>
> -  rm -rf $SB_BUILD_ROOT
> +  %{__rmdir} $SB_BUILD_ROOT
> +
> +  cd epics-base-%{epics_version}
keep source_dir-epics

> +
> +  %{__make} DESTDIR=$SB_BUILD_ROOT \
> +  RTEMS_BASE=%{_prefix} \
> +  RTEMS_VERSION=%{rtems_version} \
> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
ditto

>
> -  cd ${source_dir_epics}
> -  %{__make} DESTDIR=$SB_BUILD_ROOT RTEMS_BASE=%{_prefix} 
> RTEMS_VERSION=%{rtems_version} 
> CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
>cd ${build_top}
> --

after you make these changes and fix the URL, send a new single patch
with all changes squashed together.

> 2.25.1
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] Adding EPICS7 Package to RSB

2020-08-27 Thread Mritunjay Sharma

Thank you for the feedback, Gedare.

Sending in the new patch soon.

Thanks
Mritunjay

On Thu, Aug 27, 2020 at 9:19 PM Gedare Bloom  wrote:

> Mritunjay,
>
> On Wed, Aug 26, 2020 at 3:58 PM Mritunjay Sharma
>  wrote:
> >
> > Modified as per the suggestions of Dr. Gedare. Please do review
> > Signed-off-by: Mritunjay Sharma 
> > ---
> >  .../epics/{epics-7-1.cfg => epics-7.0-1.cfg}  |  5 ++--
> >  rtems/config/epics/epics-base.bset| 14 +--
> >  .../config/{epics-7-1.cfg => epics-7.0-1.cfg} | 24 ---
> >  3 files changed, 19 insertions(+), 24 deletions(-)
> >  rename rtems/config/epics/{epics-7-1.cfg => epics-7.0-1.cfg} (87%)
> >  rename source-builder/config/{epics-7-1.cfg => epics-7.0-1.cfg} (64%)
> >
> > diff --git a/rtems/config/epics/epics-7-1.cfg
> b/rtems/config/epics/epics-7.0-1.cfg
> > similarity index 87%
> > rename from rtems/config/epics/epics-7-1.cfg
> > rename to rtems/config/epics/epics-7.0-1.cfg
> > index 30ed9cb..34270ee 100644
> > --- a/rtems/config/epics/epics-7-1.cfg
> > +++ b/rtems/config/epics/epics-7.0-1.cfg
> > @@ -1,5 +1,5 @@
> >  #
> > -# EPICS 7
> > +# EPICS 7.0
> >  #
> >
> >  %if %{release} == %{nil}
> > @@ -15,8 +15,7 @@
> >
> >  %hash sha512 epics-base-%{epics_version}.tar.gz
> 63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
> >
> > -#
> >  #
> >  # EPICS Build configuration
> >  #
> > -%include %{_configdir}/epics-7-1.cfg
> > +%include %{_configdir}/epics-7.0-1.cfg
> > diff --git a/rtems/config/epics/epics-base.bset
> b/rtems/config/epics/epics-base.bset
> > index e56fc6a..7ee3815 100644
> > --- a/rtems/config/epics/epics-base.bset
> > +++ b/rtems/config/epics/epics-base.bset
> > @@ -1,26 +1,14 @@
> >  #
> >  # Build set for EPICS
> >  #
> > -
> >  %define release 1
> >
> > -#
> > -# RTEMS Version
> > -#
> > -%define rtems_version 5
> > -
> > -#
> > -# The RTEMS URL paths.
> > -#
> > -%include rtems-urls.bset
> > -
> >  #
> >  # The RTEMS Package defines
> >  #
> >  %include rtems-package.bset
> >
> > -
> >  #
> >  # Build EPICS.
> >  #
> > -epics/epics-7-1 .
> > \ No newline at end of file
> > +epics/epics-7.0-1
> > diff --git a/source-builder/config/epics-7-1.cfg
> b/source-builder/config/epics-7.0-1.cfg
> > similarity index 64%
> > rename from source-builder/config/epics-7-1.cfg
> > rename to source-builder/config/epics-7.0-1.cfg
> > index 2a52ea5..2a06008 100644
> > --- a/source-builder/config/epics-7-1.cfg
> > +++ b/source-builder/config/epics-7.0-1.cfg
> > @@ -27,7 +27,7 @@ URL:https://epics.mpg.de/
> >  %prep
> >build_top=$(pwd)
> >
> > -  source_dir_epics="epics-base-%{epics_version}"
> > + # source_dir_epics="epics-base-%{epics_version}"
> you can keep this variable, that wasn't my point.
>
> >
> >%source setup epics-base -q -n epics-base-%{epics_version}
> I was wondering if you should/could use the variable here?
>
> >
> > @@ -36,22 +36,30 @@ URL:  https://epics.mpg.de/
> >  %build
> >build_top=$(pwd)
> >
> > -  cd ${source_dir_epics}
> > +  cd epics-base-%{epics_version}
>
> and here. not that the name is likely to change, but it is good
> programming to use a variable to store something that gets used
> repeatedly.
>
> >
> >%{build_build_flags}
> >
> >#
> > -  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION
> using --with-rtems-bsp
> > +  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION
> using
> > +  # --with-rtems-bsp
> >#
> > -  %{__make} RTEMS_BASE=%{_prefix} RTEMS_VERSION=%{rtems_version}
> CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
> > +  %{__make} RTEMS_BASE=%{_prefix} \
> > +   RTEMS_VERSION=%{rtems_version} \
> > +   CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
> indent these broken lines, probably two "nesting levels" (maybe 4 spaces?)
>
> >
> >cd ${build_top}
> >
> > -%install
> > +#%install
> >build_top=$(pwd)
> >
> > -  rm -rf $SB_BUILD_ROOT
> > +  %{__rmdir} $SB_BUILD_ROOT
> > +
> > +  cd epics-base-%{epics_version}
> keep source_dir-epics
>
> > +
> > +  %{__make} DESTDIR=$SB_BUILD_ROOT \
> > +  RTEMS_BASE=%{_prefix} \
> > +  RTEMS_VERSION=%{rtems_version} \
> > +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
> ditto
>
> >
> > -  cd ${source_dir_epics}
> > -  %{__make} DESTDIR=$SB_BUILD_ROOT RTEMS_BASE=%{_prefix}
> RTEMS_VERSION=%{rtems_version}
> CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
> >cd ${build_top}
> > --
>
> after you make these changes and fix the URL, send a new single patch
> with all changes squashed together.
>
> > 2.25.1
> >
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH] Adding EPICS7 Package to RSB

2020-08-27 Thread Mritunjay Sharma

Made suggested changes
Please review. 

Adding EPICS7 Package to RSB

Adding EPICS7 Package to RSB:Fixed minor changes

Signed-off-by: Mritunjay Sharma 
---
 rtems/config/epics/epics-7.0-1.cfg| 21 +
 rtems/config/epics/epics-base.bset| 14 ++
 source-builder/config/epics-7.0-1.cfg | 65 +++
 3 files changed, 100 insertions(+)
 create mode 100644 rtems/config/epics/epics-7.0-1.cfg
 create mode 100644 rtems/config/epics/epics-base.bset
 create mode 100644 source-builder/config/epics-7.0-1.cfg

diff --git a/rtems/config/epics/epics-7.0-1.cfg 
b/rtems/config/epics/epics-7.0-1.cfg
new file mode 100644
index 000..34270ee
--- /dev/null
+++ b/rtems/config/epics/epics-7.0-1.cfg
@@ -0,0 +1,21 @@
+#
+# EPICS 7.0
+#
+
+%if %{release} == %{nil}
+ %define release 1
+%endif
+
+%include %{_configdir}/rtems-bsp.cfg
+
+#
+# EPICS Version
+#
+%define epics_version 7.0
+
+%hash sha512 epics-base-%{epics_version}.tar.gz 
63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
+
+#
+# EPICS Build configuration
+#
+%include %{_configdir}/epics-7.0-1.cfg
diff --git a/rtems/config/epics/epics-base.bset 
b/rtems/config/epics/epics-base.bset
new file mode 100644
index 000..7ee3815
--- /dev/null
+++ b/rtems/config/epics/epics-base.bset
@@ -0,0 +1,14 @@
+#
+# Build set for EPICS
+#
+%define release 1
+
+#
+# The RTEMS Package defines
+#
+%include rtems-package.bset
+
+#
+# Build EPICS.
+#
+epics/epics-7.0-1
diff --git a/source-builder/config/epics-7.0-1.cfg 
b/source-builder/config/epics-7.0-1.cfg
new file mode 100644
index 000..df75e1d
--- /dev/null
+++ b/source-builder/config/epics-7.0-1.cfg
@@ -0,0 +1,65 @@
+#
+# EPICS 7.x.x Version 1.
+#
+# This configuration file configure's, make's and install's EPICS.
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%define epics_version 7.0
+
+Name:  epics-base-%{epics_version}-%{_host}-%{release}
+Summary:   EPICS v%{epics_version} for target %{_target} on host %{_host}
+Version:   %{epics_version}
+Release:   %{release}
+URL: https://epics-controls.org/
+
+#
+# Source
+#
+%source set epics-base 
https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
+
+#
+# Prepare the source code.
+#
+%prep
+  build_top=$(pwd)
+
+  source_dir_epics="epics-base-%{epics_version}"
+
+  %source setup epics-base -q -n source_dir_epics
+
+  cd ${build_top}
+
+%build
+  build_top=$(pwd)
+
+  cd source_dir_epics
+
+  %{build_build_flags}
+
+  #
+  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using
+  # --with-rtems-bsp
+  #
+  %{__make} RTEMS_BASE=%{_prefix} \
+  RTEMS_VERSION=%{rtems_version} \
+  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
+
+  cd ${build_top}
+
+#%install
+  build_top=$(pwd)
+
+  %{__rmdir} $SB_BUILD_ROOT
+
+  cd source_dir_epics
+
+  %{__make} DESTDIR=$SB_BUILD_ROOT \
+  RTEMS_BASE=%{_prefix} \
+  RTEMS_VERSION=%{rtems_version} \
+  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
+
+  cd ${build_top}
-- 
2.25.1

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] Adding EPICS7 Package to RSB

2020-08-27 Thread Gedare Bloom

On Thu, Aug 27, 2020 at 11:48 AM Mritunjay Sharma
 wrote:
>
> Made suggested changes
> Please review.
>
> Adding EPICS7 Package to RSB
>
> Adding EPICS7 Package to RSB:Fixed minor changes

combine the commit message into what you would like it to say when it
gets pushed.

>
> Signed-off-by: Mritunjay Sharma 

We don't use sign-off for RTEMS repos.

> ---
>  rtems/config/epics/epics-7.0-1.cfg| 21 +
>  rtems/config/epics/epics-base.bset| 14 ++
>  source-builder/config/epics-7.0-1.cfg | 65 +++
>  3 files changed, 100 insertions(+)
>  create mode 100644 rtems/config/epics/epics-7.0-1.cfg
>  create mode 100644 rtems/config/epics/epics-base.bset
>  create mode 100644 source-builder/config/epics-7.0-1.cfg
>
> diff --git a/rtems/config/epics/epics-7.0-1.cfg 
> b/rtems/config/epics/epics-7.0-1.cfg
> new file mode 100644
> index 000..34270ee
> --- /dev/null
> +++ b/rtems/config/epics/epics-7.0-1.cfg
> @@ -0,0 +1,21 @@
> +#
> +# EPICS 7.0
> +#
> +
> +%if %{release} == %{nil}
> + %define release 1
> +%endif
> +
> +%include %{_configdir}/rtems-bsp.cfg
> +
> +#
> +# EPICS Version
> +#
> +%define epics_version 7.0
> +
> +%hash sha512 epics-base-%{epics_version}.tar.gz 
> 63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
> +
> +#
> +# EPICS Build configuration
> +#
> +%include %{_configdir}/epics-7.0-1.cfg
> diff --git a/rtems/config/epics/epics-base.bset 
> b/rtems/config/epics/epics-base.bset
> new file mode 100644
> index 000..7ee3815
> --- /dev/null
> +++ b/rtems/config/epics/epics-base.bset
> @@ -0,0 +1,14 @@
> +#
> +# Build set for EPICS
> +#
> +%define release 1
> +
> +#
> +# The RTEMS Package defines
> +#
> +%include rtems-package.bset
> +
> +#
> +# Build EPICS.
> +#
> +epics/epics-7.0-1
> diff --git a/source-builder/config/epics-7.0-1.cfg 
> b/source-builder/config/epics-7.0-1.cfg
> new file mode 100644
> index 000..df75e1d
> --- /dev/null
> +++ b/source-builder/config/epics-7.0-1.cfg
> @@ -0,0 +1,65 @@
> +#
> +# EPICS 7.x.x Version 1.
why x.x? should it be 7.0?

> +#
> +# This configuration file configure's, make's and install's EPICS.
> +#
> +
> +%if %{release} == %{nil}
> +%define release 1
> +%endif
> +
> +%define epics_version 7.0
> +
> +Name:  epics-base-%{epics_version}-%{_host}-%{release}
> +Summary:   EPICS v%{epics_version} for target %{_target} on host %{_host}
> +Version:   %{epics_version}
> +Release:   %{release}
> +URL: https://epics-controls.org/
> +
> +#
> +# Source
> +#
> +%source set epics-base 
> https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
> +
> +#
> +# Prepare the source code.
> +#
> +%prep
> +  build_top=$(pwd)
> +
> +  source_dir_epics="epics-base-%{epics_version}"
> +
> +  %source setup epics-base -q -n source_dir_epics
does this work? I would think it needs a variable expansion like % or $.

> +
> +  cd ${build_top}
> +
> +%build
> +  build_top=$(pwd)
> +
> +  cd source_dir_epics
ditto.  Did you test this patch before sending it?

> +
> +  %{build_build_flags}
> +
> +  #
> +  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using
> +  # --with-rtems-bsp
> +  #
> +  %{__make} RTEMS_BASE=%{_prefix} \
> +  RTEMS_VERSION=%{rtems_version} \
> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
> +
> +  cd ${build_top}
> +
> +#%install
> +  build_top=$(pwd)
> +
> +  %{__rmdir} $SB_BUILD_ROOT
> +
> +  cd source_dir_epics
> +
> +  %{__make} DESTDIR=$SB_BUILD_ROOT \
> +  RTEMS_BASE=%{_prefix} \
> +  RTEMS_VERSION=%{rtems_version} \
> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
> +
> +  cd ${build_top}
> --
> 2.25.1
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] Adding EPICS7 Package to RSB

2020-08-27 Thread Mritunjay Sharma


Thanks, on it, sending it in a while.

Mritunjay

From: Gedare Bloom 
Sent: Friday, August 28, 2020 12:24:26 AM
To: Mritunjay Sharma 
Cc: devel@rtems.org ; Chris Johns ; Heinz 
Junkes 
Subject: Re: [PATCH] Adding EPICS7 Package to RSB

On Thu, Aug 27, 2020 at 11:48 AM Mritunjay Sharma
 wrote:
>
> Made suggested changes
> Please review.
>
> Adding EPICS7 Package to RSB
>
> Adding EPICS7 Package to RSB:Fixed minor changes

combine the commit message into what you would like it to say when it
gets pushed.

>
> Signed-off-by: Mritunjay Sharma 

We don't use sign-off for RTEMS repos.

> ---
>  rtems/config/epics/epics-7.0-1.cfg| 21 +
>  rtems/config/epics/epics-base.bset| 14 ++
>  source-builder/config/epics-7.0-1.cfg | 65 +++
>  3 files changed, 100 insertions(+)
>  create mode 100644 rtems/config/epics/epics-7.0-1.cfg
>  create mode 100644 rtems/config/epics/epics-base.bset
>  create mode 100644 source-builder/config/epics-7.0-1.cfg
>
> diff --git a/rtems/config/epics/epics-7.0-1.cfg 
> b/rtems/config/epics/epics-7.0-1.cfg
> new file mode 100644
> index 000..34270ee
> --- /dev/null
> +++ b/rtems/config/epics/epics-7.0-1.cfg
> @@ -0,0 +1,21 @@
> +#
> +# EPICS 7.0
> +#
> +
> +%if %{release} == %{nil}
> + %define release 1
> +%endif
> +
> +%include %{_configdir}/rtems-bsp.cfg
> +
> +#
> +# EPICS Version
> +#
> +%define epics_version 7.0
> +
> +%hash sha512 epics-base-%{epics_version}.tar.gz 
> 63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
> +
> +#
> +# EPICS Build configuration
> +#
> +%include %{_configdir}/epics-7.0-1.cfg
> diff --git a/rtems/config/epics/epics-base.bset 
> b/rtems/config/epics/epics-base.bset
> new file mode 100644
> index 000..7ee3815
> --- /dev/null
> +++ b/rtems/config/epics/epics-base.bset
> @@ -0,0 +1,14 @@
> +#
> +# Build set for EPICS
> +#
> +%define release 1
> +
> +#
> +# The RTEMS Package defines
> +#
> +%include rtems-package.bset
> +
> +#
> +# Build EPICS.
> +#
> +epics/epics-7.0-1
> diff --git a/source-builder/config/epics-7.0-1.cfg 
> b/source-builder/config/epics-7.0-1.cfg
> new file mode 100644
> index 000..df75e1d
> --- /dev/null
> +++ b/source-builder/config/epics-7.0-1.cfg
> @@ -0,0 +1,65 @@
> +#
> +# EPICS 7.x.x Version 1.
why x.x? should it be 7.0?

> +#
> +# This configuration file configure's, make's and install's EPICS.
> +#
> +
> +%if %{release} == %{nil}
> +%define release 1
> +%endif
> +
> +%define epics_version 7.0
> +
> +Name:  epics-base-%{epics_version}-%{_host}-%{release}
> +Summary:   EPICS v%{epics_version} for target %{_target} on host %{_host}
> +Version:   %{epics_version}
> +Release:   %{release}
> +URL: https://epics-controls.org/
> +
> +#
> +# Source
> +#
> +%source set epics-base 
> https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
> +
> +#
> +# Prepare the source code.
> +#
> +%prep
> +  build_top=$(pwd)
> +
> +  source_dir_epics="epics-base-%{epics_version}"
> +
> +  %source setup epics-base -q -n source_dir_epics
does this work? I would think it needs a variable expansion like % or $.

> +
> +  cd ${build_top}
> +
> +%build
> +  build_top=$(pwd)
> +
> +  cd source_dir_epics
ditto.  Did you test this patch before sending it?

> +
> +  %{build_build_flags}
> +
> +  #
> +  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using
> +  # --with-rtems-bsp
> +  #
> +  %{__make} RTEMS_BASE=%{_prefix} \
> +  RTEMS_VERSION=%{rtems_version} \
> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
> +
> +  cd ${build_top}
> +
> +#%install
> +  build_top=$(pwd)
> +
> +  %{__rmdir} $SB_BUILD_ROOT
> +
> +  cd source_dir_epics
> +
> +  %{__make} DESTDIR=$SB_BUILD_ROOT \
> +  RTEMS_BASE=%{_prefix} \
> +  RTEMS_VERSION=%{rtems_version} \
> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
> +
> +  cd ${build_top}
> --
> 2.25.1
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH] Adding EPICS7 Package to RSB

2020-08-27 Thread Mritunjay Sharma

Added commit message and removed Signed off
Please review. 

Adding EPICS7 Package to RSB for Building it with RTEMS

---
 rtems/config/epics/epics-7.0-1.cfg| 21 +
 rtems/config/epics/epics-base.bset| 14 ++
 source-builder/config/epics-7.0-1.cfg | 65 +++
 3 files changed, 100 insertions(+)
 create mode 100644 rtems/config/epics/epics-7.0-1.cfg
 create mode 100644 rtems/config/epics/epics-base.bset
 create mode 100644 source-builder/config/epics-7.0-1.cfg

diff --git a/rtems/config/epics/epics-7.0-1.cfg 
b/rtems/config/epics/epics-7.0-1.cfg
new file mode 100644
index 000..34270ee
--- /dev/null
+++ b/rtems/config/epics/epics-7.0-1.cfg
@@ -0,0 +1,21 @@
+#
+# EPICS 7.0
+#
+
+%if %{release} == %{nil}
+ %define release 1
+%endif
+
+%include %{_configdir}/rtems-bsp.cfg
+
+#
+# EPICS Version
+#
+%define epics_version 7.0
+
+%hash sha512 epics-base-%{epics_version}.tar.gz 
63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
+
+#
+# EPICS Build configuration
+#
+%include %{_configdir}/epics-7.0-1.cfg
diff --git a/rtems/config/epics/epics-base.bset 
b/rtems/config/epics/epics-base.bset
new file mode 100644
index 000..7ee3815
--- /dev/null
+++ b/rtems/config/epics/epics-base.bset
@@ -0,0 +1,14 @@
+#
+# Build set for EPICS
+#
+%define release 1
+
+#
+# The RTEMS Package defines
+#
+%include rtems-package.bset
+
+#
+# Build EPICS.
+#
+epics/epics-7.0-1
diff --git a/source-builder/config/epics-7.0-1.cfg 
b/source-builder/config/epics-7.0-1.cfg
new file mode 100644
index 000..df75e1d
--- /dev/null
+++ b/source-builder/config/epics-7.0-1.cfg
@@ -0,0 +1,65 @@
+#
+# EPICS 7.x.x Version 1.
+#
+# This configuration file configure's, make's and install's EPICS.
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%define epics_version 7.0
+
+Name:  epics-base-%{epics_version}-%{_host}-%{release}
+Summary:   EPICS v%{epics_version} for target %{_target} on host %{_host}
+Version:   %{epics_version}
+Release:   %{release}
+URL: https://epics-controls.org/
+
+#
+# Source
+#
+%source set epics-base 
https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
+
+#
+# Prepare the source code.
+#
+%prep
+  build_top=$(pwd)
+
+  source_dir_epics="epics-base-%{epics_version}"
+
+  %source setup epics-base -q -n source_dir_epics
+
+  cd ${build_top}
+
+%build
+  build_top=$(pwd)
+
+  cd source_dir_epics
+
+  %{build_build_flags}
+
+  #
+  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using
+  # --with-rtems-bsp
+  #
+  %{__make} RTEMS_BASE=%{_prefix} \
+  RTEMS_VERSION=%{rtems_version} \
+  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
+
+  cd ${build_top}
+
+#%install
+  build_top=$(pwd)
+
+  %{__rmdir} $SB_BUILD_ROOT
+
+  cd source_dir_epics
+
+  %{__make} DESTDIR=$SB_BUILD_ROOT \
+  RTEMS_BASE=%{_prefix} \
+  RTEMS_VERSION=%{rtems_version} \
+  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
+
+  cd ${build_top}
-- 
2.25.1

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] Adding EPICS7 Package to RSB

2020-08-27 Thread Mritunjay Sharma

[UPDATE]: My humble apologies as that patch had a problem. I forgot to add
$ before the variable {source_dir_epics}
which was causing the build to fail. Please ignore the above patch.

I am sending the new tested patch again. Apologies for this inconvenience.

Thanks
Mritunjay Kumar Sharma


On Fri, Aug 28, 2020 at 12:30 AM Mritunjay Sharma <
mritunjaysharma...@gmail.com> wrote:

> Added commit message and removed Signed off
> Please review.
>
> Adding EPICS7 Package to RSB for Building it with RTEMS
>
> ---
>  rtems/config/epics/epics-7.0-1.cfg| 21 +
>  rtems/config/epics/epics-base.bset| 14 ++
>  source-builder/config/epics-7.0-1.cfg | 65 +++
>  3 files changed, 100 insertions(+)
>  create mode 100644 rtems/config/epics/epics-7.0-1.cfg
>  create mode 100644 rtems/config/epics/epics-base.bset
>  create mode 100644 source-builder/config/epics-7.0-1.cfg
>
> diff --git a/rtems/config/epics/epics-7.0-1.cfg
> b/rtems/config/epics/epics-7.0-1.cfg
> new file mode 100644
> index 000..34270ee
> --- /dev/null
> +++ b/rtems/config/epics/epics-7.0-1.cfg
> @@ -0,0 +1,21 @@
> +#
> +# EPICS 7.0
> +#
> +
> +%if %{release} == %{nil}
> + %define release 1
> +%endif
> +
> +%include %{_configdir}/rtems-bsp.cfg
> +
> +#
> +# EPICS Version
> +#
> +%define epics_version 7.0
> +
> +%hash sha512 epics-base-%{epics_version}.tar.gz
> 63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
> +
> +#
> +# EPICS Build configuration
> +#
> +%include %{_configdir}/epics-7.0-1.cfg
> diff --git a/rtems/config/epics/epics-base.bset
> b/rtems/config/epics/epics-base.bset
> new file mode 100644
> index 000..7ee3815
> --- /dev/null
> +++ b/rtems/config/epics/epics-base.bset
> @@ -0,0 +1,14 @@
> +#
> +# Build set for EPICS
> +#
> +%define release 1
> +
> +#
> +# The RTEMS Package defines
> +#
> +%include rtems-package.bset
> +
> +#
> +# Build EPICS.
> +#
> +epics/epics-7.0-1
> diff --git a/source-builder/config/epics-7.0-1.cfg
> b/source-builder/config/epics-7.0-1.cfg
> new file mode 100644
> index 000..df75e1d
> --- /dev/null
> +++ b/source-builder/config/epics-7.0-1.cfg
> @@ -0,0 +1,65 @@
> +#
> +# EPICS 7.x.x Version 1.
> +#
> +# This configuration file configure's, make's and install's EPICS.
> +#
> +
> +%if %{release} == %{nil}
> +%define release 1
> +%endif
> +
> +%define epics_version 7.0
> +
> +Name:  epics-base-%{epics_version}-%{_host}-%{release}
> +Summary:   EPICS v%{epics_version} for target %{_target} on host %{_host}
> +Version:   %{epics_version}
> +Release:   %{release}
> +URL: https://epics-controls.org/
> +
> +#
> +# Source
> +#
> +%source set epics-base
> https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
> +
> +#
> +# Prepare the source code.
> +#
> +%prep
> +  build_top=$(pwd)
> +
> +  source_dir_epics="epics-base-%{epics_version}"
> +
> +  %source setup epics-base -q -n source_dir_epics
> +
> +  cd ${build_top}
> +
> +%build
> +  build_top=$(pwd)
> +
> +  cd source_dir_epics
> +
> +  %{build_build_flags}
> +
> +  #
> +  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using
> +  # --with-rtems-bsp
> +  #
> +  %{__make} RTEMS_BASE=%{_prefix} \
> +  RTEMS_VERSION=%{rtems_version} \
> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
> +
> +  cd ${build_top}
> +
> +#%install
> +  build_top=$(pwd)
> +
> +  %{__rmdir} $SB_BUILD_ROOT
> +
> +  cd source_dir_epics
> +
> +  %{__make} DESTDIR=$SB_BUILD_ROOT \
> +  RTEMS_BASE=%{_prefix} \
> +  RTEMS_VERSION=%{rtems_version} \
> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
> +
> +  cd ${build_top}
> --
> 2.25.1
>
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH] rsb: Adding EPICS7 Package to RTEMS RSB

2020-08-27 Thread Mritunjay Sharma

rsb: Adding EPICS7 Package to RTEMS RSB
---
 rtems/config/epics/epics-7.0-1.cfg| 21 +
 rtems/config/epics/epics-base.bset| 14 ++
 source-builder/config/epics-7.0-1.cfg | 65 +++
 3 files changed, 100 insertions(+)
 create mode 100644 rtems/config/epics/epics-7.0-1.cfg
 create mode 100644 rtems/config/epics/epics-base.bset
 create mode 100644 source-builder/config/epics-7.0-1.cfg

diff --git a/rtems/config/epics/epics-7.0-1.cfg 
b/rtems/config/epics/epics-7.0-1.cfg
new file mode 100644
index 000..34270ee
--- /dev/null
+++ b/rtems/config/epics/epics-7.0-1.cfg
@@ -0,0 +1,21 @@
+#
+# EPICS 7.0
+#
+
+%if %{release} == %{nil}
+ %define release 1
+%endif
+
+%include %{_configdir}/rtems-bsp.cfg
+
+#
+# EPICS Version
+#
+%define epics_version 7.0
+
+%hash sha512 epics-base-%{epics_version}.tar.gz 
63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
+
+#
+# EPICS Build configuration
+#
+%include %{_configdir}/epics-7.0-1.cfg
diff --git a/rtems/config/epics/epics-base.bset 
b/rtems/config/epics/epics-base.bset
new file mode 100644
index 000..7ee3815
--- /dev/null
+++ b/rtems/config/epics/epics-base.bset
@@ -0,0 +1,14 @@
+#
+# Build set for EPICS
+#
+%define release 1
+
+#
+# The RTEMS Package defines
+#
+%include rtems-package.bset
+
+#
+# Build EPICS.
+#
+epics/epics-7.0-1
diff --git a/source-builder/config/epics-7.0-1.cfg 
b/source-builder/config/epics-7.0-1.cfg
new file mode 100644
index 000..c255dc3
--- /dev/null
+++ b/source-builder/config/epics-7.0-1.cfg
@@ -0,0 +1,65 @@
+#
+# EPICS 7.x.x Version 1.
+#
+# This configuration file configure's, make's and install's EPICS.
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%define epics_version 7.0
+
+Name:  epics-base-%{epics_version}-%{_host}-%{release}
+Summary:   EPICS v%{epics_version} for target %{_target} on host %{_host}
+Version:   %{epics_version}
+Release:   %{release}
+URL: https://epics-controls.org/
+
+#
+# Source
+#
+%source set epics-base 
https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
+
+#
+# Prepare the source code.
+#
+%prep
+  build_top=$(pwd)
+
+  source_dir_epics="epics-base-%{epics_version}"
+
+  %source setup epics-base -q -n ${source_dir_epics}
+
+  cd ${build_top}
+
+%build
+  build_top=$(pwd)
+
+  cd ${source_dir_epics}
+
+  %{build_build_flags}
+
+  #
+  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using
+  # --with-rtems-bsp
+  #
+  %{__make} RTEMS_BASE=%{_prefix} \
+  RTEMS_VERSION=%{rtems_version} \
+  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
+
+  cd ${build_top}
+
+#%install
+  build_top=$(pwd)
+
+  %{__rmdir} $SB_BUILD_ROOT
+
+  cd ${source_dir_epics}
+
+  %{__make} DESTDIR=$SB_BUILD_ROOT \
+  RTEMS_BASE=%{_prefix} \
+  RTEMS_VERSION=%{rtems_version} \
+  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
+
+  cd ${build_top}
-- 
2.25.1

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] Adding EPICS7 Package to RSB

2020-08-27 Thread Mritunjay Sharma

I have sent the tested patch and it can be found here:
https://lists.rtems.org/pipermail/devel/2020-August/061655.html.

Please do review.
Thank you so much and apologies again for the mistake.

Mritunjay Sharma

On Fri, Aug 28, 2020 at 3:21 AM Mritunjay Sharma <
mritunjaysharma...@gmail.com> wrote:

> [UPDATE]: My humble apologies as that patch had a problem. I forgot to add
> $ before the variable {source_dir_epics}
> which was causing the build to fail. Please ignore the above patch.
>
> I am sending the new tested patch again. Apologies for this inconvenience.
>
> Thanks
> Mritunjay Kumar Sharma
>
>
> On Fri, Aug 28, 2020 at 12:30 AM Mritunjay Sharma <
> mritunjaysharma...@gmail.com> wrote:
>
>> Added commit message and removed Signed off
>> Please review.
>>
>> Adding EPICS7 Package to RSB for Building it with RTEMS
>>
>> ---
>>  rtems/config/epics/epics-7.0-1.cfg| 21 +
>>  rtems/config/epics/epics-base.bset| 14 ++
>>  source-builder/config/epics-7.0-1.cfg | 65 +++
>>  3 files changed, 100 insertions(+)
>>  create mode 100644 rtems/config/epics/epics-7.0-1.cfg
>>  create mode 100644 rtems/config/epics/epics-base.bset
>>  create mode 100644 source-builder/config/epics-7.0-1.cfg
>>
>> diff --git a/rtems/config/epics/epics-7.0-1.cfg
>> b/rtems/config/epics/epics-7.0-1.cfg
>> new file mode 100644
>> index 000..34270ee
>> --- /dev/null
>> +++ b/rtems/config/epics/epics-7.0-1.cfg
>> @@ -0,0 +1,21 @@
>> +#
>> +# EPICS 7.0
>> +#
>> +
>> +%if %{release} == %{nil}
>> + %define release 1
>> +%endif
>> +
>> +%include %{_configdir}/rtems-bsp.cfg
>> +
>> +#
>> +# EPICS Version
>> +#
>> +%define epics_version 7.0
>> +
>> +%hash sha512 epics-base-%{epics_version}.tar.gz
>> 63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0
>> +
>> +#
>> +# EPICS Build configuration
>> +#
>> +%include %{_configdir}/epics-7.0-1.cfg
>> diff --git a/rtems/config/epics/epics-base.bset
>> b/rtems/config/epics/epics-base.bset
>> new file mode 100644
>> index 000..7ee3815
>> --- /dev/null
>> +++ b/rtems/config/epics/epics-base.bset
>> @@ -0,0 +1,14 @@
>> +#
>> +# Build set for EPICS
>> +#
>> +%define release 1
>> +
>> +#
>> +# The RTEMS Package defines
>> +#
>> +%include rtems-package.bset
>> +
>> +#
>> +# Build EPICS.
>> +#
>> +epics/epics-7.0-1
>> diff --git a/source-builder/config/epics-7.0-1.cfg
>> b/source-builder/config/epics-7.0-1.cfg
>> new file mode 100644
>> index 000..df75e1d
>> --- /dev/null
>> +++ b/source-builder/config/epics-7.0-1.cfg
>> @@ -0,0 +1,65 @@
>> +#
>> +# EPICS 7.x.x Version 1.
>> +#
>> +# This configuration file configure's, make's and install's EPICS.
>> +#
>> +
>> +%if %{release} == %{nil}
>> +%define release 1
>> +%endif
>> +
>> +%define epics_version 7.0
>> +
>> +Name:  epics-base-%{epics_version}-%{_host}-%{release}
>> +Summary:   EPICS v%{epics_version} for target %{_target} on host %{_host}
>> +Version:   %{epics_version}
>> +Release:   %{release}
>> +URL: https://epics-controls.org/
>> +
>> +#
>> +# Source
>> +#
>> +%source set epics-base
>> https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz
>> +
>> +#
>> +# Prepare the source code.
>> +#
>> +%prep
>> +  build_top=$(pwd)
>> +
>> +  source_dir_epics="epics-base-%{epics_version}"
>> +
>> +  %source setup epics-base -q -n source_dir_epics
>> +
>> +  cd ${build_top}
>> +
>> +%build
>> +  build_top=$(pwd)
>> +
>> +  cd source_dir_epics
>> +
>> +  %{build_build_flags}
>> +
>> +  #
>> +  # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION
>> using
>> +  # --with-rtems-bsp
>> +  #
>> +  %{__make} RTEMS_BASE=%{_prefix} \
>> +  RTEMS_VERSION=%{rtems_version} \
>> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
>> +
>> +  cd ${build_top}
>> +
>> +#%install
>> +  build_top=$(pwd)
>> +
>> +  %{__rmdir} $SB_BUILD_ROOT
>> +
>> +  cd source_dir_epics
>> +
>> +  %{__make} DESTDIR=$SB_BUILD_ROOT \
>> +  RTEMS_BASE=%{_prefix} \
>> +  RTEMS_VERSION=%{rtems_version} \
>> +  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
>> +
>> +  cd ${build_top}
>> --
>> 2.25.1
>>
>>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

GSoC 2020: Final Report for BSP Buildset For EPICS

2020-08-27 Thread Mritunjay Sharma

Hello everyone,

First of all, thank you so much to all the mentors
for being so supportive and helpful that helped me out
with this project.

I have tried to make a final report which is detailed and with my
code links. This is the link to my final report:
http://bit.ly/gsoc-2020-final-report

Please do a review and share your feedback and suggestions
for any improvements.

Thank you so much!
Mritunjay Sharma
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] sb: Fix the imports on Python2

2020-08-27 Thread Chris Johns

On 28/8/20 1:41 am, Gedare Bloom wrote:
> On Wed, Aug 26, 2020 at 11:54 PM  wrote:
>> From: Chris Johns 
>> diff --git a/source-builder/sb/__init__.py b/source-builder/sb/__init__.py
>> new file mode 100644
>> index 000..c4275e2
>> --- /dev/null
>> +++ b/source-builder/sb/__init__.py
>> @@ -0,0 +1,20 @@
>> +#
>> +# RTEMS Tools Project (http://www.rtems.org/)
>> +# Copyright 2020 Chris Johns (chr...@rtems.org)
>> +# All rights reserved.
>> +#
>> +# This file is part of the RTEMS Tools package in 'rtems-tools'.
>> +#
>> +# Permission to use, copy, modify, and/or distribute this software for any
>> +# purpose with or without fee is hereby granted, provided that the above
>> +# copyright notice and this permission notice appear in all copies.
>> +#
>> +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
>> +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
>> +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
>> +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
>> +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
>> +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
>> +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>> +
> This doesn't follow the template. I guess probably it uses what is in
> other rtems-tools files though.
> https://docs.rtems.org/branches/master/eng/coding-file-hdr.html#python-file-template

Yes it is consistent with the other RSB files and I think this is fine until the
whole of the RSB is moved. I am fine with a RSB license changing but the repo
should be audited before that happens. Please take this as a positive yes from
me to have the license changed.

All the code needs to be moved over to the coding standard via the formatting
tools and I would like to move the option handling to the standard argparse
support. I would love to be able to spend time on this task but other tasks are
more pressing.

> 
> This is MIT license?
>

I think it is called a Zero-Caluse BSD license...

https://opensource.org/licenses/0BSD

I did this before I knew such a license was documented.

Chris
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] tester: Change to a simpler TFTP server

2020-08-27 Thread Chris Johns

On 28/8/20 1:44 am, Gedare Bloom wrote:
> On Wed, Aug 26, 2020 at 10:56 PM  wrote:
>>
>> From: Chris Johns 
>>
>> - Add a simpler TFTP to allow parallel test hardware
>>
>> - Remove the imported tftpy server
>>
>> Closes #4063
>> ---
>>  tester/rt/tftp.py|  37 +-
>>  tester/rt/tftpserver.py  | 619 +++
>>  tester/rt/tftpy/COPYING  |  21 -
>>  tester/rt/tftpy/README   | 115 -
>>  tester/rt/tftpy/TftpClient.py| 107 -
>>  tester/rt/tftpy/TftpContexts.py  | 429 ---
>>  tester/rt/tftpy/TftpPacketFactory.py |  47 --
>>  tester/rt/tftpy/TftpPacketTypes.py   | 494 -
>>  tester/rt/tftpy/TftpServer.py| 271 
>>  tester/rt/tftpy/TftpShared.py|  52 ---
>>  tester/rt/tftpy/TftpStates.py| 611 --
>>  tester/rt/tftpy/__init__.py  |  27 --
>>  tester/rtems-tftp-server |  46 ++
>>  13 files changed, 685 insertions(+), 2191 deletions(-)
>>  create mode 100644 tester/rt/tftpserver.py
>>  delete mode 100644 tester/rt/tftpy/COPYING
>>  delete mode 100644 tester/rt/tftpy/README
>>  delete mode 100644 tester/rt/tftpy/TftpClient.py
>>  delete mode 100644 tester/rt/tftpy/TftpContexts.py
>>  delete mode 100644 tester/rt/tftpy/TftpPacketFactory.py
>>  delete mode 100644 tester/rt/tftpy/TftpPacketTypes.py
>>  delete mode 100644 tester/rt/tftpy/TftpServer.py
>>  delete mode 100644 tester/rt/tftpy/TftpShared.py
>>  delete mode 100644 tester/rt/tftpy/TftpStates.py
>>  delete mode 100644 tester/rt/tftpy/__init__.py
>>  create mode 100755 tester/rtems-tftp-server
>>
>> diff --git a/tester/rt/tftp.py b/tester/rt/tftp.py
>> index d518036..46a1d11 100644
>> --- a/tester/rt/tftp.py
>> +++ b/tester/rt/tftp.py
>> @@ -43,7 +43,7 @@ import sys
>>  from rtemstoolkit import error
>>  from rtemstoolkit import reraise
>>
>> -import tftpy
>> +import tftpserver
>>
>>  class tftp(object):
>>  '''RTEMS Testing TFTP base.'''
>> @@ -88,7 +88,7 @@ class tftp(object):
>>  def _stop(self):
>>  try:
>>  if self.server:
>> -self.server.stop(now = True)
>> +self.server.stop()
>>  except:
>>  pass
>>
>> @@ -101,6 +101,10 @@ class tftp(object):
>>
>>  def _timeout(self):
>>  self._stop()
>> +while self.running or not self.finished:
>> +self._unlock('_timeout')
>> +time.sleep(0.1)
>> +self._lock('_timeout')
>>  if self.timeout is not None:
>>  self.timeout()
>>
>> @@ -119,22 +123,21 @@ class tftp(object):
>>  return None
>>
>>  def _listener(self):
>> -tftpy_log = logging.getLogger('tftpy')
>> -tftpy_log.setLevel(100)
>> +self._lock('_listener')
>> +exe = self.exe
>> +self.exe = None
>> +self._unlock('_listener')
>> +self.server = tftpserver.tftp_server(host = 'all',
>> + port = self.port,
>> + timeout = 1,
>> + forced_file = exe,
>> + sessions = 1)
>>  try:
>> -self.server = tftpy.TftpServer(tftproot = '.',
>> -   dyn_file_func = self._exe_handle)
>> -except tftpy.TftpException as te:
>> -raise error.general('tftp: %s' % (str(te)))
>> -if self.server is not None:
>> -try:
>> -self.server.listen('0.0.0.0', self.port, 0.5)
>> -except tftpy.TftpException as te:
>> -raise error.general('tftp: %s' % (str(te)))
>> -except IOError as ie:
>> -if ie.errno == errno.EACCES:
>> -raise error.general('tftp: permissions error: check 
>> tftp server port')
>> -raise error.general('tftp: io error: %s' % (str(ie)))
>> +self.server.start()
>> +self.server.run()
>> +except:
>> +self.server.stop()
>> +raise
>>
>>  def _runner(self):
>>  self._lock('_runner')
>> diff --git a/tester/rt/tftpserver.py b/tester/rt/tftpserver.py
>> new file mode 100644
>> index 000..b307bd2
>> --- /dev/null
>> +++ b/tester/rt/tftpserver.py
>> @@ -0,0 +1,619 @@
>> +#
>> +# Copyright 2020 Chris Johns (chris@contemporary.software)
> Nice email.

Oh haha I had not noticed this was in the file.

> 
>> +# All rights reserved.
>> +#
>> +# Permission to use, copy, modify, and/or distribute this software for any
>> +# purpose with or without fee is hereby granted, provided that the above
>> +# copyright notice and this permission notice appear in all copies.
>> +#
>> +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
>> +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
>> +# MERCHANTABILITY AND FIT

GSoC 2020 - Final project report

2020-08-27 Thread Utkarsh Rai

Hello,
I have prepared a tentative final report for my project. You can view it
here
.
Note there are few changes to be made in the report based on my progress
this week as I am working on static initialization of PMP and the v5 patch
for thread-stack isolation and sharing.
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH] Adding EPICS7 Package to RSB

Re: [PATCH] Adding EPICS7 Package to RSB

Re: [PATCH v5] Pre-Release Strong-APA

Re: [PATCH] sb: Use shebang env python

Re: [PATCH] sb: Fix the imports on Python2

Re: [PATCH v2] Adding EPICS7 Package to RSB

Re: [PATCH v2] Adding EPICS7 Package to RSB

[PATCH] Adding EPICS7 Package to RSB

Re: [PATCH] Adding EPICS7 Package to RSB

Re: [PATCH] Adding EPICS7 Package to RSB

[PATCH] Adding EPICS7 Package to RSB

Re: [PATCH] Adding EPICS7 Package to RSB

[PATCH] rsb: Adding EPICS7 Package to RTEMS RSB

Re: [PATCH] Adding EPICS7 Package to RSB

GSoC 2020: Final Report for BSP Buildset For EPICS

Re: [PATCH] sb: Fix the imports on Python2

Re: [PATCH] tester: Change to a simpler TFTP server

GSoC 2020 - Final project report

18 matches

Site Navigation

Mail list logo

Footer information