Re: [PATCH] Adding EPICS7 Package to RSB
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
Re: [PATCH] Adding EPICS7 Package to RSB
[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
Re: [PATCH] Adding EPICS7 Package to RSB
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
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
Re: [PATCH] Adding EPICS7 Package to RSB
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] Adding EPICS7 Package to RSB
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
On Thu, Aug 27, 2020 at 3:04 AM Mritunjay Sharma <
mritunjaysharma...@gmail.com> wrote:
> Thank you so much for taking time to review the PATCH.
>
> On Wed, Aug 26, 2020 at 8:56 PM Gedare Bloom wrote:
>
>> On Tue, Aug 25, 2020 at 4:36 PM Mritunjay Sharma
>> wrote:
>> >
>> > This patch add supports for EPICS7 Package to RTEMS RSB.
>> > Signed-off-by: Mritunjay Sharma
>> > ---
>> > rtems/config/epics/epics-7-1.cfg| 22 +++
>> > rtems/config/epics/epics-base.bset | 26 +
>> > source-builder/config/epics-7-1.cfg | 57 +
>> > 3 files changed, 105 insertions(+)
>> > create mode 100644 rtems/config/epics/epics-7-1.cfg
>> > create mode 100644 rtems/config/epics/epics-base.bset
>> > create mode 100644 source-builder/config/epics-7-1.cfg
>> >
>> > diff --git a/rtems/config/epics/epics-7-1.cfg
>> b/rtems/config/epics/epics-7-1.cfg
>> > new file mode 100644
>> > index 000..30ed9cb
>> > --- /dev/null
>> > +++ b/rtems/config/epics/epics-7-1.cfg
>>
>> should this file be epics-7.0-1.cfg?
>>
>> Yes, thanks for highlighting it. Fixed this.
>
>
>> > @@ -0,0 +1,22 @@
>> > +#
>> > +# EPICS 7
>> 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
>> > +
>> > +#
>> > +#
>> Only one blank comment line.
>>
>> Fixed.
>
>
>> > +# EPICS Build configuration
>> > +#
>> > +%include %{_configdir}/epics-7-1.cfg
>> > diff --git a/rtems/config/epics/epics-base.bset
>> b/rtems/config/epics/epics-base.bset
>> > new file mode 100644
>> > index 000..e56fc6a
>> > --- /dev/null
>> > +++ b/rtems/config/epics/epics-base.bset
>> > @@ -0,0 +1,26 @@
>> > +#
>> > +# Build set for EPICS
>> > +#
>> > +
>> > +%define release 1
>> > +
>> > +#
>> > +# RTEMS Version
>> > +#
>> > +%define rtems_version 5
>>
>> is this correct?
>>
>> Do you want to apply this to the 5 branch of rsb?
>>
>> I have removed this line.
>
>
>> > +
>> > +#
>> > +# The RTEMS URL paths.
>> > +#
>> > +%include rtems-urls.bset
>> > +
>> > +#
>> > +# The RTEMS Package defines
>> > +#
>> > +%include rtems-package.bset
>> > +
>> > +
>> 1 blank line only
>>
>
> Fixed.
>
>
>>
>> > +#
>> > +# Build EPICS.
>> > +#
>> > +epics/epics-7-1 .
>> Stray . ?
>>
>
> If I was not using '.' and I was simply using, the build failed, in the
> beginning, itself with the following error:
> `Build Set: epics/epics-base
> error: epics/epics-base:15: cannot find file: epics/epics-7.0-1.cf `
>
[UPDATE]: Removed the '.' The above error was due to missing space after
line 15. On adding space, it was resolved.
>
> The command I am entering is: `/source-builder/sb-set-builder
> --with-rtems-bsp="xilinx_zynq_a9_qemu" --log=log_epics epics/epics-base
> --trace --prefix=$HOME/development/rtems/5-arm --host=arm-rtems5`
>
>>
>> > \ No newline at end of file
>> > diff --git a/source-builder/config/epics-7-1.cfg
>> b/source-builder/config/epics-7-1.cfg
>> > new file mode 100644
>> > index 000..2a52ea5
>> > --- /dev/null
>> > +++ b/source-builder/config/epics-7-1.cfg
>> > @@ -0,0 +1,57 @@
>> > +#
>> > +# 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.mpg.de/
>> This doesn't look like the right url.
>>
>
> I cross-checked and it seems to be working.
>
>>
>> > +
>> > +#
>> > +# 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.
>
>>
>> > +
>> > +#
>> > +# Prepare the source code.
>> > +#
>> > +%prep
>> > + build_top=$(pwd)
>> > +
>> > + source_dir_epics="epics-base-%{epics_version}"
>> > +
>> > + %source setup epics-base -q -n epics-base-%{epics_version}
>> I'm curious, can you use the source_dir_epics variable here?
>
>
> I didn't see any affect not using `source_dir_epics variable `. This time
> I used `cd epics-base-%{epics_version}`
> and saw no changes as such. What do you suggest to use?
>
>>
>> > +
>> > + cd ${build_top}
>> > +
>> > +%build
>> > + build_top=$(pwd)
>> > +
>> > + cd ${source_dir_epics}
>> > +
>> > + %{build_build_flags}
>> > +
>> > + #
>> > + # Using macros
Re: [PATCH] Adding EPICS7 Package to RSB
Thank you so much for taking time to review the PATCH.
On Wed, Aug 26, 2020 at 8:56 PM Gedare Bloom wrote:
> On Tue, Aug 25, 2020 at 4:36 PM Mritunjay Sharma
> wrote:
> >
> > This patch add supports for EPICS7 Package to RTEMS RSB.
> > Signed-off-by: Mritunjay Sharma
> > ---
> > rtems/config/epics/epics-7-1.cfg| 22 +++
> > rtems/config/epics/epics-base.bset | 26 +
> > source-builder/config/epics-7-1.cfg | 57 +
> > 3 files changed, 105 insertions(+)
> > create mode 100644 rtems/config/epics/epics-7-1.cfg
> > create mode 100644 rtems/config/epics/epics-base.bset
> > create mode 100644 source-builder/config/epics-7-1.cfg
> >
> > diff --git a/rtems/config/epics/epics-7-1.cfg
> b/rtems/config/epics/epics-7-1.cfg
> > new file mode 100644
> > index 000..30ed9cb
> > --- /dev/null
> > +++ b/rtems/config/epics/epics-7-1.cfg
>
> should this file be epics-7.0-1.cfg?
>
> Yes, thanks for highlighting it. Fixed this.
> > @@ -0,0 +1,22 @@
> > +#
> > +# EPICS 7
> 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
> > +
> > +#
> > +#
> Only one blank comment line.
>
> Fixed.
> > +# EPICS Build configuration
> > +#
> > +%include %{_configdir}/epics-7-1.cfg
> > diff --git a/rtems/config/epics/epics-base.bset
> b/rtems/config/epics/epics-base.bset
> > new file mode 100644
> > index 000..e56fc6a
> > --- /dev/null
> > +++ b/rtems/config/epics/epics-base.bset
> > @@ -0,0 +1,26 @@
> > +#
> > +# Build set for EPICS
> > +#
> > +
> > +%define release 1
> > +
> > +#
> > +# RTEMS Version
> > +#
> > +%define rtems_version 5
>
> is this correct?
>
> Do you want to apply this to the 5 branch of rsb?
>
> I have removed this line.
> > +
> > +#
> > +# The RTEMS URL paths.
> > +#
> > +%include rtems-urls.bset
> > +
> > +#
> > +# The RTEMS Package defines
> > +#
> > +%include rtems-package.bset
> > +
> > +
> 1 blank line only
>
Fixed.
>
> > +#
> > +# Build EPICS.
> > +#
> > +epics/epics-7-1 .
> Stray . ?
>
If I was not using '.' and I was simply using, the build failed, in the
beginning, itself with the following error:
`Build Set: epics/epics-base
error: epics/epics-base:15: cannot find file: epics/epics-7.0-1.cf `
The command I am entering is: `/source-builder/sb-set-builder
--with-rtems-bsp="xilinx_zynq_a9_qemu" --log=log_epics epics/epics-base
--trace --prefix=$HOME/development/rtems/5-arm --host=arm-rtems5`
>
> > \ No newline at end of file
> > diff --git a/source-builder/config/epics-7-1.cfg
> b/source-builder/config/epics-7-1.cfg
> > new file mode 100644
> > index 000..2a52ea5
> > --- /dev/null
> > +++ b/source-builder/config/epics-7-1.cfg
> > @@ -0,0 +1,57 @@
> > +#
> > +# 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.mpg.de/
> This doesn't look like the right url.
>
I cross-checked and it seems to be working.
>
> > +
> > +#
> > +# 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.
>
> > +
> > +#
> > +# Prepare the source code.
> > +#
> > +%prep
> > + build_top=$(pwd)
> > +
> > + source_dir_epics="epics-base-%{epics_version}"
> > +
> > + %source setup epics-base -q -n epics-base-%{epics_version}
> I'm curious, can you use the source_dir_epics variable here?
I didn't see any affect not using `source_dir_epics variable `. This time
I used `cd epics-base-%{epics_version}`
and saw no changes as such. What do you suggest to use?
>
> > +
> > + 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}
>
> Can you line break this to under 80 characters? might need to use
> backslashes \
>
Fixed.
>
> I guess EPICS is normally built from within its source tree? Just want
> to be sure. I haven't built it in awhile
Re: [PATCH] Adding EPICS7 Package to RSB
On Tue, Aug 25, 2020 at 4:36 PM Mritunjay Sharma
wrote:
>
> This patch add supports for EPICS7 Package to RTEMS RSB.
> Signed-off-by: Mritunjay Sharma
> ---
> rtems/config/epics/epics-7-1.cfg| 22 +++
> rtems/config/epics/epics-base.bset | 26 +
> source-builder/config/epics-7-1.cfg | 57 +
> 3 files changed, 105 insertions(+)
> create mode 100644 rtems/config/epics/epics-7-1.cfg
> create mode 100644 rtems/config/epics/epics-base.bset
> create mode 100644 source-builder/config/epics-7-1.cfg
>
> diff --git a/rtems/config/epics/epics-7-1.cfg
> b/rtems/config/epics/epics-7-1.cfg
> new file mode 100644
> index 000..30ed9cb
> --- /dev/null
> +++ b/rtems/config/epics/epics-7-1.cfg
should this file be epics-7.0-1.cfg?
> @@ -0,0 +1,22 @@
> +#
> +# EPICS 7
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
> +
> +#
> +#
Only one blank comment line.
> +# EPICS Build configuration
> +#
> +%include %{_configdir}/epics-7-1.cfg
> diff --git a/rtems/config/epics/epics-base.bset
> b/rtems/config/epics/epics-base.bset
> new file mode 100644
> index 000..e56fc6a
> --- /dev/null
> +++ b/rtems/config/epics/epics-base.bset
> @@ -0,0 +1,26 @@
> +#
> +# Build set for EPICS
> +#
> +
> +%define release 1
> +
> +#
> +# RTEMS Version
> +#
> +%define rtems_version 5
is this correct?
Do you want to apply this to the 5 branch of rsb?
> +
> +#
> +# The RTEMS URL paths.
> +#
> +%include rtems-urls.bset
> +
> +#
> +# The RTEMS Package defines
> +#
> +%include rtems-package.bset
> +
> +
1 blank line only
> +#
> +# Build EPICS.
> +#
> +epics/epics-7-1 .
Stray . ?
> \ No newline at end of file
> diff --git a/source-builder/config/epics-7-1.cfg
> b/source-builder/config/epics-7-1.cfg
> new file mode 100644
> index 000..2a52ea5
> --- /dev/null
> +++ b/source-builder/config/epics-7-1.cfg
> @@ -0,0 +1,57 @@
> +#
> +# 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.mpg.de/
This doesn't look like the right url.
> +
> +#
> +# 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?
> +
> +#
> +# Prepare the source code.
> +#
> +%prep
> + build_top=$(pwd)
> +
> + source_dir_epics="epics-base-%{epics_version}"
> +
> + %source setup epics-base -q -n epics-base-%{epics_version}
I'm curious, can you use the source_dir_epics variable here?
> +
> + 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}
Can you line break this to under 80 characters? might need to use backslashes \
I guess EPICS is normally built from within its source tree? Just want
to be sure. I haven't built it in awhile.
> +
> + cd ${build_top}
> +
> +%install
> + build_top=$(pwd)
> +
> + rm -rf $SB_BUILD_ROOT
I think there is %{__rmdir} command available
> +
> + cd ${source_dir_epics}
> + %{__make} DESTDIR=$SB_BUILD_ROOT RTEMS_BASE=%{_prefix}
> RTEMS_VERSION=%{rtems_version}
> CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}
also line breaks
> + cd ${build_top}
> --
> 2.25.1
>
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
