[rtems-source-builder commit] rtems-libbsd: Do not handle rtems_waf source when released.

[Chris Johns]

Module:    rtems-source-builder
Branch:    master
Commit:    3dd974990e11d12123902349e0f0bc8eba35e8e8
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=3dd974990e11d12123902349e0f0bc8eba35e8e8

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri Feb 28 14:45:28 2020 +1100

rtems-libbsd: Do not handle rtems_waf source when released.

The release libbsd tar file contains the rtems_waf submodule.

---

 rtems/config/tools/rtems-libbsd-common.cfg | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/rtems/config/tools/rtems-libbsd-common.cfg b/rtems/config/tools/rtems-libbsd-common.cfg
index 1cea6b7..3e782ab 100644
--- a/rtems/config/tools/rtems-libbsd-common.cfg
+++ b/rtems/config/tools/rtems-libbsd-common.cfg
@@ -33,14 +33,18 @@ URL:       https://git.rtems.org/rtems-libbsd.git/
 #
 # LibBSD Source.
 #
-#  Collect and install rtems_waf as cgit snapshots to not caputre submodules,
-#  which is a good thing because we would collect the entire FreeBSD source
-
+#  If not a release collect and install rtems_waf as cgit snapshots to not
+#  capture submodules, which is a good thing because we would collect the entire
+#  FreeBSD source.
+#
+#  Releases package submodules in the top level tarfile.
 #
 %source set rtems_libbsd \
       https://git.rtems.org/rtems-libbsd/snapshot/rtems-libbsd-%{rtems_libbsd_version}.tar.%{rtems_libbsd_ext}
-%source set rtems_waf \
-      https://git.rtems.org/rtems_waf/snapshot/rtems_waf-%{rtems_waf_version}.tar.%{rtems_libbsd_ext}
+%if !%{rsb_released}
+ %source set rtems_waf \
+       https://git.rtems.org/rtems_waf/snapshot/rtems_waf-%{rtems_waf_version}.tar.%{rtems_libbsd_ext}
+%endif
 
 #
 # Prepare the source code.
@@ -50,8 +54,9 @@ URL:       https://git.rtems.org/rtems-libbsd.git/
 
   source_dir_libbsd="rtems-libbsd-%{rtems_libbsd_version}"
   %source setup rtems_libbsd -q -n rtems-libbsd-%{rtems_libbsd_version}
-  %source setup rtems_waf -q -s 1 -c -a -n rtems-libbsd-%{rtems_libbsd_version}/rtems_waf
-
+  %if !%{rsb_released}
+   %source setup rtems_waf -q -s 1 -c -a -n rtems-libbsd-%{rtems_libbsd_version}/rtems_waf
+  %endif
   cd ${build_top}
 
 #