fix the problems for the set build of 4.9 and 4.10 1. "expat-2.1.0-1 file not found 2. "%{var} not fount"

I only tested them for 4.9/rtrms-sparc, not sure for rest of them.

24 files changed, 145 insertions, 28 deletions

diff --git a/rtems/config/4.10/rtems-arm.bset b/rtems/config/4.10/rtems-arm.bset
index 8b2e4b4..f1e515a 100644
--- a/rtems/config/4.10/rtems-arm.bset
+++ b/rtems/config/4.10/rtems-arm.bset
@@ -12,6 +12,18 @@
 %include rtems-4.10-base.bset
 
 #
+# The RTEMS 4.10 BSP to build and test
+#
+# Do not build: lm3s3749
+# For automated testing, edb7312 should be configured with:
+#    - ON_SKYEYE=1
+# The GDB based simulators could be used as defaults for testing though.
+# Skyeye includes coverage.
+#
+%define rtems_bsps      all
+%define rtems_test_bsps none
+
+#
 # Disable the tests because the samples do not build.
 #
 %define rtems_tests disable
@@ -19,7 +31,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-autotools.bset b/rtems/config/4.10/rtems-autotools.bset
index 1681987..b56b3cd 100644
--- a/rtems/config/4.10/rtems-autotools.bset
+++ b/rtems/config/4.10/rtems-autotools.bset
@@ -19,5 +19,5 @@ package: rtems-%{rtems_version}-autotools-%{release}
 #
 # Tools configuration.
 #
-autoconf-2.69-1
-automake-1.12.2-1
+devel/autoconf-2.69-1
+devel/automake-1.12.2-1
diff --git a/rtems/config/4.10/rtems-avr.bset b/rtems/config/4.10/rtems-avr.bset
index 970bfec..cbe0463 100644
--- a/rtems/config/4.10/rtems-avr.bset
+++ b/rtems/config/4.10/rtems-avr.bset
@@ -21,7 +21,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-bfin.bset b/rtems/config/4.10/rtems-bfin.bset
index 4b78808..4024292 100644
--- a/rtems/config/4.10/rtems-bfin.bset
+++ b/rtems/config/4.10/rtems-bfin.bset
@@ -12,6 +12,12 @@
 %include rtems-4.10-base.bset
 
 #
+# The RTEMS 4.11 BSP to build and test
+#
+%define rtems_bsps      all
+%define rtems_test_bsps none
+
+#
 # GDB simulator fix for the sed command.
 #
 %define rtems_gdb_patch2 %{rtems_gdb_patches}/bfin/gdb-7.3.1-bfin-sim-fix-sed-20130319.diff
@@ -19,7 +25,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-h8300.bset b/rtems/config/4.10/rtems-h8300.bset
index e9ad514..45d16e0 100644
--- a/rtems/config/4.10/rtems-h8300.bset
+++ b/rtems/config/4.10/rtems-h8300.bset
@@ -12,9 +12,15 @@
 %include rtems-4.10-base.bset
 
 #
+# The RTEMS 4.11 BSP to build and test
+#
+%define rtems_bsps      all
+%define rtems_test_bsps none
+
+#
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-i386.bset b/rtems/config/4.10/rtems-i386.bset
index 74bfcac..fe80e49 100644
--- a/rtems/config/4.10/rtems-i386.bset
+++ b/rtems/config/4.10/rtems-i386.bset
@@ -12,9 +12,19 @@
 %include rtems-4.10-base.bset
 
 #
+# The RTEMS 4.11 BSP to build and test
+#
+# For automated testing on Qemu, pc386 should be configured with:
+#    - USE_COM1_AS_CONSOLE=1
+#    - BSP_PRESS_KEY_FOR_RESET=0
+#    - BSP_RESET_BOARD_AT_EXIT=1
+%define rtems_bsps      all
+%define rtems_test_bsps none
+
+#
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-lm32.bset b/rtems/config/4.10/rtems-lm32.bset
index 4732d22..e9fbab7 100644
--- a/rtems/config/4.10/rtems-lm32.bset
+++ b/rtems/config/4.10/rtems-lm32.bset
@@ -12,9 +12,15 @@
 %include rtems-4.10-base.bset
 
 #
+# The RTEMS 4.11 BSP to build and test
+#
+%define rtems_bsps      all
+%define rtems_test_bsps lm32_evr
+
+#
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-m32c.bset b/rtems/config/4.10/rtems-m32c.bset
index 5a277ee..a01e9d5 100644
--- a/rtems/config/4.10/rtems-m32c.bset
+++ b/rtems/config/4.10/rtems-m32c.bset
@@ -20,7 +20,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-m32r.bset b/rtems/config/4.10/rtems-m32r.bset
index f57a29f..7320237 100644
--- a/rtems/config/4.10/rtems-m32r.bset
+++ b/rtems/config/4.10/rtems-m32r.bset
@@ -14,7 +14,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-m68k.bset b/rtems/config/4.10/rtems-m68k.bset
index 8c7a4dc..c6b4582 100644
--- a/rtems/config/4.10/rtems-m68k.bset
+++ b/rtems/config/4.10/rtems-m68k.bset
@@ -10,11 +10,13 @@
 # The RTEMS 4.10 base defines.
 #
 %include rtems-4.10-base.bset
+%define rtems_bsps      all
+%define rtems_test_bsps none
 
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-mips.bset b/rtems/config/4.10/rtems-mips.bset
index 3bb04e4..39584da 100644
--- a/rtems/config/4.10/rtems-mips.bset
+++ b/rtems/config/4.10/rtems-mips.bset
@@ -11,10 +11,13 @@
 #
 %include rtems-4.10-base.bset
 
+%define rtems_bsps      all
+%define rtems_test_bsps jmr3904
+
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-nios2.bset b/rtems/config/4.10/rtems-nios2.bset
index 8801ed5..e62eb09 100644
--- a/rtems/config/4.10/rtems-nios2.bset
+++ b/rtems/config/4.10/rtems-nios2.bset
@@ -13,10 +13,14 @@
 #
 %include rtems-4.10-base.bset
 
+
+%define rtems_bsps      all
+%define rtems_test_bsps none
+
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-nios2-binutils-2.20-1
 tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1
 tools/rtems-nios2-gdb-7.0-1
diff --git a/rtems/config/4.10/rtems-powerpc.bset b/rtems/config/4.10/rtems-powerpc.bset
index f95acdf..ecea464 100644
--- a/rtems/config/4.10/rtems-powerpc.bset
+++ b/rtems/config/4.10/rtems-powerpc.bset
@@ -10,11 +10,12 @@
 # The RTEMS 4.10 base defines.
 #
 %include rtems-4.10-base.bset
-
+%define rtems_bsps      all
+%define rtems_test_bsps psim
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-sh.bset b/rtems/config/4.10/rtems-sh.bset
index fd90740..73c1579 100644
--- a/rtems/config/4.10/rtems-sh.bset
+++ b/rtems/config/4.10/rtems-sh.bset
@@ -10,11 +10,12 @@
 # The RTEMS 4.10 base defines.
 #
 %include rtems-4.10-base.bset
+%define rtems_bsps      all
+%define rtems_test_bsps simsh1
 
+# Tools configurationt
 #
-# Tools configuration.
-#
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.10/rtems-sparc.bset b/rtems/config/4.10/rtems-sparc.bset
index b16a8c7..b3ffc98 100644
--- a/rtems/config/4.10/rtems-sparc.bset
+++ b/rtems/config/4.10/rtems-sparc.bset
@@ -10,11 +10,12 @@
 # The RTEMS 4.10 base defines.
 #
 %include rtems-4.10-base.bset
-
+%define rtems_bsps      all
+%define rtems_test_bsps sis
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
 tools/rtems-gdb-7.3.1-1
diff --git a/rtems/config/4.9/rtems-arm.bset b/rtems/config/4.9/rtems-arm.bset
index 8cd2e5b..0378b51 100644
--- a/rtems/config/4.9/rtems-arm.bset
+++ b/rtems/config/4.9/rtems-arm.bset
@@ -6,15 +6,33 @@
 
 %define rtems_arch arm
 
+
+#
+# The RTEMS 4.9 BSP to build and test
+#
+# Do not build: lm3s3749
+# For automated testing, edb7312 should be configured with:
+#    - ON_SKYEYE=1
+# The GDB based simulators could be used as defaults for testing though.
+# Skyeye includes coverage.
+#
+%define rtems_bsps      all
+%define rtems_test_bsps none
+
 #
 # The RTEMS 4.9 base defines.
 #
 %include rtems-4.9-base.bset
 
 #
+# Need to add this option to build.
+#
+%define enable_obsolete 1
+
+#
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.19.1-1
 tools/rtems-gcc-4.3.2-newlib-1.16.0-1
 tools/rtems-gdb-6.8-1
diff --git a/rtems/config/4.9/rtems-autotools.bset b/rtems/config/4.9/rtems-autotools.bset
index 1681987..b56b3cd 100644
--- a/rtems/config/4.9/rtems-autotools.bset
+++ b/rtems/config/4.9/rtems-autotools.bset
@@ -19,5 +19,5 @@ package: rtems-%{rtems_version}-autotools-%{release}
 #
 # Tools configuration.
 #
-autoconf-2.69-1
-automake-1.12.2-1
+devel/autoconf-2.69-1
+devel/automake-1.12.2-1
diff --git a/rtems/config/4.9/rtems-i386.bset b/rtems/config/4.9/rtems-i386.bset
index 4062568..3040896 100644
--- a/rtems/config/4.9/rtems-i386.bset
+++ b/rtems/config/4.9/rtems-i386.bset
@@ -7,6 +7,15 @@
 %define rtems_arch i386
 
 #
+# The RTEMS 4.9 BSP to build and test
+#
+# For automated testing on Qemu, pc386 should be configured with:
+#    - USE_COM1_AS_CONSOLE=1
+#    - BSP_PRESS_KEY_FOR_RESET=0
+#    - BSP_RESET_BOARD_AT_EXIT=1
+%define rtems_bsps      all
+%define rtems_test_bsps none
+#
 # The RTEMS 4.9 base defines.
 #
 %include rtems-4.9-base.bset
@@ -14,7 +23,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.19.1-1
 tools/rtems-gcc-4.3.2-newlib-1.16.0-1
 tools/rtems-gdb-6.8-1
diff --git a/rtems/config/4.9/rtems-m68k.bset b/rtems/config/4.9/rtems-m68k.bset
index 1b0c061..6150043 100644
--- a/rtems/config/4.9/rtems-m68k.bset
+++ b/rtems/config/4.9/rtems-m68k.bset
@@ -12,6 +12,14 @@
 %include rtems-4.9-base.bset
 
 #
+# The RTEMS 4.9 BSP to build and test
+#
+# uC5282 requires a patched special version of Qemu
+%define rtems_bsps      all
+%define rtems_test_bsps none
+
+
+#
 # Disable the tests because the samples do not build.
 #
 %define rtems_tests disable
@@ -19,7 +27,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.19.1-1
 tools/rtems-gcc-4.3.2-newlib-1.16.0-1
 tools/rtems-gdb-6.8-1
diff --git a/rtems/config/4.9/rtems-mips.bset b/rtems/config/4.9/rtems-mips.bset
index 2e4a79f..b51d265 100644
--- a/rtems/config/4.9/rtems-mips.bset
+++ b/rtems/config/4.9/rtems-mips.bset
@@ -7,6 +7,12 @@
 %define rtems_arch mips
 
 #
+# The RTEMS 4.9 BSP to build and test
+#
+%define rtems_bsps      all
+%define rtems_test_bsps jmr3904
+
+#
 # The RTEMS 4.9 base defines.
 #
 %include rtems-4.9-base.bset
@@ -14,7 +20,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.19.1-1
 tools/rtems-gcc-4.3.2-newlib-1.16.0-1
 tools/rtems-gdb-6.8-1
diff --git a/rtems/config/4.9/rtems-powerpc.bset b/rtems/config/4.9/rtems-powerpc.bset
index 4ee5d5d..53fac7f 100644
--- a/rtems/config/4.9/rtems-powerpc.bset
+++ b/rtems/config/4.9/rtems-powerpc.bset
@@ -7,6 +7,12 @@
 %define rtems_arch powerpc
 
 #
+# The RTEMS 4.9 BSP to build and test
+#
+%define rtems_bsps      all
+%define rtems_test_bsps psim
+
+#
 # The RTEMS 4.9 base defines.
 #
 %include rtems-4.9-base.bset
@@ -14,7 +20,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.19.1-1
 tools/rtems-gcc-4.3.2-newlib-1.16.0-1
 tools/rtems-gdb-6.8-1
diff --git a/rtems/config/4.9/rtems-sparc.bset b/rtems/config/4.9/rtems-sparc.bset
index bb6c89b..b44a939 100644
--- a/rtems/config/4.9/rtems-sparc.bset
+++ b/rtems/config/4.9/rtems-sparc.bset
@@ -6,6 +6,13 @@
 
 %define rtems_arch sparc
 
+
+#
+# The RTEMS 4.11 BSP to build and test
+#
+%define rtems_bsps      all
+%define rtems_test_bsps sis
+
 #
 # The RTEMS 4.11 base defines.
 #
@@ -14,7 +21,7 @@
 #
 # Tools configuration.
 #
-expat-2.1.0-1
+devel/expat-2.1.0-1
 tools/rtems-binutils-2.19.1-1
 tools/rtems-gcc-4.3.2-newlib-1.16.0-1
 tools/rtems-gdb-6.8-1
diff --git a/rtems/config/tools/rtems-kernel-4.10.2.cfg b/rtems/config/tools/rtems-kernel-4.10.2.cfg
index 758aba5..5c6cf80 100644
--- a/rtems/config/tools/rtems-kernel-4.10.2.cfg
+++ b/rtems/config/tools/rtems-kernel-4.10.2.cfg
@@ -6,6 +6,11 @@
 %include %{_configdir}/base.cfg
 
 %define rtems_kernel_version 4.10.2
+#
+# The code in git needs to be bootstrapped. Do each build because we have
+# no way to change what changes may have happened in the code.
+#
+%define rtems_bootstrap
 
 #
 # The RTEMS build instructions. We use 4.xx Release 1.
diff --git a/rtems/config/tools/rtems-kernel-4.9.6-1.cfg b/rtems/config/tools/rtems-kernel-4.9.6-1.cfg
index a2b000b..d158a51 100644
--- a/rtems/config/tools/rtems-kernel-4.9.6-1.cfg
+++ b/rtems/config/tools/rtems-kernel-4.9.6-1.cfg
@@ -8,6 +8,12 @@
 %define rtems_kernel_version 4.9.6
 
 #
+# The code in git needs to be bootstrapped. Do each build because we have
+# no way to change what changes may have happened in the code.
+#
+%define rtems_bootstrap
+
+#
 # The RTEMS build instructions. We use 4.xx Release 1.
 #
 %include tools/rtems-kernel-4-1.cfg