<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body>
<div dir="ltr">
<div></div>
<div data-ogsc="" style="">
<div dir="ltr"></div>
<br>
</div>
<div data-ogsc="" style="" dir="ltr">Thanks, on it, sending it in a while. </div>
<div data-ogsc="" style="" dir="ltr"><br>
</div>
<div data-ogsc="" style="" dir="ltr">Mritunjay </div>
</div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Gedare Bloom <gedare@rtems.org><br>
<b>Sent:</b> Friday, August 28, 2020 12:24:26 AM<br>
<b>To:</b> Mritunjay Sharma <mritunjaysharma394@gmail.com><br>
<b>Cc:</b> devel@rtems.org <devel@rtems.org>; Chris Johns <chrisj@rtems.org>; Heinz Junkes <junkes@fhi-berlin.mpg.de><br>
<b>Subject:</b> Re: [PATCH] Adding EPICS7 Package to RSB</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">On Thu, Aug 27, 2020 at 11:48 AM Mritunjay Sharma<br>
<mritunjaysharma394@gmail.com> wrote:<br>
><br>
> Made suggested changes<br>
> Please review.<br>
><br>
> Adding EPICS7 Package to RSB<br>
><br>
> Adding EPICS7 Package to RSB:Fixed minor changes<br>
<br>
combine the commit message into what you would like it to say when it<br>
gets pushed.<br>
<br>
><br>
> Signed-off-by: Mritunjay Sharma <mritunjaysharma394@gmail.com><br>
<br>
We don't use sign-off for RTEMS repos.<br>
<br>
> ---<br>
> rtems/config/epics/epics-7.0-1.cfg | 21 +++++++++<br>
> rtems/config/epics/epics-base.bset | 14 ++++++<br>
> source-builder/config/epics-7.0-1.cfg | 65 +++++++++++++++++++++++++++<br>
> 3 files changed, 100 insertions(+)<br>
> create mode 100644 rtems/config/epics/epics-7.0-1.cfg<br>
> create mode 100644 rtems/config/epics/epics-base.bset<br>
> create mode 100644 source-builder/config/epics-7.0-1.cfg<br>
><br>
> diff --git a/rtems/config/epics/epics-7.0-1.cfg b/rtems/config/epics/epics-7.0-1.cfg<br>
> new file mode 100644<br>
> index 0000000..34270ee<br>
> --- /dev/null<br>
> +++ b/rtems/config/epics/epics-7.0-1.cfg<br>
> @@ -0,0 +1,21 @@<br>
> +#<br>
> +# EPICS 7.0<br>
> +#<br>
> +<br>
> +%if %{release} == %{nil}<br>
> + %define release 1<br>
> +%endif<br>
> +<br>
> +%include %{_configdir}/rtems-bsp.cfg<br>
> +<br>
> +#<br>
> +# EPICS Version<br>
> +#<br>
> +%define epics_version 7.0<br>
> +<br>
> +%hash sha512 epics-base-%{epics_version}.tar.gz 63edef9d3019e8253b81610286578a1e917cc9df75db3e8f5aaf99210b4fa842be296cf7cbd384726b81b648c4e0d041c4ef266ae81a580940d7613ce8ce48e0<br>
> +<br>
> +#<br>
> +# EPICS Build configuration<br>
> +#<br>
> +%include %{_configdir}/epics-7.0-1.cfg<br>
> diff --git a/rtems/config/epics/epics-base.bset b/rtems/config/epics/epics-base.bset<br>
> new file mode 100644<br>
> index 0000000..7ee3815<br>
> --- /dev/null<br>
> +++ b/rtems/config/epics/epics-base.bset<br>
> @@ -0,0 +1,14 @@<br>
> +#<br>
> +# Build set for EPICS<br>
> +#<br>
> +%define release 1<br>
> +<br>
> +#<br>
> +# The RTEMS Package defines<br>
> +#<br>
> +%include rtems-package.bset<br>
> +<br>
> +#<br>
> +# Build EPICS.<br>
> +#<br>
> +epics/epics-7.0-1<br>
> diff --git a/source-builder/config/epics-7.0-1.cfg b/source-builder/config/epics-7.0-1.cfg<br>
> new file mode 100644<br>
> index 0000000..df75e1d<br>
> --- /dev/null<br>
> +++ b/source-builder/config/epics-7.0-1.cfg<br>
> @@ -0,0 +1,65 @@<br>
> +#<br>
> +# EPICS 7.x.x Version 1.<br>
why x.x? should it be 7.0?<br>
<br>
> +#<br>
> +# This configuration file configure's, make's and install's EPICS.<br>
> +#<br>
> +<br>
> +%if %{release} == %{nil}<br>
> +%define release 1<br>
> +%endif<br>
> +<br>
> +%define epics_version 7.0<br>
> +<br>
> +Name: epics-base-%{epics_version}-%{_host}-%{release}<br>
> +Summary: EPICS v%{epics_version} for target %{_target} on host %{_host}<br>
> +Version: %{epics_version}<br>
> +Release: %{release}<br>
> +URL: <a href="https://epics-controls.org/">https://epics-controls.org/</a><br>
> +<br>
> +#<br>
> +# Source<br>
> +#<br>
> +%source set epics-base <a href="https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz">
https://gitlab.fhi.mpg.de/junkes/epics-base/-/archive/%{epics_version}/epics-base-%{epics_version}.tar.gz</a><br>
> +<br>
> +#<br>
> +# Prepare the source code.<br>
> +#<br>
> +%prep<br>
> + build_top=$(pwd)<br>
> +<br>
> + source_dir_epics="epics-base-%{epics_version}"<br>
> +<br>
> + %source setup epics-base -q -n source_dir_epics<br>
does this work? I would think it needs a variable expansion like % or $.<br>
<br>
> +<br>
> + cd ${build_top}<br>
> +<br>
> +%build<br>
> + build_top=$(pwd)<br>
> +<br>
> + cd source_dir_epics<br>
ditto. Did you test this patch before sending it?<br>
<br>
> +<br>
> + %{build_build_flags}<br>
> +<br>
> + #<br>
> + # Using macros to dynamically path to RTEMS_BASE and RTEMS_VERSION using<br>
> + # --with-rtems-bsp<br>
> + #<br>
> + %{__make} RTEMS_BASE=%{_prefix} \<br>
> + RTEMS_VERSION=%{rtems_version} \<br>
> + CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp}<br>
> +<br>
> + cd ${build_top}<br>
> +<br>
> +#%install<br>
> + build_top=$(pwd)<br>
> +<br>
> + %{__rmdir} $SB_BUILD_ROOT<br>
> +<br>
> + cd source_dir_epics<br>
> +<br>
> + %{__make} DESTDIR=$SB_BUILD_ROOT \<br>
> + RTEMS_BASE=%{_prefix} \<br>
> + RTEMS_VERSION=%{rtems_version} \<br>
> + CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install<br>
> +<br>
> + cd ${build_top}<br>
> --<br>
> 2.25.1<br>
><br>
</div>
</span></font></div>
</body>
</html>