| Submitter | Noor Ahsan |
|---|---|
| Date | Aug. 22, 2011, 2:32 p.m. |
| Message ID | <1314023559-15827-1-git-send-email-noor_ahsan@mentor.com> |
| Download | mbox | patch |
| Permalink | /patch/10371/ |
| State | Superseded |
| Headers | show |
Comments
Kindly ignore this patch I missed some stuff in this patch .... I'll resent the patch again. > -----Original Message----- > From: Ahsan, Noor > Sent: Monday, August 22, 2011 7:33 PM > To: openembedded-devel@lists.openembedded.org > Cc: Ahsan, Noor > Subject: [PATCH][meta-oe] lmbench: Added 3.0-a9 version recipe files > > From: Noor Ahsan <noor_ahsan@mentor.com> > > * Added recipe file to build 3.0-a9 version. > > Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> > --- > .../lmbench-3.0-a9/update-results-script.patch | 155 > ++++++++++++++++++++ > meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb | 75 ++++++++++ > 2 files changed, 230 insertions(+), 0 deletions(-) > > diff --git a/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update- > results-script.patch b/meta-oe/recipes-support/lmbench/lmbench-3.0- > a9/update-results-script.patch > new file mode 100644 > index 0000000..3feb657 > --- /dev/null > +++ b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results- > script.patch > @@ -0,0 +1,155 @@ > +Now that we have our binaries in /usr/bin rather than the normal > +lmbench hierarchy we need to update the scripts as well to bave well > here. > +Index: lmbench-3.0-a9/scripts/results > +=================================================================== > +--- lmbench-3.0-a9.orig/scripts/results > ++++ lmbench-3.0-a9/scripts/results > +@@ -8,11 +8,11 @@ RESULTS=results/$OS > + BASE=../$RESULTS/`uname -n` > + EXT=0 > + > +-if [ ! -f "../bin/$OS/$CONFIG" ] > ++if [ ! -f "$CONFIG" ] > + then echo "No config file?" > + exit 1 > + fi > +-. ../bin/$OS/$CONFIG > ++. $CONFIG > + > + if [ ! -d ../$RESULTS ] > + then mkdir -p ../$RESULTS > +@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1` > + RESULTS=$BASE.$EXT > + done > + > +-cd ../bin/$OS > +-PATH=.:${PATH}; export PATH > + export SYNC_MAX > + export OUTPUT > +-lmbench $CONFIG 2>../${RESULTS} > ++lmbench $CONFIG 2>${RESULTS} > + > + if [ X$MAIL = Xyes ] > + then echo Mailing results > +Index: lmbench-3.0-a9/scripts/config-run > +=================================================================== > +--- lmbench-3.0-a9.orig/scripts/config-run > ++++ lmbench-3.0-a9/scripts/config-run > +@@ -132,20 +132,20 @@ export LMBENCH_SCHED > + > ####################################################################### > ##### > + echo $L; echo ""; > + echo "Hang on, we are calculating your timing granularity." > +-../bin/$OS/msleep 250 > +-ENOUGH=`../bin/$OS/enough` > ++msleep 250 > ++ENOUGH=`enough` > + export ENOUGH > + echo "OK, it looks like you can time stuff down to $ENOUGH usec > resolution." > + echo "" > + echo "Hang on, we are calculating your timing overhead." > +-../bin/$OS/msleep 250 > +-TIMING_O=`../bin/$OS/timing_o` > ++msleep 250 > ++TIMING_O=`timing_o` > + export TIMING_O > + echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs." > + echo "" > + echo "Hang on, we are calculating your loop overhead." > +-../bin/$OS/msleep 250 > +-LOOP_O=`../bin/$OS/loop_o` > ++msleep 250 > ++LOOP_O=`loop_o` > + export LOOP_O > + echo "OK, it looks like your benchmark loop costs $LOOP_O usecs." > + echo "" > +@@ -177,7 +177,7 @@ then > + fi > + if [ X$MB = X ] > + then $ECHON "Probing system for available memory: $ECHOC" > +- MB=`../bin/$OS/memsize 4096` > ++ MB=`memsize 4096` > + fi > + TOTAL_MEM=$MB > + MB=`echo \( $MB \* 7 \) / 10 | bc 2>/dev/null` > +@@ -205,9 +205,9 @@ fi > + # Certain machines tend to barf when you try and bcopy 8MB. > + # Figure out how much we can use. > + echo "Checking to see if you have $MB MB; please wait for a > moment..." > +-MB=`../bin/$OS/memsize $MB` > +-MB=`../bin/$OS/memsize $MB` > +-MB=`../bin/$OS/memsize $MB` > ++MB=`memsize $MB` > ++MB=`memsize $MB` > ++MB=`memsize $MB` > + if [ `expr $SYNC_MAX \* $MB` -gt `expr $TOTAL_MEM` ] > + then > + MB=`expr $TOTAL_MEM / $SYNC_MAX` > +@@ -223,8 +223,8 @@ then echo Warning: you have only ${MB}MB > + fi > + > + echo "Hang on, we are calculating your cache line size." > +-../bin/$OS/msleep 250 > +-LINE_SIZE=`../bin/$OS/lm_line -M ${MB}M` > ++msleep 250 > ++LINE_SIZE=`lm_line -M ${MB}M` > + export LINE_SIZE > + echo "OK, it looks like your cache line is $LINE_SIZE bytes." > + echo "" > +@@ -479,7 +479,7 @@ EOF > + then > + for i in $disks > + do if [ -r $i ] > +- then ../bin/$OS/flushdisk $i > ++ then flushdisk $i > + if [ $? -eq 1 ] > + then echo "Must be root to run disk > benchmarks." > + echo "Root is needed to flush the buffer > cache" > +@@ -584,7 +584,7 @@ fi > + echo $L > + echo "" > + echo "Calculating mhz, please wait for a moment..." > +-MHZ=`../bin/$OS/mhz` > ++MHZ=`mhz` > + cat<<EOF > + I think your CPU mhz is > + > +@@ -689,9 +689,9 @@ esac > + > + INFO=`../scripts/info` > + if [ $MAIL = yes ] > +-then if [ ! -f ../bin/$OS/$INFO ] > +- then cp ../scripts/info-template ../bin/$OS/$INFO > +- chmod +w ../bin/$OS/$INFO > ++then if [ ! -f $INFO ] > ++ then cp ../scripts/info-template $INFO > ++ chmod +w $INFO > + REUSE=no > + else > + REUSE=view > +@@ -705,7 +705,7 @@ then if [ ! -f ../bin/$OS/$INFO ] > + ;; > + [Vv]*) REUSE=view > + echo $L > +- more ../bin/$OS/$INFO > ++ more $INFO > + echo $L > + ;; > + *) REUSE=yes > +@@ -733,7 +733,7 @@ EOF > + then EDITOR=$TMP > + fi > + if [ X$EDITOR != "none" ] > +- then $EDITOR ../bin/$OS/`../scripts/info` > ++ then $EDITOR `../scripts/info` > + fi > + fi > + fi > +@@ -750,7 +750,7 @@ EOF > + > + VERSION=`../scripts/version` > + > +-C=../bin/$OS/`../scripts/config` > ++C=`../scripts/config` > + echo DISKS=\"$DISKS\" > $C > + echo DISK_DESC=\"$DISK_DESC\" >> $C > + echo OUTPUT=$OUTPUT >> $C > diff --git a/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb b/meta- > oe/recipes-support/lmbench/lmbench_3.0-a9.bb > new file mode 100644 > index 0000000..1076eeb > --- /dev/null > +++ b/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb > @@ -0,0 +1,75 @@ > +SECTION = "console/utils" > +DESCRIPTION = "Tools for performance analysis." > +LICENSE = "GPL" > +LICENSE = "GPLv2+ & LGPLv2.1+" > +LIC_FILES_CHKSUM = > "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ > + file://COPYING- > 2;md5=8e9aee2ccc75d61d107e43794a25cdf9" > +RDEPENDS_${PN} = "debianutils" > + > +PR = "r0" > + > +inherit autotools > + > +SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ > + file://lmbench-run \ > + file://rename-line-binary.patch \ > + file://update-results-script.patch \ > + file://obey-ranlib.patch" > +SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" > +SRC_URI[sha256sum] = > "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" > + > +S = "${WORKDIR}/lmbench-${PV}" > + > +EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" > CFLAGS="${CFLAGS}" \ > + LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \ > + TARGET="${TARGET_OS}" BASE="${prefix}"' > + > + > +python do_unpack () { > + bb.build.exec_func('base_do_unpack', d) > + bb.build.exec_func('byebk_do_unpack', d) > +} > + > +byebk_do_unpack () { > + find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf > +} > + > +do_configure() { > + : > +} > + > +do_compile () { > + . ${CONFIG_SITE} > + if [ X"$ac_cv_uint" = X"yes" ]; then > + CFLAGS="${CFLAGS} -DHAVE_uint" > + fi > + install -d ${S}/bin/${TARGET_SYS} > + oe_runmake -C src > +} > + > +do_install () { > + install -d ${D}${localstatedir}/run/lmbench \ > + ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ > + ${D}${datadir}/lmbench/scripts > + oe_runmake 'BASE=${D}${prefix}' \ > + -C src install > + mv ${D}${bindir}/line ${D}${bindir}/lm_line > + mv ${D}${prefix}/man/* ${D}${mandir}/ > + install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ > + sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \ > + -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' \ > + -e 's,^CONFIG=.*$,CONFIG=$SHAREDIR/`$SCRIPTSDIR/config`,;' > \ > + ${D}${bindir}/lmbench-run > + install -m 0755 ${S}/scripts/lmbench ${D}${bindir} > + install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts > + > + if [ -f ${WORKDIR}/CONFIG.${MACHINE} ]; then > + install -d ${D}${localstatedir}/lib/lmbench/config > + mkdir -p ${D}/${datadir}/lmbench/bin/${TARGET_PREFIX} > + install -m 0644 ${WORKDIR}/CONFIG.${MACHINE} \ > + > ${D}/${datadir}/lmbench/bin/${TARGET_PREFIX}/CONFIG.${MACHINE} > + fi > + > +} > + > +FILES_${PN} += "${datadir}/lmbench" > -- > 1.7.0.4
On Mon, Aug 22, 2011 at 9:32 AM, Noor, Ahsan <noor_ahsan@mentor.com> wrote: > From: Noor Ahsan <noor_ahsan@mentor.com> > > * Added recipe file to build 3.0-a9 version. > > Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> > --- > .../lmbench-3.0-a9/update-results-script.patch | 155 ++++++++++++++++++++ > meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb | 75 ++++++++++ > 2 files changed, 230 insertions(+), 0 deletions(-) > > diff --git a/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch > new file mode 100644 > index 0000000..3feb657 > --- /dev/null > +++ b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch > @@ -0,0 +1,155 @@ > +Now that we have our binaries in /usr/bin rather than the normal > +lmbench hierarchy we need to update the scripts as well to bave well here. There's now a defined patch header, please update to this. > diff --git a/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb [snip] > +python do_unpack () { > + bb.build.exec_func('base_do_unpack', d) > + bb.build.exec_func('byebk_do_unpack', d) > +} > + > +byebk_do_unpack () { > + find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf > +} All of this, I believe, dates back to when OE was in BK and that could be problematic, we should drop this now I think. Thanks!
Dear Noor, please try to incorporate the following comments when sending the next version. Am Montag, den 22.08.2011, 19:32 +0500 schrieb Noor, Ahsan: > From: Noor Ahsan <noor_ahsan@mentor.com> > > * Added recipe file to build 3.0-a9 version. Please do not duplicate the commit summary in the commit message body and please use present tense. lmbench: Add version 3.0-a9 (initial recipe) • imported from oe.dev (rev goes here) What build configuration do you use? > Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> > --- > .../lmbench-3.0-a9/update-results-script.patch | 155 ++++++++++++++++++++ > meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb | 75 ++++++++++ > 2 files changed, 230 insertions(+), 0 deletions(-) > > diff --git a/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch > new file mode 100644 > index 0000000..3feb657 > --- /dev/null > +++ b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch > @@ -0,0 +1,155 @@ > +Now that we have our binaries in /usr/bin rather than the normal > +lmbench hierarchy we need to update the scripts as well to bave well here. s/bave/behave/ Did you send that patch upstream? > +Index: lmbench-3.0-a9/scripts/results > +=================================================================== > +--- lmbench-3.0-a9.orig/scripts/results > ++++ lmbench-3.0-a9/scripts/results > +@@ -8,11 +8,11 @@ RESULTS=results/$OS > + BASE=../$RESULTS/`uname -n` > + EXT=0 > + > +-if [ ! -f "../bin/$OS/$CONFIG" ] > ++if [ ! -f "$CONFIG" ] > + then echo "No config file?" > + exit 1 > + fi > +-. ../bin/$OS/$CONFIG > ++. $CONFIG > + > + if [ ! -d ../$RESULTS ] > + then mkdir -p ../$RESULTS > +@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1` > + RESULTS=$BASE.$EXT > + done > + > +-cd ../bin/$OS > +-PATH=.:${PATH}; export PATH > + export SYNC_MAX > + export OUTPUT > +-lmbench $CONFIG 2>../${RESULTS} > ++lmbench $CONFIG 2>${RESULTS} > + > + if [ X$MAIL = Xyes ] > + then echo Mailing results > +Index: lmbench-3.0-a9/scripts/config-run > +=================================================================== > +--- lmbench-3.0-a9.orig/scripts/config-run > ++++ lmbench-3.0-a9/scripts/config-run > +@@ -132,20 +132,20 @@ export LMBENCH_SCHED > + ############################################################################ > + echo $L; echo ""; > + echo "Hang on, we are calculating your timing granularity." > +-../bin/$OS/msleep 250 > +-ENOUGH=`../bin/$OS/enough` > ++msleep 250 > ++ENOUGH=`enough` > + export ENOUGH > + echo "OK, it looks like you can time stuff down to $ENOUGH usec resolution." > + echo "" > + echo "Hang on, we are calculating your timing overhead." > +-../bin/$OS/msleep 250 > +-TIMING_O=`../bin/$OS/timing_o` > ++msleep 250 > ++TIMING_O=`timing_o` > + export TIMING_O > + echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs." > + echo "" > + echo "Hang on, we are calculating your loop overhead." > +-../bin/$OS/msleep 250 > +-LOOP_O=`../bin/$OS/loop_o` > ++msleep 250 > ++LOOP_O=`loop_o` > + export LOOP_O > + echo "OK, it looks like your benchmark loop costs $LOOP_O usecs." > + echo "" > +@@ -177,7 +177,7 @@ then > + fi > + if [ X$MB = X ] > + then $ECHON "Probing system for available memory: $ECHOC" > +- MB=`../bin/$OS/memsize 4096` > ++ MB=`memsize 4096` > + fi > + TOTAL_MEM=$MB > + MB=`echo \( $MB \* 7 \) / 10 | bc 2>/dev/null` > +@@ -205,9 +205,9 @@ fi > + # Certain machines tend to barf when you try and bcopy 8MB. > + # Figure out how much we can use. > + echo "Checking to see if you have $MB MB; please wait for a moment..." > +-MB=`../bin/$OS/memsize $MB` > +-MB=`../bin/$OS/memsize $MB` > +-MB=`../bin/$OS/memsize $MB` > ++MB=`memsize $MB` > ++MB=`memsize $MB` > ++MB=`memsize $MB` > + if [ `expr $SYNC_MAX \* $MB` -gt `expr $TOTAL_MEM` ] > + then > + MB=`expr $TOTAL_MEM / $SYNC_MAX` > +@@ -223,8 +223,8 @@ then echo Warning: you have only ${MB}MB > + fi > + > + echo "Hang on, we are calculating your cache line size." > +-../bin/$OS/msleep 250 > +-LINE_SIZE=`../bin/$OS/lm_line -M ${MB}M` > ++msleep 250 > ++LINE_SIZE=`lm_line -M ${MB}M` > + export LINE_SIZE > + echo "OK, it looks like your cache line is $LINE_SIZE bytes." > + echo "" > +@@ -479,7 +479,7 @@ EOF > + then > + for i in $disks > + do if [ -r $i ] > +- then ../bin/$OS/flushdisk $i > ++ then flushdisk $i > + if [ $? -eq 1 ] > + then echo "Must be root to run disk benchmarks." > + echo "Root is needed to flush the buffer cache" > +@@ -584,7 +584,7 @@ fi > + echo $L > + echo "" > + echo "Calculating mhz, please wait for a moment..." > +-MHZ=`../bin/$OS/mhz` > ++MHZ=`mhz` > + cat<<EOF > + I think your CPU mhz is > + > +@@ -689,9 +689,9 @@ esac > + > + INFO=`../scripts/info` > + if [ $MAIL = yes ] > +-then if [ ! -f ../bin/$OS/$INFO ] > +- then cp ../scripts/info-template ../bin/$OS/$INFO > +- chmod +w ../bin/$OS/$INFO > ++then if [ ! -f $INFO ] > ++ then cp ../scripts/info-template $INFO > ++ chmod +w $INFO > + REUSE=no > + else > + REUSE=view > +@@ -705,7 +705,7 @@ then if [ ! -f ../bin/$OS/$INFO ] > + ;; > + [Vv]*) REUSE=view > + echo $L > +- more ../bin/$OS/$INFO > ++ more $INFO > + echo $L > + ;; > + *) REUSE=yes > +@@ -733,7 +733,7 @@ EOF > + then EDITOR=$TMP > + fi > + if [ X$EDITOR != "none" ] > +- then $EDITOR ../bin/$OS/`../scripts/info` > ++ then $EDITOR `../scripts/info` > + fi > + fi > + fi > +@@ -750,7 +750,7 @@ EOF > + > + VERSION=`../scripts/version` > + > +-C=../bin/$OS/`../scripts/config` > ++C=`../scripts/config` > + echo DISKS=\"$DISKS\" > $C > + echo DISK_DESC=\"$DISK_DESC\" >> $C > + echo OUTPUT=$OUTPUT >> $C > diff --git a/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb > new file mode 100644 > index 0000000..1076eeb > --- /dev/null > +++ b/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb > @@ -0,0 +1,75 @@ > +SECTION = "console/utils" > +DESCRIPTION = "Tools for performance analysis." > +LICENSE = "GPL" > +LICENSE = "GPLv2+ & LGPLv2.1+" > +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ > + file://COPYING-2;md5=8e9aee2ccc75d61d107e43794a25cdf9" > +RDEPENDS_${PN} = "debianutils" > + > +PR = "r0" > + > +inherit autotools > + > +SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ > + file://lmbench-run \ > + file://rename-line-binary.patch \ > + file://update-results-script.patch \ > + file://obey-ranlib.patch" Please add `\` at the end and put " on the new line. > +SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" > +SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" > + > +S = "${WORKDIR}/lmbench-${PV}" Is that the default? > +EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" \ > + LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \ > + TARGET="${TARGET_OS}" BASE="${prefix}"' > + > + > +python do_unpack () { > + bb.build.exec_func('base_do_unpack', d) > + bb.build.exec_func('byebk_do_unpack', d) > +} > + > +byebk_do_unpack () { > + find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf > +} > + > +do_configure() { > + : > +} Please comment why the above is needed. > +do_compile () { > + . ${CONFIG_SITE} > + if [ X"$ac_cv_uint" = X"yes" ]; then > + CFLAGS="${CFLAGS} -DHAVE_uint" > + fi > + install -d ${S}/bin/${TARGET_SYS} > + oe_runmake -C src > +} > + > +do_install () { > + install -d ${D}${localstatedir}/run/lmbench \ > + ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ > + ${D}${datadir}/lmbench/scripts > + oe_runmake 'BASE=${D}${prefix}' \ > + -C src install > + mv ${D}${bindir}/line ${D}${bindir}/lm_line > + mv ${D}${prefix}/man/* ${D}${mandir}/ > + install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ > + sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \ > + -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' \ > + -e 's,^CONFIG=.*$,CONFIG=$SHAREDIR/`$SCRIPTSDIR/config`,;' \ > + ${D}${bindir}/lmbench-run > + install -m 0755 ${S}/scripts/lmbench ${D}${bindir} > + install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts > + > + if [ -f ${WORKDIR}/CONFIG.${MACHINE} ]; then > + install -d ${D}${localstatedir}/lib/lmbench/config > + mkdir -p ${D}/${datadir}/lmbench/bin/${TARGET_PREFIX} > + install -m 0644 ${WORKDIR}/CONFIG.${MACHINE} \ > + ${D}/${datadir}/lmbench/bin/${TARGET_PREFIX}/CONFIG.${MACHINE} > + fi > + > +} > + > +FILES_${PN} += "${datadir}/lmbench" Thanks, Paul
On Mon, Aug 22, 2011 at 12:13 PM, Paul Menzel <paulepanter@users.sourceforge.net> wrote: > Dear Noor, > > > please try to incorporate the following comments when sending the next > version. > > Am Montag, den 22.08.2011, 19:32 +0500 schrieb Noor, Ahsan: >> From: Noor Ahsan <noor_ahsan@mentor.com> >> >> * Added recipe file to build 3.0-a9 version. > > Please do not duplicate the commit summary in the commit message body > and please use present tense. > > lmbench: Add version 3.0-a9 (initial recipe) > > • imported from oe.dev (rev goes here) > > What build configuration do you use? > >> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> >> --- >> .../lmbench-3.0-a9/update-results-script.patch | 155 ++++++++++++++++++++ >> meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb | 75 ++++++++++ >> 2 files changed, 230 insertions(+), 0 deletions(-) >> >> diff --git a/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch >> new file mode 100644 >> index 0000000..3feb657 >> --- /dev/null >> +++ b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch >> @@ -0,0 +1,155 @@ >> +Now that we have our binaries in /usr/bin rather than the normal >> +lmbench hierarchy we need to update the scripts as well to bave well here. > > s/bave/behave/ > > Did you send that patch upstream? This is related to the OE-specific behavior of installing into /usr/bin, etc, rather than dumping everything into /usr/share/lmbench or similar. For the Upstream-Status line :)
Dear Noor, Am Montag, den 22.08.2011, 12:17 -0500 schrieb Tom Rini: > On Mon, Aug 22, 2011 at 12:13 PM, Paul Menzel wrote: > > please try to incorporate the following comments when sending the next > > version. > > > > Am Montag, den 22.08.2011, 19:32 +0500 schrieb Noor, Ahsan: > >> From: Noor Ahsan <noor_ahsan@mentor.com> > >> > >> * Added recipe file to build 3.0-a9 version. > > > > Please do not duplicate the commit summary in the commit message body > > and please use present tense. > > > > lmbench: Add version 3.0-a9 (initial recipe) > > > > • imported from oe.dev (rev goes here) please take a look at oe.dev [1]. I did some clean up there. > > What build configuration do you use? > > > >> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> > >> --- > >> .../lmbench-3.0-a9/update-results-script.patch | 155 ++++++++++++++++++++ > >> meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb | 75 ++++++++++ > >> 2 files changed, 230 insertions(+), 0 deletions(-) > >> > >> diff --git a/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch > >> new file mode 100644 > >> index 0000000..3feb657 > >> --- /dev/null > >> +++ b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch > >> @@ -0,0 +1,155 @@ > >> +Now that we have our binaries in /usr/bin rather than the normal > >> +lmbench hierarchy we need to update the scripts as well to bave well here. > > > > s/bave/behave/ > > > > Did you send that patch upstream? > > This is related to the OE-specific behavior of installing into > /usr/bin, etc, rather than dumping everything into /usr/share/lmbench > or similar. For the Upstream-Status line :) I see. Upstream seems to be dead otherwise they could have adapted that patch. Noor, I did not update that comment in oe.dev. Thanks, Paul [1] http://cgit.openembedded.org/cgit.cgi/openembedded/log/recipes/lmbench/
Am Montag, den 22.08.2011, 19:13 +0200 schrieb Paul Menzel: > Am Montag, den 22.08.2011, 19:32 +0500 schrieb Noor, Ahsan: > > +SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ > > + file://lmbench-run \ > > + file://rename-line-binary.patch \ > > + file://update-results-script.patch \ > > + file://obey-ranlib.patch" > > Please add `\` at the end and put " on the new line. As to your question on IRC why this is useful. My reasoning is, that in the future patch diffs will be smaller when adding a new line to the end of `SRC_URI`. But in the end it is just taste and no hard rule. […] Thanks, Paul
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 23-08-11 17:09, Paul Menzel schreef: > Am Montag, den 22.08.2011, 19:13 +0200 schrieb Paul Menzel: > >> Am Montag, den 22.08.2011, 19:32 +0500 schrieb Noor, Ahsan: > >>> +SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ + file://lmbench-run \ + file://rename-line-binary.patch \ + file://update-results-script.patch \ + file://obey-ranlib.patch" >> >> Please add `\` at the end and put " on the new line. > > As to your question on IRC why this is useful. My reasoning is, that in the future patch diffs will be smaller when adding a new line to the end of `SRC_URI`. But in the end it is just taste and no hard rule. It also makes it easier to copy/paste a line into the end of the SRC_URI instead of making it the second to last entry :) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) iD8DBQFOU8QEMkyGM64RGpERAmB+AJ90xGGui+WJPBA7Yr/PI5MeurfYpACcCtAu YzAmqSIWY11e1G1PrDHnQ28= =2SnN -----END PGP SIGNATURE-----
Patch
diff --git a/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch new file mode 100644 index 0000000..3feb657 --- /dev/null +++ b/meta-oe/recipes-support/lmbench/lmbench-3.0-a9/update-results-script.patch @@ -0,0 +1,155 @@ +Now that we have our binaries in /usr/bin rather than the normal +lmbench hierarchy we need to update the scripts as well to bave well here. +Index: lmbench-3.0-a9/scripts/results +=================================================================== +--- lmbench-3.0-a9.orig/scripts/results ++++ lmbench-3.0-a9/scripts/results +@@ -8,11 +8,11 @@ RESULTS=results/$OS + BASE=../$RESULTS/`uname -n` + EXT=0 + +-if [ ! -f "../bin/$OS/$CONFIG" ] ++if [ ! -f "$CONFIG" ] + then echo "No config file?" + exit 1 + fi +-. ../bin/$OS/$CONFIG ++. $CONFIG + + if [ ! -d ../$RESULTS ] + then mkdir -p ../$RESULTS +@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1` + RESULTS=$BASE.$EXT + done + +-cd ../bin/$OS +-PATH=.:${PATH}; export PATH + export SYNC_MAX + export OUTPUT +-lmbench $CONFIG 2>../${RESULTS} ++lmbench $CONFIG 2>${RESULTS} + + if [ X$MAIL = Xyes ] + then echo Mailing results +Index: lmbench-3.0-a9/scripts/config-run +=================================================================== +--- lmbench-3.0-a9.orig/scripts/config-run ++++ lmbench-3.0-a9/scripts/config-run +@@ -132,20 +132,20 @@ export LMBENCH_SCHED + ############################################################################ + echo $L; echo ""; + echo "Hang on, we are calculating your timing granularity." +-../bin/$OS/msleep 250 +-ENOUGH=`../bin/$OS/enough` ++msleep 250 ++ENOUGH=`enough` + export ENOUGH + echo "OK, it looks like you can time stuff down to $ENOUGH usec resolution." + echo "" + echo "Hang on, we are calculating your timing overhead." +-../bin/$OS/msleep 250 +-TIMING_O=`../bin/$OS/timing_o` ++msleep 250 ++TIMING_O=`timing_o` + export TIMING_O + echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs." + echo "" + echo "Hang on, we are calculating your loop overhead." +-../bin/$OS/msleep 250 +-LOOP_O=`../bin/$OS/loop_o` ++msleep 250 ++LOOP_O=`loop_o` + export LOOP_O + echo "OK, it looks like your benchmark loop costs $LOOP_O usecs." + echo "" +@@ -177,7 +177,7 @@ then + fi + if [ X$MB = X ] + then $ECHON "Probing system for available memory: $ECHOC" +- MB=`../bin/$OS/memsize 4096` ++ MB=`memsize 4096` + fi + TOTAL_MEM=$MB + MB=`echo \( $MB \* 7 \) / 10 | bc 2>/dev/null` +@@ -205,9 +205,9 @@ fi + # Certain machines tend to barf when you try and bcopy 8MB. + # Figure out how much we can use. + echo "Checking to see if you have $MB MB; please wait for a moment..." +-MB=`../bin/$OS/memsize $MB` +-MB=`../bin/$OS/memsize $MB` +-MB=`../bin/$OS/memsize $MB` ++MB=`memsize $MB` ++MB=`memsize $MB` ++MB=`memsize $MB` + if [ `expr $SYNC_MAX \* $MB` -gt `expr $TOTAL_MEM` ] + then + MB=`expr $TOTAL_MEM / $SYNC_MAX` +@@ -223,8 +223,8 @@ then echo Warning: you have only ${MB}MB + fi + + echo "Hang on, we are calculating your cache line size." +-../bin/$OS/msleep 250 +-LINE_SIZE=`../bin/$OS/lm_line -M ${MB}M` ++msleep 250 ++LINE_SIZE=`lm_line -M ${MB}M` + export LINE_SIZE + echo "OK, it looks like your cache line is $LINE_SIZE bytes." + echo "" +@@ -479,7 +479,7 @@ EOF + then + for i in $disks + do if [ -r $i ] +- then ../bin/$OS/flushdisk $i ++ then flushdisk $i + if [ $? -eq 1 ] + then echo "Must be root to run disk benchmarks." + echo "Root is needed to flush the buffer cache" +@@ -584,7 +584,7 @@ fi + echo $L + echo "" + echo "Calculating mhz, please wait for a moment..." +-MHZ=`../bin/$OS/mhz` ++MHZ=`mhz` + cat<<EOF + I think your CPU mhz is + +@@ -689,9 +689,9 @@ esac + + INFO=`../scripts/info` + if [ $MAIL = yes ] +-then if [ ! -f ../bin/$OS/$INFO ] +- then cp ../scripts/info-template ../bin/$OS/$INFO +- chmod +w ../bin/$OS/$INFO ++then if [ ! -f $INFO ] ++ then cp ../scripts/info-template $INFO ++ chmod +w $INFO + REUSE=no + else + REUSE=view +@@ -705,7 +705,7 @@ then if [ ! -f ../bin/$OS/$INFO ] + ;; + [Vv]*) REUSE=view + echo $L +- more ../bin/$OS/$INFO ++ more $INFO + echo $L + ;; + *) REUSE=yes +@@ -733,7 +733,7 @@ EOF + then EDITOR=$TMP + fi + if [ X$EDITOR != "none" ] +- then $EDITOR ../bin/$OS/`../scripts/info` ++ then $EDITOR `../scripts/info` + fi + fi + fi +@@ -750,7 +750,7 @@ EOF + + VERSION=`../scripts/version` + +-C=../bin/$OS/`../scripts/config` ++C=`../scripts/config` + echo DISKS=\"$DISKS\" > $C + echo DISK_DESC=\"$DISK_DESC\" >> $C + echo OUTPUT=$OUTPUT >> $C diff --git a/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb new file mode 100644 index 0000000..1076eeb --- /dev/null +++ b/meta-oe/recipes-support/lmbench/lmbench_3.0-a9.bb @@ -0,0 +1,75 @@ +SECTION = "console/utils" +DESCRIPTION = "Tools for performance analysis." +LICENSE = "GPL" +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ + file://COPYING-2;md5=8e9aee2ccc75d61d107e43794a25cdf9" +RDEPENDS_${PN} = "debianutils" + +PR = "r0" + +inherit autotools + +SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ + file://lmbench-run \ + file://rename-line-binary.patch \ + file://update-results-script.patch \ + file://obey-ranlib.patch" +SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" +SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" + +S = "${WORKDIR}/lmbench-${PV}" + +EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \ + TARGET="${TARGET_OS}" BASE="${prefix}"' + + +python do_unpack () { + bb.build.exec_func('base_do_unpack', d) + bb.build.exec_func('byebk_do_unpack', d) +} + +byebk_do_unpack () { + find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf +} + +do_configure() { + : +} + +do_compile () { + . ${CONFIG_SITE} + if [ X"$ac_cv_uint" = X"yes" ]; then + CFLAGS="${CFLAGS} -DHAVE_uint" + fi + install -d ${S}/bin/${TARGET_SYS} + oe_runmake -C src +} + +do_install () { + install -d ${D}${localstatedir}/run/lmbench \ + ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ + ${D}${datadir}/lmbench/scripts + oe_runmake 'BASE=${D}${prefix}' \ + -C src install + mv ${D}${bindir}/line ${D}${bindir}/lm_line + mv ${D}${prefix}/man/* ${D}${mandir}/ + install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ + sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \ + -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' \ + -e 's,^CONFIG=.*$,CONFIG=$SHAREDIR/`$SCRIPTSDIR/config`,;' \ + ${D}${bindir}/lmbench-run + install -m 0755 ${S}/scripts/lmbench ${D}${bindir} + install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts + + if [ -f ${WORKDIR}/CONFIG.${MACHINE} ]; then + install -d ${D}${localstatedir}/lib/lmbench/config + mkdir -p ${D}/${datadir}/lmbench/bin/${TARGET_PREFIX} + install -m 0644 ${WORKDIR}/CONFIG.${MACHINE} \ + ${D}/${datadir}/lmbench/bin/${TARGET_PREFIX}/CONFIG.${MACHINE} + fi + +} + +FILES_${PN} += "${datadir}/lmbench"