Thanks, on it, sending it in a while. Mritunjay ________________________________ From: Gedare Bloom <ged...@rtems.org> Sent: Friday, August 28, 2020 12:24:26 AM To: Mritunjay Sharma <mritunjaysharma...@gmail.com> Cc: devel@rtems.org <devel@rtems.org>; Chris Johns <chr...@rtems.org>; Heinz Junkes <jun...@fhi-berlin.mpg.de> Subject: Re: [PATCH] Adding EPICS7 Package to RSB
On Thu, Aug 27, 2020 at 11:48 AM Mritunjay Sharma <mritunjaysharma...@gmail.com> 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 <mritunjaysharma...@gmail.com> 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 0000000..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 0000000..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 0000000..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