diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-04-14 10:41:17 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-04-14 10:41:17 +0000 |
commit | 9674bf43f8e7d23639fd571fa9b4f2d03e5eb23d (patch) | |
tree | 12d15cea0662346c7b880a8f89724642dbbc7907 /scripts | |
parent | Add some more diagnostics. Poke TDAR/RDAR only when necessary. (diff) | |
download | rtems-9674bf43f8e7d23639fd571fa9b4f2d03e5eb23d.tar.bz2 |
2005-04-14 Ralf Corsepius <ralf.corsepius@rtems.org>
* cpukit/rtems-cpukit.add, cpukit/target-cpukit.add: Bring this rpm
functional, again.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/ChangeLog | 5 | ||||
-rw-r--r-- | scripts/cpukit/rtems-cpukit.add | 38 | ||||
-rw-r--r-- | scripts/cpukit/target-cpukit.add | 9 |
3 files changed, 37 insertions, 15 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 2ee972b1de..7407151c7b 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2005-04-14 Ralf Corsepius <ralf.corsepius@rtems.org> + + * cpukit/rtems-cpukit.add, cpukit/target-cpukit.add: Bring this rpm + functional, again. + 2005-04-13 Ralf Corsepius <ralf.corsepius@rtems.org> * rtems/Makefile.am: Reworked. diff --git a/scripts/cpukit/rtems-cpukit.add b/scripts/cpukit/rtems-cpukit.add index 70e6286451..8e43bbf392 100644 --- a/scripts/cpukit/rtems-cpukit.add +++ b/scripts/cpukit/rtems-cpukit.add @@ -8,8 +8,9 @@ License: Various, Open Source. Group: %{rpmgroup} Packager: ralf.corsepius@rtems.org and joel@OARcorp.com -BuildPreReq: %{rpmprefix}%{rtems_target}-binutils -BuildPreReq: %{rpmprefix}%{rtems_target}-gcc +BuildRequires: %{rpmprefix}%{rtems_target}-binutils +BuildRequires: %{rpmprefix}%{rtems_target}-gcc + Requires: %{rpmprefix}%{rtems_target}-binutils Requires: %{rpmprefix}%{rtems_target}-gcc @@ -31,9 +32,7 @@ Source: rtems-%{rtems_version}.tar.bz2 # your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR). # Or you can try the ftp options of rpm :-) # -NoSource: 0 -# We claim to be relocatible, but in fact we are not -Prefix: %{_prefix} +%{?!_with_sources:NoSource: 0} %description RTEMS is a free operating system for embedded systems. @@ -42,20 +41,31 @@ This package contains the cpukit for cpu %{rtems_target}. %prep %setup -c -T -n %{name}-%{version} -a0 -test -d build || mkdir build + mkdir -p build %build -cd build -# rtems does not support building inside the source tree - ../rtems-%{rtems_version}/cpukit/configure \ - --build=`../rtems-%{rtems_version}/config.guess` \ + cd build + + ../rtems-%{rtems_version}/configure \ --prefix=%{_prefix} \ - --host=%{rtems_target} --target=%{rtems_target} \ - --exec-prefix=%{_prefix}/%{rtems_target} \ - --enable-multilib + --target=%{rtems_target} \ + --enable-multilib \ + --disable-rtemsbsp \ + --disable-tests \ + --disable-deprecated make RTEMS_BSP= %install -cd build + rm -rf $RPM_BUILD_ROOT + + cd build make RTEMS_BSP= DESTDIR=${RPM_BUILD_ROOT} install + # For the moment, we don't want these man pages + rm -rf ${RPM_BUILD_ROOT}%{_prefix}/man + + # Obsolete and currently broken + rm -rf ${RPM_BUILD_ROOT}%{_prefix}/make + + # host tools + rm -rf ${RPM_BUILD_ROOT}%{_prefix}/bin diff --git a/scripts/cpukit/target-cpukit.add b/scripts/cpukit/target-cpukit.add index 4447474018..635326e5fd 100644 --- a/scripts/cpukit/target-cpukit.add +++ b/scripts/cpukit/target-cpukit.add @@ -1,3 +1,10 @@ +# ============================================================== +# @target_alias@-cpukit +# ============================================================== +# %package -n %{rpmprefix}@target_alias@-cpukit +# Summary: rtems cpukit for @target_alias@ +# Group: %{rpmgroup} +# Requires: %{rpmprefix}@target_alias@-gcc + %files %{_prefix}/%{rtems_target} -%exclude %{_prefix}/man
\ No newline at end of file |