[oe-commits] Carlos Hernandez : lmbench: rename 'line' binary as 'lm_line'

[git version control]

Module: openembedded.git
Branch: 2011.03-maintenance
Commit: 46ece5835e6d6e33dfb0803633dadc9b6b967583
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=46ece5835e6d6e33dfb0803633dadc9b6b967583

Author: Carlos Hernandez <carher at gmail.com>
Date:   Sun Apr  3 00:13:16 2011 +0000

lmbench: rename 'line' binary as 'lm_line'

Both lmbench and util-linux-ng packages provide own /usr/bin/line binaries.
Even though the binaries name is the same, their functionality is different.
This patch renames lmbench's line binary as lm_line to avoid conflicts with
util-linux-ng.  script/config-run is also modified (patch) to call lm_line
instead of line.

Signed-off-By: Carlos Hernandez <c-hernandez8 at ti.com>
Acked-by: Denys Dmytriyenko <denys at ti.com>
Signed-off-by: Tom Rini <tom_rini at mentor.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 recipes/lmbench/lmbench/rename-line-binary.patch |   11 +++++++++++
 recipes/lmbench/lmbench_3.0-a9.bb                |    6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/recipes/lmbench/lmbench/rename-line-binary.patch b/recipes/lmbench/lmbench/rename-line-binary.patch
new file mode 100644
index 0000000..997143b
--- /dev/null
+++ b/recipes/lmbench/lmbench/rename-line-binary.patch
@@ -0,0 +1,11 @@
+--- patches/scripts/config-run	2006-11-26 15:11:04.000000000 -0500
++++ patches/scripts/config-run	2011-04-01 09:35:50.000000000 -0400
+@@ -224,7 +224,7 @@ fi
+ 
+ echo "Hang on, we are calculating your cache line size."
+ ../bin/$OS/msleep 250
+-LINE_SIZE=`../bin/$OS/line -M ${MB}M`
++LINE_SIZE=`../bin/$OS/lm_line -M ${MB}M`
+ export LINE_SIZE
+ echo "OK, it looks like your cache line is $LINE_SIZE bytes."
+ echo ""
diff --git a/recipes/lmbench/lmbench_3.0-a9.bb b/recipes/lmbench/lmbench_3.0-a9.bb
index 1e2598a..d1e9162 100644
--- a/recipes/lmbench/lmbench_3.0-a9.bb
+++ b/recipes/lmbench/lmbench_3.0-a9.bb
@@ -3,12 +3,13 @@ DESCRIPTION = "Tools for performance analysis."
 LICENSE = "GPL"
 RDEPENDS_${PN} = "debianutils"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
-	   file://lmbench-run"
+	   file://lmbench-run \
+          file://rename-line-binary.patch"
 SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf"
 SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551"
 
@@ -56,6 +57,7 @@ do_install () {
 	install -m 0755 ${S}/scripts/lmbench ${D}${bindir}
 	install -d ${D}${datadir}/lmbench/scripts
 	install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts
+	mv ${D}${bindir}/line ${D}${bindir}/lm_line
 }
 
 FILES_${PN} += "${datadir}/lmbench"