RTEMS RPM basically working.

5 files changed, 30 insertions, 20 deletions

diff --git a/scripts/configure.in b/scripts/configure.in
index a45d8d7471..73df2f7a74 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -3,9 +3,6 @@
 AC_INIT(binutils)
 AM_INIT_AUTOMAKE(scripts,19991025-0,no)
 
-# RTEMS_CHECK_VERSION(..)
-RTEMS_VERSION=GET_RTEMS_VERSION_XXX
-
 test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
 . ./setup.cache
 
@@ -35,7 +32,7 @@ BINUTILSVERS="binutils-${binutils_version}"
 AC_SUBST(BINUTILSVERS)
 GDBVERS="gdb-${gdb_version}"
 AC_SUBST(GDBVERS)
-BSPVERS="${RTEMS_VERSION}"
+BSPVERS="${rtems_version}"
 AC_SUBST(RTEMS_VERSION)
 AC_SUBST(BSPVERS)
 
diff --git a/scripts/mkbspspec.in b/scripts/mkbspspec.in
index 3187be2cf1..401c405f03 100644
--- a/scripts/mkbspspec.in
+++ b/scripts/mkbspspec.in
@@ -47,11 +47,11 @@ bsp=$2
 
 . ./$CFG
 
-specfile=${dst}/$target_alias-$bsp-$RTEMS_VERSION.spec
+specfile=${dst}/$target_alias-$bsp-${rtems_version}.spec
 
-sed -e "s%@Version@%${RTEMS_VERSION}%g" \
+sed -e "s%@Release@%${rtems_rpm_release}%g" \
     -e "s%@bsp@%${bsp}%g" \
-    -e "s%@Release@%${rtems_release}%g" \
+    -e "s%@rtems_version@%${rtems_version}%g" \
     -e "s%@rpm_build_root@%${rpm_build_root}%g" \
     -e "s%@target_alias@%${target_alias}%g" \
 < ${RTEMS_DIR}/rtems/rtems.spec.in \
diff --git a/scripts/rtems/rtems.spec.in b/scripts/rtems/rtems.spec.in
index f0aab6e919..f2ba46395b 100644
--- a/scripts/rtems/rtems.spec.in
+++ b/scripts/rtems/rtems.spec.in
@@ -15,11 +15,13 @@ Group:        unsorted
 Provides:     rtems-@target_alias@-@bsp@
 
 Autoreqprov:  on
-Packager:     corsepiu@faw.uni-ulm.de
+Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
+Requires:     	@target_alias@-binutils
+Requires:     	@target_alias@-gcc 
 
-Version:      @Version@
+Version:      @rtems_version@
 Summary:      A free operating system for embedded systems
-Source:       rtems-@Version@.tar.gz
+Source:       rtems-@rtems_version@.tar.gz
 #
 # The original sources are not included in the source RPM.
 # If we included them, then the source RPMs for each target
@@ -45,17 +47,17 @@ Authors:
     ...
 
 %prep
-# untar the sources inside rtems-@target_alias@-@bsp@-@Version@
-%setup -c -n rtems-@target_alias@-@bsp@-@Version@
+# untar the sources inside rtems-@target_alias@-@bsp@-@rtems_version@
+%setup -c -n rtems-@target_alias@-@bsp@-@rtems_version@
 # no patch needed
 # %patch
 %build
 # rtems does not support building inside the source tree
-  if test ! -f rtems-@Version@/configure;
+  if test ! -f rtems-@rtems_version@/configure;
   then
-  ( cd rtems-@Version@; ./autogen )
+  ( cd rtems-@rtems_version@; ./bootstrap )
   fi  
-  ./rtems-@Version@/configure \
+  ./rtems-@rtems_version@/configure \
   --target=@target_alias@ \
   --prefix=/opt/rtems/@target_alias@ \
   --enable-networking \
@@ -63,7 +65,8 @@ Authors:
   --enable-cxx \
   --disable-tests \
   --enable-rdbg \
-  --disable-multiprocessing
+  --disable-multiprocessing \
+  --disable-itron 
   make RTEMS_BSP=@bsp@ 
 %install
   make RTEMS_BSP=@bsp@ prefix=$RPM_BUILD_ROOT/opt/rtems/@target_alias@ install
diff --git a/scripts/setup b/scripts/setup
index a102f2a14b..2e631033d4 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -34,10 +34,12 @@ do
   echo "8 gdb version             : $gdb_version"
   echo "9 gdb patch version       : $gdb_patch_version"
   echo "a gdb rpm release         : $gdb_rpm_release"
-  echo "b rpm build root          : $rpm_build_root"
+  echo "b rtems version           : $rtems_version"
+  echo "c rtems rpm release       : $rtems_rpm_release"
+  echo "d rpm build root          : $rpm_build_root"
   echo
 
-  echo -n "[0-9ab] or any other key to quit >"
+  echo -n "[0-9a-d] or any other key to quit >"
   read sel
   case $sel in
   0) echo -n "BINUTILS source >"
@@ -57,12 +59,16 @@ do
   7) echo -n "GCC/NEWLIB RPM release >"
      read gccnewlib_rpm_release ;;
   8) echo -n "GDB source >"
-     read GDB_SOURCE ;;
+     read gdb_version ;;
   9) echo -n "GDB patch version>"
      read gdb_patch_version ;;
   a) echo -n "GDB RPM release >"
      read gdb_rpm_release ;;
-  b) echo -n "RPM build root >"
+  b) echo -n "RTEMS source >"
+     read rtems_version ;;
+  c) echo -n "RTEMS RPM release >"
+     read rtems_rpm_release ;;
+  d) echo -n "RPM build root >"
      read rpm_build_root ;;
   *) 
      return 0 ;;
@@ -87,6 +93,8 @@ echo "gccnewlib_rpm_release=$gccnewlib_rpm_release" >> $CFG
 echo "gdb_version=$gdb_version" >> $CFG
 echo "gdb_patch_version=$gdb_patch_version" >> $CFG
 echo "gdb_rpm_release=$gdb_rpm_release" >> $CFG
+echo "rtems_version=$rtems_version" >> $CFG
+echo "rtems_rpm_release=$rtems_rpm_release" >> $CFG
 echo "rpm_build_root=$rpm_build_root" >> $CFG
 
 echo " done"
diff --git a/scripts/setup.def b/scripts/setup.def
index d57a9b6878..22ee092a17 100644
--- a/scripts/setup.def
+++ b/scripts/setup.def
@@ -10,4 +10,6 @@ gccnewlib_rpm_release=1
 gdb_version=4.18
 gdb_patch_version=19991015
 gdb_rpm_release=1
+rtems_version=19991117
+rtems_rpm_release=1
 rpm_build_root=/tmp