diff --git a/find_binary.patch b/find_binary.patch new file mode 100644 index 0000000..39caa43 --- /dev/null +++ b/find_binary.patch @@ -0,0 +1,47 @@ +diff -pur libmicro-0.4.0/bench.sh libmicro-0.4.0-fixed/bench.sh +--- libmicro-0.4.0/bench.sh 2007-07-02 23:17:45.000000000 +0200 ++++ libmicro-0.4.0-fixed/bench.sh 2008-03-17 12:25:00.000000000 +0100 +@@ -30,8 +30,9 @@ + # Use is subject to license terms. + # + ++BIN="/usr/lib/libMicro/bin" + bench_version=0.4.0 +-libmicro_version=`bin/tattle -V` ++libmicro_version=`$BIN/tattle -V` + + case $libmicro_version in + $bench_version) +@@ -96,14 +97,14 @@ printf "!CPU_NAME: %30s\n" "$p_type" + printf "!IP_address: %30s\n" `getent hosts $hostname | awk '{print $1}'` + printf "!Run_by: %30s\n" $LOGNAME + printf "!Date: %30s\n" "`date '+%D %R'`" +-printf "!Compiler: %30s\n" `bin/tattle -c` +-printf "!Compiler Ver.:%30s\n" "`bin/tattle -v`" +-printf "!sizeof(long): %30s\n" `bin/tattle -s` +-printf "!extra_CFLAGS: %30s\n" "`bin/tattle -f`" +-printf "!TimerRes: %30s\n" "`bin/tattle -r`" ++printf "!Compiler: %30s\n" `$BIN/tattle -c` ++printf "!Compiler Ver.:%30s\n" "`$BIN/tattle -v`" ++printf "!sizeof(long): %30s\n" `$BIN/tattle -s` ++printf "!extra_CFLAGS: %30s\n" "`$BIN/tattle -f`" ++printf "!TimerRes: %30s\n" "`$BIN/tattle -r`" + + mkdir -p $TMPROOT/bin +-cp bin-$ARCH/exec_bin $TMPROOT/bin/$A ++cp $BIN/exec_bin $TMPROOT/bin/$A + + while read A B + do +@@ -125,9 +126,9 @@ do + + if [ ! -f $TMPROOT/bin/$A ] + then +- cp bin-$ARCH/$A $TMPROOT/bin/$A ++ cp $BIN/$A $TMPROOT/bin/$A + fi +- (cd $TMPROOT && eval "bin/$A $B") ++ (cd $TMPROOT && eval "$BIN/$A $B") + done <<. + # + # Obligatory null system call: use very short time diff --git a/libmicro.changes b/libmicro.changes index 1d2feea..188e2b5 100644 --- a/libmicro.changes +++ b/libmicro.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 17 13:29:16 CET 2008 - yxu@suse.de + +- retrieve the essential test executing file: bench.sh +- clarify the path for binary in bench.sh + ------------------------------------------------------------------- Fri Jul 13 08:56:32 CET 2007 - pkirsch@suse.de - initial package diff --git a/libmicro.spec b/libmicro.spec index 02db212..bf30f2d 100644 --- a/libmicro.spec +++ b/libmicro.spec @@ -1,7 +1,7 @@ # # spec file for package libmicro (Version 0.4.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,16 +10,18 @@ # norootforbuild + Name: libmicro -License: CDDL +License: Other uncritical OpenSource License Group: System/Benchmark Requires: kernel-source gcc make -Autoreqprov: on +AutoReqProv: on Summary: kernel test suite, micro benchmark -URL: http://www.opensolaris.org/os/project/libmicro/ +Url: http://www.opensolaris.org/os/project/libmicro/ Version: 0.4.0 -Release: 1 +Release: 37 Source0: %{name}-%{version}.tar.bz2 +Patch0: find_binary.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,21 +37,20 @@ Authors: %prep %setup -#%patch +%patch0 -p1 %build make %install - mkdir -p $RPM_BUILD_ROOT/usr/lib/libMicro - mkdir -p $RPM_BUILD_ROOT/usr/lib/libMicro/src - mkdir -p $RPM_BUILD_ROOT/usr/lib/libMicro/bin +mkdir -p $RPM_BUILD_ROOT/usr/lib/libMicro +mkdir -p $RPM_BUILD_ROOT/usr/lib/libMicro/bin +install -m 644 README $RPM_BUILD_ROOT/usr/lib/libMicro cp bin/* $RPM_BUILD_ROOT/usr/lib/libMicro/bin cp bin-*/* $RPM_BUILD_ROOT/usr/lib/libMicro/bin -#cp *.c *.sh $RPM_BUILD_ROOT/usr/lib/libMicro/src -cp README $RPM_BUILD_ROOT/usr/lib/libMicro -# install -m 755 runtests.sh $RPM_BUILD_ROOT/usr/lib/libMicro - install -m 644 README $RPM_BUILD_ROOT/usr/lib/libMicro +install -m 755 *.sh $RPM_BUILD_ROOT/usr/lib/libMicro/bin +#the sequence is important! +#install -m 755 runtests.sh $RPM_BUILD_ROOT/usr/lib/libMicro %files %defattr(-,root,root) @@ -60,5 +61,8 @@ cp README $RPM_BUILD_ROOT/usr/lib/libMicro rm -rf $RPM_BUILD_ROOT %changelog -* Fri Jul 13 2007 - pkirsch@suse.de +* Mon Mar 17 2008 yxu@suse.de +- retrieve the essential test executing file: bench.sh +- clarify the path for binary in bench.sh +* Fri Jul 13 2007 pkirsch@suse.de - initial package