From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SZdE1-0007OJ-E4 for ptxdist@pengutronix.de; Wed, 30 May 2012 09:21:45 +0200 Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72) (envelope-from ) id 1SZdE1-0007A3-Cz for ptxdist@pengutronix.de; Wed, 30 May 2012 09:21:45 +0200 Date: Wed, 30 May 2012 09:21:45 +0200 From: Michael Olbrich Message-ID: <20120530072145.GJ19394@pengutronix.de> References: <1338208981-8681-3-git-send-email-bartvdrmeulen@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1338208981-8681-3-git-send-email-bartvdrmeulen@gmail.com> Subject: Re: [ptxdist] [PATCH] oprofile: Add patch to use busybox icm opcontrol Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Mon, May 28, 2012 at 02:42:29PM +0200, Bart vdr. Meulen wrote: > From: "Bart vdr. Meulen" > > When using busybox wc the '-m' (count chars) option is not supported, > use the '-c' (count bytes) option which gives the same count result, > in this case because non-unicode characters are counted We already have 0.9.7, which includes this fix. mol > Signed-off-by: Bart vdr. Meulen > --- > .../001-make-opcontrol-busybox-compatible.patch | 24 ++++++++++++++++++++ > patches/oprofile-0.9.6/series | 1 + > 2 files changed, 25 insertions(+) > create mode 100644 patches/oprofile-0.9.6/001-make-opcontrol-busybox-compatible.patch > create mode 100644 patches/oprofile-0.9.6/series > > diff --git a/patches/oprofile-0.9.6/001-make-opcontrol-busybox-compatible.patch b/patches/oprofile-0.9.6/001-make-opcontrol-busybox-compatible.patch > new file mode 100644 > index 0000000..43f9bd5 > --- /dev/null > +++ b/patches/oprofile-0.9.6/001-make-opcontrol-busybox-compatible.patch > @@ -0,0 +1,24 @@ > +Use -c to count characters instead of -m > + > +When using busybox wc the '-m' (count chars) option is not supported, > +use the '-c' (count bytes) option which gives the same count result > +in this case because the count is done over non-unicode characters. > + > +Signed-off-by: Bart vdr. Meulen > +--- > + utils/opcontrol | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +Index: oprofile-0.9.6/utils/opcontrol > +=================================================================== > +--- oprofile-0.9.6.orig/utils/opcontrol > ++++ oprofile-0.9.6/utils/opcontrol > +@@ -1240,7 +1240,7 @@ check_event_mapping_data() > + fi > + fi > + fi > +- len=`echo -n $event_num | wc -m` > ++ len=`echo -n $event_num | wc -c` > + num_chars_in_grpid=`expr $len - 2` > + GRP_NUM_VAL=`echo | awk '{print substr("'"${event_num}"'",1,"'"${num_chars_in_grpid}"'")}'` > + if [ "$GRP_NUM_CK_VAL" = "" ] ; then > diff --git a/patches/oprofile-0.9.6/series b/patches/oprofile-0.9.6/series > new file mode 100644 > index 0000000..1dbb427 > --- /dev/null > +++ b/patches/oprofile-0.9.6/series > @@ -0,0 +1 @@ > +001-make-opcontrol-busybox-compatible.patch > -- > 1.7.9.5 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de