[PATCH] Adding EPICS7 Package to RSB

[Gedare Bloom]

On Tue, Aug 25, 2020 at 4:36 PM Mritunjay Sharma
<mritunjaysharma394 at gmail.com> wrote:
>
> This patch add supports for EPICS7 Package to RTEMS RSB.
> Signed-off-by: Mritunjay Sharma <mritunjaysharma394 at gmail.com>
> ---
>  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 0000000..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 0000000..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 0000000..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
>