[PATCH v2] Adding EPICS7 Package to RSB

[Mritunjay Sharma]

Modified as per the suggestions of Dr. Gedare. Please do review
Signed-off-by: Mritunjay Sharma <mritunjaysharma394 at gmail.com>
---
 .../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}"
 
   %source setup epics-base -q -n epics-base-%{epics_version}
 
@@ -36,22 +36,30 @@ URL: 	  https://epics.mpg.de/
 %build
   build_top=$(pwd)
 
-  cd ${source_dir_epics}
+  cd epics-base-%{epics_version}
 
   %{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}
 
   cd ${build_top}
 
-%install
+#%install
   build_top=$(pwd)
 
-  rm -rf $SB_BUILD_ROOT
+  %{__rmdir} $SB_BUILD_ROOT
+
+  cd epics-base-%{epics_version}
+
+  %{__make} DESTDIR=$SB_BUILD_ROOT \
+  RTEMS_BASE=%{_prefix} \
+  RTEMS_VERSION=%{rtems_version} \
+  CROSS_COMPILER_TARGET_ARCHS=RTEMS-%{with_rtems_bsp} install
 
-  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}
-- 
2.25.1