Changeset 43e7d103 in rtems


Ignore:
Timestamp:
Oct 21, 1999, 3:59:54 PM (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
39537657
Parents:
8f2cf931
Message:

Changes from Ralf with script-19991021-0. He fixed the %files
issue and has mkbspspec in a better state. user.cfg is now
gone.

There are some miscellaneous changes to buildall done by Joel
to clean up the build process.

Location:
scripts
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • scripts/Makefile.am

    r8f2cf931 r43e7d103  
    2828
    2929DISTCLEANFILES = setup.cache
    30 
    31 CLEANFILES = buildall
  • scripts/binutils/Makefile.am

    r8f2cf931 r43e7d103  
     1## $Id$
     2
    13AUTOMAKE_OPTIONS = foreign
    24
    3 MKBINUTILSSPEC = $(SHELL) $(top_srcdir)/mkbinutilspec
     5MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec
    46
    5 MKBINUTILSSPEC_DEPS = ../mkbinutilspec binutils.spec.in ../setup.cache
     7MKBINUTILSSPEC_DEPS = \
     8$(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache
    69
    710i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    8         $(MKBINUTILSSPEC) -cfg ../setup.cache -o . i386-rtems
     11        $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
    912
    1013sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    11         $(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtems
     14        $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
    1215
    1316powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    14         $(MKBINUTILSSPEC) -cfg ../setup.cache -o . powerpc-rtems
     17        $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
    1518
    1619sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    17         $(MKBINUTILSSPEC) -cfg ../setup.cache -o . sparc-rtems
     20        $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
    1821
    1922m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    20         $(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtems
     23        $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
    2124
    2225mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    23         $(MKBINUTILSSPEC) -cfg ../setup.cache -o . mips64orion-rtems
     26        $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
    2427
    2528i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    26         $(MKBINUTILSSPEC) -cfg ../setup.cache -o . i960-rtems
     29        $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
    2730
    2831hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    29         $(MKBINUTILSSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
     32        $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
    3033
    3134TEMPLATES = \
  • scripts/binutils/Makefile.in

    r8f2cf931 r43e7d103  
    7777
    7878
    79 RPM_SPECS_DATA =  i386-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec powerpc-rtems-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec m68k-rtems-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec hppa1.1-rtems-$(BINUTILSVERS).spec
     79RPM_SPECS_DATA =  i386-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec sh-rtemself-$(BINUTILSVERS).spec powerpc-rtems-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec m68k-rtems-$(BINUTILSVERS).spec m68k-rtemself-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec hppa1.1-rtems-$(BINUTILSVERS).spec
    8080
    8181
     
    219219        $(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtems
    220220
     221sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
     222        $(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtemself
     223
    221224powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    222225        $(MKBINUTILSSPEC) -cfg ../setup.cache -o . powerpc-rtems
     
    227230m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
    228231        $(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtems
     232
     233m68k-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
     234        $(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtemself
    229235
    230236mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
  • scripts/binutils/binutils.spec.in

    r8f2cf931 r43e7d103  
    9494
    9595%files -f files
    96 %dir /opt/rtems/info
     96%docdir /opt/rtems/info
    9797%doc /opt/rtems/info/dir
    9898%doc /opt/rtems/info/as.info.gz
     
    107107%doc /opt/rtems/info/standards.info.gz
    108108
    109 %dir /opt/rtems/man
    110 %dir /opt/rtems/man/man1
     109%docdir /opt/rtems/man
     110%docdir /opt/rtems/man/man1
    111111%doc /opt/rtems/man/man1/@target_alias@-*.1
    112112
  • scripts/buildall.in

    r8f2cf931 r43e7d103  
    55
    66RTEMS_DIR=`dirname $0`
    7 CFG=./user.cfg
     7CFG=./setup.cache
    88dst=@RPM_SPECSdir@
    99
     
    1212  echo "$0 [options] <target_alias>"
    1313  echo "  options:"
    14   echo "    -cfg <user.cfg>"
     14  echo "    -cfg <setup.cache>"
    1515  echo "    -o <rpm-spec-dir>"
    1616  exit 1 ;
     
    6161newlib=${newlib_version}
    6262# also use binutils_rpm_release
    63 buildroot=/opt/tmp
     63buildroot=/tmp
    6464
    6565testing=no
    66 do_binutils=yes
    67 do_gdb=yes
    68 do_gccnewlib=yes
     66do_binutils=no
     67do_gdb=no
     68do_gccnewlib=no
    6969
    7070#
     
    101101  do
    102102    tspecs=`find . -name "${target}*"`
     103    if [ "X${tspecs}" = "X" ] ; then
     104      echo RPM specifications were not generated for ${tspec}.
     105      exit 1
     106    fi
    103107    ${ECHO} cp -r ${tspecs} ${dst}
    104108  done
     
    120124    fi
    121125    ${ECHO} rm -rf ${dst}/../BUILD/${target}-binutils*
    122     ${ECHO} rm -rf ${buildroot}/opt
     126    ${ECHO} rm -rf ${buildroot}/opt/rtems
    123127  else
    124128    echo Skipping binutils for ${target}
     
    145149    if [ ${testing} = no ] ; then
    146150      rpm -ba ${specfile} >${logfile} 2>&1
     151exit 0
    147152    fi
    148153    ${ECHO} rm -rf ${dst}/../BUILD/${target}-gcc*
    149     ${ECHO} rm -rf ${buildroot}/opt
     154    ${ECHO} rm -rf ${buildroot}/opt/rtems
    150155
    151156    echo uninstalling binutils for ${target}
     
    170175    fi
    171176    ${ECHO} rm -rf ${dst}/../BUILD/${target}-gdb*
    172     ${ECHO} rm -rf ${buildroot}/opt
     177    ${ECHO} rm -rf ${buildroot}/opt/rtems
    173178  else
    174179    echo Skipping gdb for ${target}
  • scripts/configure.in

    r8f2cf931 r43e7d103  
     1## $Id$
     2
    13AC_INIT(binutils)
    2 AM_INIT_AUTOMAKE(scripts,19991020-1,no)
     4AM_INIT_AUTOMAKE(scripts,19991021-0,no)
    35
    4 test -f ./setup.cache || cp ./setup.def ./setup.cache
     6RTEMS_CHECK_VERSION(..)
     7
     8test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
    59. ./setup.cache
    610
     
    1923  RPM_SPECSdir=/usr/src/SPECS;
    2024fi
    21 if test x"$RPM_SPECSdir" = x; then
     25if test x"$RPM_SPECSdir" = x"" ; then
    2226AC_MSG_ERROR(not found)
    2327fi
     
    3135GDBVERS="gdb-${gdb_version}"
    3236AC_SUBST(GDBVERS)
    33 BSPVERS="RTEMS-no_version_yet"
     37BSPVERS="${RTEMS_VERSION}"
    3438AC_SUBST(BSPVERS)
    3539
  • scripts/gccnewlib/Makefile.am

    r8f2cf931 r43e7d103  
     1## $Id$
     2
    13AUTOMAKE_OPTIONS = foreign
    24
    3 MKGCCNEWLIBSPEC = $(SHELL) ../mkgccnewlibspec
     5MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
    46
    57MKGCCNEWLIBSPEC_DEPS = \
    6   ../mkgccnewlibspec gccnewlib.spec.in ../setup.cache
     8  $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache
    79
    810i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    9         $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . i386-rtems
     11        $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
    1012
    1113sh-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    12         $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtems
     14        $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
    1315
    1416powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    15         $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . powerpc-rtems
     17        $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
    1618
    1719sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    18         $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sparc-rtems
     20        $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
    1921
    2022m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    21         $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtems
     23        $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
    2224
    2325mips64orion-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    24         $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
     26        $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
    2527
    2628i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    27         $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . i960-rtems
     29        $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
    2830
    2931hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    30         $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
     32        $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
    3133
    3234TEMPLATES = \
  • scripts/gccnewlib/Makefile.in

    r8f2cf931 r43e7d103  
    7878
    7979
    80 RPM_SPECS_DATA =  i386-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec powerpc-rtems-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec m68k-rtems-$(GCCNEWLIBVERS).spec mips64orion-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec hppa1.1-rtems-$(GCCNEWLIBVERS).spec
     80RPM_SPECS_DATA =  i386-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec sh-rtemself-$(GCCNEWLIBVERS).spec powerpc-rtems-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec m68k-rtems-$(GCCNEWLIBVERS).spec m68k-rtemself-$(GCCNEWLIBVERS).spec mips64orion-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec hppa1.1-rtems-$(GCCNEWLIBVERS).spec
    8181
    8282
     
    220220        $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtems
    221221
     222sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
     223        $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtemself
     224
    222225powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    223226        $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . powerpc-rtems
     
    228231m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
    229232        $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtems
     233
     234m68k-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
     235        $(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtemself
    230236
    231237mips64orion-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
  • scripts/gccnewlib/gccnewlib.spec.in

    r8f2cf931 r43e7d103  
    7575  cd @target_alias@/newlib
    7676  make prefix=$RPM_BUILD_ROOT/opt/rtems install-info
    77 # gzip info files
     77
     78  # cd back to build/
     79  cd ../..
     80
     81  # gzip info files
    7882  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null
    7983  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
    8084  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null
    81  
     85
     86  rm -f files
     87
     88  # collect c++ headers
     89  if test -d $RPM_BUILD_ROOT/opt/rtems/include/g++-3; then
     90    find $RPM_BUILD_ROOT/opt/rtems/include/g++-3 \
     91      -type d | \
     92      sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
     93    find $RPM_BUILD_ROOT/opt/rtems/include/g++-3 \
     94      \( -type f -o -type l \) | \
     95      sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
     96  fi
     97
     98  # collect target gcc-lib
    8299  if test -d "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@"; \
    83100  then
    84     find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" -type d | \
    85       sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" > files.gcc-lib
    86     find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" -type f | \
    87       sed -e "s,^$RPM_BUILD_ROOT,,g" >> files.gcc-lib
     101    find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" \
     102      -type d | sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
     103    find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" \
     104      \( -type f -o -type l \) \
     105      | sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
     106  fi
     107
     108  # collect target files
     109  if test -d "$RPM_BUILD_ROOT/opt/rtems/@target_alias@"; \
     110  then
     111    find "$RPM_BUILD_ROOT/opt/rtems/@target_alias@" \
     112      -type d | \
     113      sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
     114    find "$RPM_BUILD_ROOT/opt/rtems/@target_alias@" \
     115      \( -type f -o -type l \) | \
     116      sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
    88117  fi
    89118
     
    108137  fi
    109138
    110 %files -f files.g++ -f files.gcc-lib
     139%files -f build/files
    111140%docdir /opt/rtems/info
    112141%doc /opt/rtems/info/dir
     
    127156%dir /opt/rtems/bin
    128157/opt/rtems/bin/cpp
     158/opt/rtems/bin/jv-scan
     159/opt/rtems/bin/gcov
     160/opt/rtems/bin/jcf-dump
     161/opt/rtems/bin/gcjh
    129162/opt/rtems/bin/@target_alias@-c++
    130163/opt/rtems/bin/@target_alias@-g++
    131164/opt/rtems/bin/@target_alias@-gcc
    132165/opt/rtems/bin/@target_alias@-gcj
     166/opt/rtems/bin/@target_alias@-chill
     167/opt/rtems/bin/@target_alias@-g77
     168/opt/rtems/bin/@target_alias@-protoize
     169/opt/rtems/bin/@target_alias@-unprotoize
    133170
    134171%dir /opt/rtems/lib
    135172/opt/rtems/lib/libiberty*
    136 %dir /opt/rtems/lib/include
     173%dir /opt/rtems/include
    137174
    138175%dir /opt/rtems/lib/gcc-lib
    139176%dir /opt/rtems/lib/gcc-lib/@target_alias@
    140 # /opt/rtems/@target_alias@/include
    141 # /opt/rtems/@target_alias@/sys-include
    142 /opt/rtems/@target_alias@/lib
    143177
  • scripts/gdb/Makefile.am

    r8f2cf931 r43e7d103  
    11AUTOMAKE_OPTIONS = foreign
    22
    3 MKGDBSPEC = $(SHELL) $(top_srcdir)/mkgdbspec
     3MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
    44
    5 MKGDBSPEC_DEPS = ../mkgdbspec gdb.spec.in ../setup.cache
     5MKGDBSPEC_DEPS = \
     6$(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache
    67
    78i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    8         $(MKGDBSPEC) -cfg ../setup.cache -o . i386-rtems
     9        $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
    910
    1011sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    11         $(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtems
     12        $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
    1213
    1314powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    14         $(MKGDBSPEC) -cfg ../setup.cache -o . powerpc-rtems
     15        $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
    1516
    1617sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    17         $(MKGDBSPEC) -cfg ../setup.cache -o . sparc-rtems
     18        $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
    1819
    1920m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    20         $(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtems
     21        $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
    2122
    2223mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    23         $(MKGDBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
     24        $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
    2425
    2526i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    26         $(MKGDBSPEC) -cfg ../setup.cache -o . i960-rtems
     27        $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
    2728
    2829hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    29         $(MKGDBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
     30        $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
    3031
    3132TEMPLATES = \
  • scripts/gdb/Makefile.in

    r8f2cf931 r43e7d103  
    7777
    7878
    79 RPM_SPECS_DATA =  i386-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec hppa1.1-rtems-$(GDBVERS).spec
     79RPM_SPECS_DATA =  i386-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec sh-rtemself-$(GDBVERS).spec powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec m68k-rtemself-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec hppa1.1-rtems-$(GDBVERS).spec
    8080
    8181
     
    219219        $(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtems
    220220
     221sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
     222        $(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtemself
     223
    221224powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    222225        $(MKGDBSPEC) -cfg ../setup.cache -o . powerpc-rtems
     
    227230m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    228231        $(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtems
     232
     233m68k-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
     234        $(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtemself
    229235
    230236mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
  • scripts/gdb/gdb.spec.in

    r8f2cf931 r43e7d103  
    5050    --verbose --prefix=/opt/rtems
    5151
    52   test -d $RPM_BUILD_ROOT/opt \
    53     || mkdir $RPM_BUILD_ROOT/opt
    54   test -d $RPM_BUILD_ROOT/opt/rtems \
    55     || mkdir $RPM_BUILD_ROOT/opt/rtems
    56 
    5752  make all
    5853  make info
     
    8479
    8580%files
    86 %dir /opt/rtems/info
     81%docdir /opt/rtems/info
    8782%doc /opt/rtems/info/gdb.info*
    8883%doc /opt/rtems/info/mmalloc.info*
    8984%doc /opt/rtems/info/readline.info*
    9085
    91 %dir /opt/rtems/man
    92 %dir /opt/rtems/man/man1
     86%docdir /opt/rtems/man
     87%docdir /opt/rtems/man/man1
    9388%doc /opt/rtems/man/man1/@target_alias@-gdb.1
    9489
    9590%dir /opt/rtems/include
    96 /opt/rtems/include/bfd.h
    97 /opt/rtems/include/bfdlink.h
     91# We install libbfd from binutils
     92# /opt/rtems/include/bfd.h
     93# /opt/rtems/include/bfdlink.h
    9894
    9995%dir /opt/rtems/lib
    100 /opt/rtems/lib/libbfd*
    101 /opt/rtems/lib/libiberty*
     96# We install libbfd from binutils
     97# /opt/rtems/lib/libbfd*
     98# We use libiberty from gcc
     99# /opt/rtems/lib/libiberty*
    102100
    103101%dir /opt/rtems/bin
  • scripts/mkbinutils_subpackage_version

    r8f2cf931 r43e7d103  
    6262echo "Patch0:           binutils-990901-rtems-19991015.diff"
    6363echo ""
    64 echo "Buildroot:    /opt/tmp"
     64echo "Buildroot:    /tmp"
    6565echo "# Patch:"
    6666echo "%description"
  • scripts/mkbinutilspec.in

    r8f2cf931 r43e7d103  
    44#
    55
    6 RTEMS_DIR=`dirname $0`
     6RTEMS_DIR=`dirname $0`/@top_srcdir@
    77
    8 CFG=user.cfg
     8CFG=setup.cache
    99dst=@RPM_SPECSdir@
    1010
     
    1313  echo "$0 [options] <target_alias>"
    1414  echo "  options:"
    15   echo "    -cfg <user.cfg>"
     15  echo "    -cfg <setup.cache>"
    1616  echo "    -o <rpm-spec-dir>"
    1717  exit 1 ;
  • scripts/mkbspspec.in

    r8f2cf931 r43e7d103  
    22#
    33
    4 RTEMS_DIR=`dirname $0`
    5 RTEMS_VERSION=`grep Version ${RTEMS_DIR}/../VERSION | \
    6 sed -e 's%RTEMS[        ]*Version[      ]*\(.*\)[       ]*%\1%g'`
     4RTEMS_DIR=`dirname $0`/@top_srcdir@
     5RTEMS_VERSION=@RTEMS_VERSION@
    76
    8 bsp=$1
    9 target_alias=$2
    10 release=0
     7CFG=setup.cache
     8dst=@RPM_SPECSdir@
    119
    12 # Some linux distributions use /usr/src/packages
    13 # redhat uses /usr/src/redhat
    14 # others might use /usr/src
    15 if test -d /usr/src/packages/SPECS;
     10usage()
     11{
     12  echo "$0 [options] <target_alias> <bsp>"
     13  echo "  options:"
     14  echo "    -cfg <setup.cache>"
     15  echo "    -o <rpm-spec-dir>"
     16  exit 1 ;
     17}
     18
     19while test $# -ge 3; do
     20case $1 in
     21-cfg)
     22  shift
     23  CFG=$1
     24  shift
     25  ;;
     26-o)
     27  shift
     28  dst=$1
     29  shift
     30  ;;
     31-*)
     32  echo "invalid option $1";
     33  usage
     34  ;;
     35esac
     36done
     37
     38if test ! $# -eq 2;
    1639then
    17 dst=/usr/src/packages/SPECS;
    18 elif test -d /usr/src/redhat/SPECS;
    19  then
    20 dst=/usr/src/redhat/SPECS;
    21 elif test -d /usr/src/SPECS/;
    22 then
    23 dst=/usr/src/SPECS;
     40  echo "Invalid number of arguments"
     41  usage
    2442fi
     43
     44# target to build for
     45target_alias=$1
     46bsp=$2
     47
     48. ./$CFG
     49
     50specfile=${dst}/$target_alias-$bsp-$RTEMS_VERSION.spec
    2551
    2652sed -e "s%@Version@%${RTEMS_VERSION}%g" \
    2753-e "s%@bsp@%${bsp}%g" \
    28 -e "s%@Release@%${release}%g" \
     54-e "s%@Release@%${rtems_release}%g" \
    2955-e "s%@target_alias@%${target_alias}%g" \
    30 < ${RTEMS_DIR}/rtems.spec.in \
    31 > ${dst}/rtems-$target_alias-$bsp.spec
     56< ${RTEMS_DIR}/rtems/rtems.spec.in \
     57> ${specfile}
     58
     59echo Generated ${specfile}
  • scripts/mkgccnewlibspec.in

    r8f2cf931 r43e7d103  
    44#
    55
    6 RTEMS_DIR=`dirname $0`
     6RTEMS_DIR=`dirname $0`/@top_srcdir@
    77
    8 CFG=user.cfg
     8CFG=setup.cache
    99dst=@RPM_SPECSdir@
    1010
     
    1313  echo "$0 [options] <target_alias>"
    1414  echo "  options:"
    15   echo "    -cfg <user.cfg>"
     15  echo "    -cfg <setup.cache>"
    1616  echo "    -o <rpm-spec-dir>"
    1717  exit 1 ;
  • scripts/mkgdbspec.in

    r8f2cf931 r43e7d103  
    44#
    55
    6 RTEMS_DIR=`dirname $0`
    7 CFG=user.cfg
     6RTEMS_DIR=`dirname $0`/@top_srcdir@
     7
     8CFG=setup.cache
    89dst=@RPM_SPECSdir@
    910
     
    1213  echo "$0 [options] <target_alias>"
    1314  echo "  options:"
    14   echo "    -cfg <user.cfg>"
     15  echo "    -cfg <setup.cache>"
    1516  echo "    -o <rpm-spec-dir>"
    1617  exit 1 ;
  • scripts/rtems/Makefile.am

    r8f2cf931 r43e7d103  
    11AUTOMAKE_OPTIONS = foreign
    22
    3 # MKBSPSPEC = $(SHELL) $(top_srcdir)/mkbspspec
    4 MKBSPSPEC = @echo $(top_srcdir)/mkbspspec
     3MKBSPSPEC = $(SHELL) $(top_builddir)/mkbspspec
    54
    6 MKBSPSPEC_DEPS = ../mkbspspec rtems.spec.in ../setup.cache
     5MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in $(top_builddir)/setup.cache
    76
    8 i386-rtems-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
    9         $(MKBSPSPEC) -cfg ../setup.cache -o . i386-rtems
     7i386-rtems-pc386-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
     8        $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems pc386
    109
    11 sh-rtems-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
    12         $(MKBSPSPEC) -cfg ../setup.cache -o . sh-rtems
     10sh-rtems-gensh1-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
     11        $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems gensh1
    1312
    14 powerpc-rtems-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
    15         $(MKBSPSPEC) -cfg ../setup.cache -o . powerpc-rtems
     13powerpc-rtems-mcp750-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
     14        $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems mcp750
    1615
    17 sparc-rtems-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
    18         $(MKBSPSPEC) -cfg ../setup.cache -o . sparc-rtems
     16sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
     17        $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems erc32
    1918
    20 m68k-rtems-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
    21         $(MKBSPSPEC) -cfg ../setup.cache -o . m68k-rtems
     19m68k-rtems-gen68360-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
     20        $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems gen68360
    2221
    23 mips64orion-rtems-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
    24         $(MKBSPSPEC) -cfg ../setup.cache -o . mips64orion-rtems
     22mips64orion-rtems-p4600-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
     23        $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems p4600
    2524
    26 i960-rtems-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
    27         $(MKBSPSPEC) -cfg ../setup.cache -o . i960-rtems
     25i960-rtems-cvme961-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
     26        $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems cvme961
    2827
    29 hppa1.1-rtems-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
    30         $(MKBSPSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
     28hppa1.1-rtems-simhppa-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
     29        $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems simhppa
    3130
    3231TEMPLATES = \
     
    3433
    3534RPM_SPECS_DATA = \
    36 i386-rtems-$(BSPVERS).spec \
    37 sh-rtems-$(BSPVERS).spec \
    38 powerpc-rtems-$(BSPVERS).spec \
    39 sparc-rtems-$(BSPVERS).spec \
    40 m68k-rtems-$(BSPVERS).spec \
    41 mips64orion-rtems-$(BSPVERS).spec \
    42 i960-rtems-$(BSPVERS).spec \
    43 hppa1.1-rtems-$(BSPVERS).spec
     35i386-rtems-pc386-$(BSPVERS).spec \
     36sh-rtems-gensh1-$(BSPVERS).spec \
     37powerpc-rtems-mcp750-$(BSPVERS).spec \
     38sparc-rtems-erc32-$(BSPVERS).spec \
     39m68k-rtems-gen68360-$(BSPVERS).spec \
     40mips64orion-rtems-p4600-$(BSPVERS).spec \
     41i960-rtems-cvme961-$(BSPVERS).spec \
     42hppa1.1-rtems-simhppa-$(BSPVERS).spec
    4443
    4544noinst_DATA = \
  • scripts/setup

    r8f2cf931 r43e7d103  
    55# RTEMS tools setup
    66
    7 test -f ./CFG || echo "restoring default setup.cache" && cp ./setup.def ./$CFG
     7if test ! -f ./$CFG;
     8then
     9 echo -n "restoring default setup.cache .."
     10 cp ./setup.def ./$CFG
     11 echo " done"
     12fi
    813
    914echo -n "loading setup from ./$CFG .."
    1015. ./$CFG
    11 echo "done"
     16echo " done"
    1217echo
    1318
Note: See TracChangeset for help on using the changeset viewer.