Patchwork [1/3] calibrator: Move to latest SVN rev 138

login
register
mail settings
Submitter Raymond Danks
Date July 18, 2011, 7:25 p.m.
Message ID <1311017115-28352-1-git-send-email-ray.danks@se-eng.com>
Download mbox | patch
Permalink /patch/7769/
State New, archived
Headers show

Comments

Raymond Danks - July 18, 2011, 7:25 p.m.
* The SVN repository for this project has changed URI.
* Upgrade to and patch the latest version for use with current tools.

Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
---
 recipes/calibrator/calibrator_svn.bb               |    6 +-
 .../calibrator/files/round_conflicting_types.patch |   91 ++++++++++++++++++++
 2 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 recipes/calibrator/files/round_conflicting_types.patch
Paul Menzel - July 18, 2011, 7:51 p.m.
Dear Raymond,


great to have you back!

Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:
> * The SVN repository for this project has changed URI.
> * Upgrade to and patch the latest version for use with current tools.
> 
> Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
> ---
>  recipes/calibrator/calibrator_svn.bb               |    6 +-
>  .../calibrator/files/round_conflicting_types.patch |   91 ++++++++++++++++++++
>  2 files changed, 95 insertions(+), 2 deletions(-)
>  create mode 100644 recipes/calibrator/files/round_conflicting_types.patch
> 
> diff --git a/recipes/calibrator/calibrator_svn.bb b/recipes/calibrator/calibrator_svn.bb
> index bd7bb1f..60eeaf9 100644
> --- a/recipes/calibrator/calibrator_svn.bb
> +++ b/recipes/calibrator/calibrator_svn.bb
> @@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
>  HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
>  LICENSE = "AS IS"
>  
> -SRCREV = "21"
> +SRCREV = "138"
>  PV = "0.9e+svnr${SRCPV}"
>  PR = "r0"
>  
> -SRC_URI = "svn://dev.bec-systems.com/svn/pub;module=calibrator;proto=http"
> +SRC_URI = "\
> +	svn://svn.bec-systems.com/pub;module=calibrator;proto=http \
> +	file://round_conflicting_types.patch"

Maybe also put the last " on a new line to make future diffs smaller?

>  inherit autotools
>  
> diff --git a/recipes/calibrator/files/round_conflicting_types.patch b/recipes/calibrator/files/round_conflicting_types.patch
> new file mode 100644
> index 0000000..520c945
> --- /dev/null
> +++ b/recipes/calibrator/files/round_conflicting_types.patch
> @@ -0,0 +1,91 @@
> +round is a conflicting type ; rename to custom_round instead.

Did you send that patch upstream?

> +
> +diff -urN calibrator.orig/calibrator.c calibrator/calibrator.c
> +--- calibrator.orig/calibrator.c	2011-07-11 16:40:32.000000000 -0600
> ++++ calibrator/calibrator.c	2011-07-11 16:44:22.333626120 -0600
> +@@ -128,7 +128,7 @@

[…]

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul
Paul Menzel - July 18, 2011, 8:04 p.m.
Dear Raymond,


Am Montag, den 18.07.2011, 21:51 +0200 schrieb Paul Menzel:

> great to have you back!
> 
> Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:
> > * The SVN repository for this project has changed URI.
> > * Upgrade to and patch the latest version for use with current tools.

actually thinking about this, two patches would have been better. I will
split this patch up.

> > 
> > Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
> > ---
> >  recipes/calibrator/calibrator_svn.bb               |    6 +-
> >  .../calibrator/files/round_conflicting_types.patch |   91 ++++++++++++++++++++
> >  2 files changed, 95 insertions(+), 2 deletions(-)
> >  create mode 100644 recipes/calibrator/files/round_conflicting_types.patch
> > 
> > diff --git a/recipes/calibrator/calibrator_svn.bb b/recipes/calibrator/calibrator_svn.bb
> > index bd7bb1f..60eeaf9 100644
> > --- a/recipes/calibrator/calibrator_svn.bb
> > +++ b/recipes/calibrator/calibrator_svn.bb
> > @@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
> >  HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
> >  LICENSE = "AS IS"
> >  
> > -SRCREV = "21"
> > +SRCREV = "138"
> >  PV = "0.9e+svnr${SRCPV}"
> >  PR = "r0"
> >  
> > -SRC_URI = "svn://dev.bec-systems.com/svn/pub;module=calibrator;proto=http"
> > +SRC_URI = "\
> > +	svn://svn.bec-systems.com/pub;module=calibrator;proto=http \
> > +	file://round_conflicting_types.patch"
> 
> Maybe also put the last " on a new line to make future diffs smaller?
> 
> >  inherit autotools
> >  
> > diff --git a/recipes/calibrator/files/round_conflicting_types.patch b/recipes/calibrator/files/round_conflicting_types.patch
> > new file mode 100644
> > index 0000000..520c945
> > --- /dev/null
> > +++ b/recipes/calibrator/files/round_conflicting_types.patch
> > @@ -0,0 +1,91 @@
> > +round is a conflicting type ; rename to custom_round instead.
> 
> Did you send that patch upstream?
> 
> > +
> > +diff -urN calibrator.orig/calibrator.c calibrator/calibrator.c
> > +--- calibrator.orig/calibrator.c	2011-07-11 16:40:32.000000000 -0600
> > ++++ calibrator/calibrator.c	2011-07-11 16:44:22.333626120 -0600
> > +@@ -128,7 +128,7 @@
> 
> […]
> 
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>

I forgot to ask, do you have write/commit access to the Git repository?


Thanks,

Paul
Paul Menzel - July 20, 2011, 9:47 p.m.
Dear Raymond,


Am Montag, den 18.07.2011, 22:04 +0200 schrieb Paul Menzel:

> Am Montag, den 18.07.2011, 21:51 +0200 schrieb Paul Menzel:

> > Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:
> > > * The SVN repository for this project has changed URI.

actually testing your patch I am experiencing the following problem with
task fetch.

        svn: OPTIONS of 'http://svn.bec-systems.com/svn/pub/calibrator': authorization failed: Could not authenticate to server: rejected Basic challenge (http://svn.bec-systems.com)
        NOTE: package calibrator-0.9e+svnr21-r0: task Fetch failed: Unable to fetch URL svn://svn.bec-systems.com/svn/pub;module=calibrator;proto=http from any source.: Failed
        ERROR: Function 'Fetch failed: Unable to fetch URL svn://svn.bec-systems.com/svn/pub;module=calibrator;proto=http from any source.' failed

> > > * Upgrade to and patch the latest version for use with current tools.
> 
> actually thinking about this, two patches would have been better. I will
> split this patch up.
> 
> > > 
> > > Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
> > > ---
> > >  recipes/calibrator/calibrator_svn.bb               |    6 +-
> > >  .../calibrator/files/round_conflicting_types.patch |   91 ++++++++++++++++++++
> > >  2 files changed, 95 insertions(+), 2 deletions(-)
> > >  create mode 100644 recipes/calibrator/files/round_conflicting_types.patch
> > > 
> > > diff --git a/recipes/calibrator/calibrator_svn.bb b/recipes/calibrator/calibrator_svn.bb
> > > index bd7bb1f..60eeaf9 100644
> > > --- a/recipes/calibrator/calibrator_svn.bb
> > > +++ b/recipes/calibrator/calibrator_svn.bb
> > > @@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
> > >  HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
> > >  LICENSE = "AS IS"
> > >  
> > > -SRCREV = "21"
> > > +SRCREV = "138"
> > >  PV = "0.9e+svnr${SRCPV}"
> > >  PR = "r0"
> > >  
> > > -SRC_URI = "svn://dev.bec-systems.com/svn/pub;module=calibrator;proto=http"
> > > +SRC_URI = "\
> > > +	svn://svn.bec-systems.com/pub;module=calibrator;proto=http \
> > > +	file://round_conflicting_types.patch"
> > 
> > Maybe also put the last " on a new line to make future diffs smaller?
> > 
> > >  inherit autotools
> > >  
> > > diff --git a/recipes/calibrator/files/round_conflicting_types.patch b/recipes/calibrator/files/round_conflicting_types.patch
> > > new file mode 100644
> > > index 0000000..520c945
> > > --- /dev/null
> > > +++ b/recipes/calibrator/files/round_conflicting_types.patch
> > > @@ -0,0 +1,91 @@
> > > +round is a conflicting type ; rename to custom_round instead.
> > 
> > Did you send that patch upstream?
> > 
> > > +
> > > +diff -urN calibrator.orig/calibrator.c calibrator/calibrator.c
> > > +--- calibrator.orig/calibrator.c	2011-07-11 16:40:32.000000000 -0600
> > > ++++ calibrator/calibrator.c	2011-07-11 16:44:22.333626120 -0600
> > > +@@ -128,7 +128,7 @@
> > 
> > […]
> > 
> > Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
> 
> I forgot to ask, do you have write/commit access to the Git repository?


Thanks,

Paul
Raymond Danks - July 26, 2011, 6:09 p.m.
I apologize Paul - I did something with my email filters and missed 
this.  You are correct; the URL is wrong in this patch.  The correct URL is:
http://svn.bec-systems.com/pub/calibrator/

No - I don't have rights yet.  How do I go about getting commit rights?

I'm following up on this and the other comments today.

Thanks,
Ray

On 07/20/2011 03:47 PM, Paul Menzel wrote:
> Dear Raymond,
>
>
> Am Montag, den 18.07.2011, 22:04 +0200 schrieb Paul Menzel:
>
>> Am Montag, den 18.07.2011, 21:51 +0200 schrieb Paul Menzel:
>>> Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:
>>>> * The SVN repository for this project has changed URI.
> actually testing your patch I am experiencing the following problem with
> task fetch.
>
>          svn: OPTIONS of 'http://svn.bec-systems.com/svn/pub/calibrator': authorization failed: Could not authenticate to server: rejected Basic challenge (http://svn.bec-systems.com)
>          NOTE: package calibrator-0.9e+svnr21-r0: task Fetch failed: Unable to fetch URL svn://svn.bec-systems.com/svn/pub;module=calibrator;proto=http from any source.: Failed
>          ERROR: Function 'Fetch failed: Unable to fetch URL svn://svn.bec-systems.com/svn/pub;module=calibrator;proto=http from any source.' failed
>
>>>> * Upgrade to and patch the latest version for use with current tools.
>> actually thinking about this, two patches would have been better. I will
>> split this patch up.
>>
>>>> Signed-off-by: Raymond Danks<ray.danks@se-eng.com>
>>>> ---
>>>>   recipes/calibrator/calibrator_svn.bb               |    6 +-
>>>>   .../calibrator/files/round_conflicting_types.patch |   91 ++++++++++++++++++++
>>>>   2 files changed, 95 insertions(+), 2 deletions(-)
>>>>   create mode 100644 recipes/calibrator/files/round_conflicting_types.patch
>>>>
>>>> diff --git a/recipes/calibrator/calibrator_svn.bb b/recipes/calibrator/calibrator_svn.bb
>>>> index bd7bb1f..60eeaf9 100644
>>>> --- a/recipes/calibrator/calibrator_svn.bb
>>>> +++ b/recipes/calibrator/calibrator_svn.bb
>>>> @@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
>>>>   HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
>>>>   LICENSE = "AS IS"
>>>>
>>>> -SRCREV = "21"
>>>> +SRCREV = "138"
>>>>   PV = "0.9e+svnr${SRCPV}"
>>>>   PR = "r0"
>>>>
>>>> -SRC_URI = "svn://dev.bec-systems.com/svn/pub;module=calibrator;proto=http"
>>>> +SRC_URI = "\
>>>> +	svn://svn.bec-systems.com/pub;module=calibrator;proto=http \
>>>> +	file://round_conflicting_types.patch"
>>> Maybe also put the last " on a new line to make future diffs smaller?
>>>
>>>>   inherit autotools
>>>>
>>>> diff --git a/recipes/calibrator/files/round_conflicting_types.patch b/recipes/calibrator/files/round_conflicting_types.patch
>>>> new file mode 100644
>>>> index 0000000..520c945
>>>> --- /dev/null
>>>> +++ b/recipes/calibrator/files/round_conflicting_types.patch
>>>> @@ -0,0 +1,91 @@
>>>> +round is a conflicting type ; rename to custom_round instead.
>>> Did you send that patch upstream?
>>>
>>>> +
>>>> +diff -urN calibrator.orig/calibrator.c calibrator/calibrator.c
>>>> +--- calibrator.orig/calibrator.c	2011-07-11 16:40:32.000000000 -0600
>>>> ++++ calibrator/calibrator.c	2011-07-11 16:44:22.333626120 -0600
>>>> +@@ -128,7 +128,7 @@
>>> […]
>>>
>>> Acked-by: Paul Menzel<paulepanter@users.sourceforge.net>
>> I forgot to ask, do you have write/commit access to the Git repository?
>
> Thanks,
>
> Paul
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Koen Kooi - July 26, 2011, 7:43 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 26-07-11 20:09, Raymond Danks schreef:
> I apologize Paul - I did something with my email filters and missed this.  You are correct; the URL is wrong in this patch.  The correct URL is: http://svn.bec-systems.com/pub/calibrator/
> 
> No - I don't have rights yet.  How do I go about getting commit rights?

Technically you still have them since you had monotone access :) I think nowadays you send your ssh key to cliff + khem and they'll sort it out.

> 
> I'm following up on this and the other comments today.
> 
> Thanks, Ray
> 
> On 07/20/2011 03:47 PM, Paul Menzel wrote:
>> Dear Raymond,
>> 
>> 
>> Am Montag, den 18.07.2011, 22:04 +0200 schrieb Paul Menzel:
>> 
>>> Am Montag, den 18.07.2011, 21:51 +0200 schrieb Paul Menzel:
>>>> Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:
>>>>> * The SVN repository for this project has changed URI.
>> actually testing your patch I am experiencing the following problem with task fetch.
>> 
>> svn: OPTIONS of 'http://svn.bec-systems.com/svn/pub/calibrator': authorization failed: Could not authenticate to server: rejected Basic challenge (http://svn.bec-systems.com) NOTE: package calibrator-0.9e+svnr21-r0: task Fetch failed: Unable to fetch URL
>> svn://svn.bec-systems.com/svn/pub;module=calibrator;proto=http from any source.: Failed ERROR: Function 'Fetch failed: Unable to fetch URL svn://svn.bec-systems.com/svn/pub;module=calibrator;proto=http from any source.' failed
>> 
>>>>> * Upgrade to and patch the latest version for use with current tools.
>>> actually thinking about this, two patches would have been better. I will split this patch up.
>>> 
>>>>> Signed-off-by: Raymond Danks<ray.danks@se-eng.com> --- recipes/calibrator/calibrator_svn.bb               |    6 +- .../calibrator/files/round_conflicting_types.patch |   91 ++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644
>>>>> recipes/calibrator/files/round_conflicting_types.patch
>>>>> 
>>>>> diff --git a/recipes/calibrator/calibrator_svn.bb b/recipes/calibrator/calibrator_svn.bb index bd7bb1f..60eeaf9 100644 --- a/recipes/calibrator/calibrator_svn.bb +++ b/recipes/calibrator/calibrator_svn.bb @@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration
>>>>> Tool" HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/" LICENSE = "AS IS"
>>>>> 
>>>>> -SRCREV = "21" +SRCREV = "138" PV = "0.9e+svnr${SRCPV}" PR = "r0"
>>>>> 
>>>>> -SRC_URI = "svn://dev.bec-systems.com/svn/pub;module=calibrator;proto=http" +SRC_URI = "\ +    svn://svn.bec-systems.com/pub;module=calibrator;proto=http \ +    file://round_conflicting_types.patch"
>>>> Maybe also put the last " on a new line to make future diffs smaller?
>>>> 
>>>>> inherit autotools
>>>>> 
>>>>> diff --git a/recipes/calibrator/files/round_conflicting_types.patch b/recipes/calibrator/files/round_conflicting_types.patch new file mode 100644 index 0000000..520c945 --- /dev/null +++ b/recipes/calibrator/files/round_conflicting_types.patch @@ -0,0 +1,91 @@ +round is a conflicting type
>>>>> ; rename to custom_round instead.
>>>> Did you send that patch upstream?
>>>> 
>>>>> + +diff -urN calibrator.orig/calibrator.c calibrator/calibrator.c +--- calibrator.orig/calibrator.c    2011-07-11 16:40:32.000000000 -0600 ++++ calibrator/calibrator.c    2011-07-11 16:44:22.333626120 -0600 +@@ -128,7 +128,7 @@
>>>> […]
>>>> 
>>>> Acked-by: Paul Menzel<paulepanter@users.sourceforge.net>
>>> I forgot to ask, do you have write/commit access to the Git repository?
>> 
>> Thanks,
>> 
>> Paul
>> 
>> 
>> _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOLxj7MkyGM64RGpERAgoYAJkBqgcN+ORwAy5auUY8zCP1UeE1mQCgsBs6
gqgy7B3i/IiLGO+l1NJDFl8=
=KyIu
-----END PGP SIGNATURE-----
Raymond Danks - July 26, 2011, 9:05 p.m.
On 07/26/2011 01:43 PM, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 26-07-11 20:09, Raymond Danks schreef:
>> I apologize Paul - I did something with my email filters and missed this.  You are correct; the URL is wrong in this patch.  The correct URL is: http://svn.bec-systems.com/pub/calibrator/
>>
>> No - I don't have rights yet.  How do I go about getting commit rights?
> Technically you still have them since you had monotone access :) I think nowadays you send your ssh key to cliff + khem and they'll sort it out.

Thanks Koen!  I'll get in touch with Cliff and Khem.  I think I lost 
that other key...
>> I'm following up on this and the other comments today.
>>
>> Thanks, Ray
>>
>> On 07/20/2011 03:47 PM, Paul Menzel wrote:
>>> Dear Raymond,
>>>
>>>
>>> Am Montag, den 18.07.2011, 22:04 +0200 schrieb Paul Menzel:
>>>
>>>> Am Montag, den 18.07.2011, 21:51 +0200 schrieb Paul Menzel:
>>>>> Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:
>>>>>> * The SVN repository for this project has changed URI.
>>> actually testing your patch I am experiencing the following problem with task fetch.
>>>
>>> svn: OPTIONS of 'http://svn.bec-systems.com/svn/pub/calibrator': authorization failed: Could not authenticate to server: rejected Basic challenge (http://svn.bec-systems.com) NOTE: package calibrator-0.9e+svnr21-r0: task Fetch failed: Unable to fetch URL
>>> svn://svn.bec-systems.com/svn/pub;module=calibrator;proto=http from any source.: Failed ERROR: Function 'Fetch failed: Unable to fetch URL svn://svn.bec-systems.com/svn/pub;module=calibrator;proto=http from any source.' failed
>>>
>>>>>> * Upgrade to and patch the latest version for use with current tools.
>>>> actually thinking about this, two patches would have been better. I will split this patch up.
>>>>
>>>>>> Signed-off-by: Raymond Danks<ray.danks@se-eng.com>  --- recipes/calibrator/calibrator_svn.bb               |    6 +- .../calibrator/files/round_conflicting_types.patch |   91 ++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644
>>>>>> recipes/calibrator/files/round_conflicting_types.patch
>>>>>>
>>>>>> diff --git a/recipes/calibrator/calibrator_svn.bb b/recipes/calibrator/calibrator_svn.bb index bd7bb1f..60eeaf9 100644 --- a/recipes/calibrator/calibrator_svn.bb +++ b/recipes/calibrator/calibrator_svn.bb @@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration
>>>>>> Tool" HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/" LICENSE = "AS IS"
>>>>>>
>>>>>> -SRCREV = "21" +SRCREV = "138" PV = "0.9e+svnr${SRCPV}" PR = "r0"
>>>>>>
>>>>>> -SRC_URI = "svn://dev.bec-systems.com/svn/pub;module=calibrator;proto=http" +SRC_URI = "\ +    svn://svn.bec-systems.com/pub;module=calibrator;proto=http \ +    file://round_conflicting_types.patch"
>>>>> Maybe also put the last " on a new line to make future diffs smaller?
>>>>>
>>>>>> inherit autotools
>>>>>>
>>>>>> diff --git a/recipes/calibrator/files/round_conflicting_types.patch b/recipes/calibrator/files/round_conflicting_types.patch new file mode 100644 index 0000000..520c945 --- /dev/null +++ b/recipes/calibrator/files/round_conflicting_types.patch @@ -0,0 +1,91 @@ +round is a conflicting type
>>>>>> ; rename to custom_round instead.
>>>>> Did you send that patch upstream?
>>>>>
>>>>>> + +diff -urN calibrator.orig/calibrator.c calibrator/calibrator.c +--- calibrator.orig/calibrator.c    2011-07-11 16:40:32.000000000 -0600 ++++ calibrator/calibrator.c    2011-07-11 16:44:22.333626120 -0600 +@@ -128,7 +128,7 @@
>>>>> […]
>>>>>
>>>>> Acked-by: Paul Menzel<paulepanter@users.sourceforge.net>
>>>> I forgot to ask, do you have write/commit access to the Git repository?
>>> Thanks,
>>>
>>> Paul
>>>
>>>
>>> _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>> _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
>
> iD8DBQFOLxj7MkyGM64RGpERAgoYAJkBqgcN+ORwAy5auUY8zCP1UeE1mQCgsBs6
> gqgy7B3i/IiLGO+l1NJDFl8=
> =KyIu
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes/calibrator/calibrator_svn.bb b/recipes/calibrator/calibrator_svn.bb
index bd7bb1f..60eeaf9 100644
--- a/recipes/calibrator/calibrator_svn.bb
+++ b/recipes/calibrator/calibrator_svn.bb
@@ -2,11 +2,13 @@  DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
 HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
 LICENSE = "AS IS"
 
-SRCREV = "21"
+SRCREV = "138"
 PV = "0.9e+svnr${SRCPV}"
 PR = "r0"
 
-SRC_URI = "svn://dev.bec-systems.com/svn/pub;module=calibrator;proto=http"
+SRC_URI = "\
+	svn://svn.bec-systems.com/pub;module=calibrator;proto=http \
+	file://round_conflicting_types.patch"
 
 inherit autotools
 
diff --git a/recipes/calibrator/files/round_conflicting_types.patch b/recipes/calibrator/files/round_conflicting_types.patch
new file mode 100644
index 0000000..520c945
--- /dev/null
+++ b/recipes/calibrator/files/round_conflicting_types.patch
@@ -0,0 +1,91 @@ 
+round is a conflicting type ; rename to custom_round instead.
+
+diff -urN calibrator.orig/calibrator.c calibrator/calibrator.c
+--- calibrator.orig/calibrator.c	2011-07-11 16:40:32.000000000 -0600
++++ calibrator/calibrator.c	2011-07-11 16:44:22.333626120 -0600
+@@ -128,7 +128,7 @@
+ 	exit(1);
+ }
+ 
+-lng round(dbl x)
++lng custom_round(dbl x)
+ {
+ 	return (lng)(x + 0.5);
+ }
+@@ -890,16 +890,16 @@
+ 	fprintf(fp, ")\n");
+ 	fprintf(fp, "set y2tics");
+ 	for (l = 0, s = " ("; l <= cache->levels; l++, s = ", ") {
+-		if (!delay)	fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - delay));
+-			else	fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - delay));
++		if (!delay)	fprintf(fp, "%s'(%ld)' %f", s, custom_round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - delay));
++			else	fprintf(fp, "%s'(%ld)' %f", s, custom_round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - delay));
+ 	}
+ 	for (y = 1; y <= yh; y *= 10) {
+ 		fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y);
+ 	}
+ 	fprintf(fp, ")\n");
+ 	for (l = 0; l <= cache->levels; l++) {
+-		if (!delay)	z = (dbl)round(CYperIt(cache->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
+-			else	z = (dbl)round(CYperIt(cache->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
++		if (!delay)	z = (dbl)custom_round(CYperIt(cache->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
++			else	z = (dbl)custom_round(CYperIt(cache->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
+ 		fprintf(fp, "set label %ld '(%1.3g)  ' at %f,%f right\n", l + 1, z, xl, z);
+ 		fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", l + 1, xl, z, xh, z);
+ 	}
+@@ -986,16 +986,16 @@
+ 	fprintf(fp, "%s'<L1>' %ld)\n", s, TLB->mincachelines);
+ 	fprintf(fp, "set y2tics");
+ 	for (l = 0, s = " ("; l <= TLB->levels; l++, s = ", ") {
+-		if (!delay)	fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay));
+-			else	fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay));
++		if (!delay)	fprintf(fp, "%s'(%ld)' %f", s, custom_round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay));
++			else	fprintf(fp, "%s'(%ld)' %f", s, custom_round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay));
+ 	}
+ 	for (y = 1; y <= yh; y *= 10) {
+ 		fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y);
+ 	}
+ 	fprintf(fp, ")\n");
+ 	for (l = 0; l <= TLB->levels; l++) {
+-		if (!delay)	z = (dbl)round(CYperIt(TLB->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
+-			else	z = (dbl)round(CYperIt(TLB->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
++		if (!delay)	z = (dbl)custom_round(CYperIt(TLB->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
++			else	z = (dbl)custom_round(CYperIt(TLB->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
+ 		fprintf(fp, "set label %ld '(%1.3g)  ' at %f,%f right\n", l + 1, z, xl, z);
+ 		fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", l + 1, xl, z, xh, z);
+ 	}
+@@ -1023,9 +1023,9 @@
+ 	FILE	*fp = stdout;
+ 		
+ 	fprintf(fp, "CPU loop + L1 access:    ");
+-	fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), round(CYperIt(cache->latency1[0])));
++	fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), custom_round(CYperIt(cache->latency1[0])));
+ 	fprintf(fp, "             ( delay:    ");
+-	fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay),            round(CYperIt(delay)));
++	fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay),            custom_round(CYperIt(delay)));
+ 	fprintf(fp, "\n");
+ 	fflush(fp);
+ }
+@@ -1047,8 +1047,8 @@
+ 			fprintf(fp, " %3ld KB ", cache->size[l] / 1024);
+ 		}
+ 		fprintf(fp, " %3ld bytes ", cache->linesize[l + 1]);
+-		fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l + 1] - cache->latency2[l]), round(CYperIt(cache->latency2[l + 1] - cache->latency2[l])));
+-		fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l + 1] - cache->latency1[l]), round(CYperIt(cache->latency1[l + 1] - cache->latency1[l])));
++		fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l + 1] - cache->latency2[l]), custom_round(CYperIt(cache->latency2[l + 1] - cache->latency2[l])));
++		fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l + 1] - cache->latency1[l]), custom_round(CYperIt(cache->latency1[l + 1] - cache->latency1[l])));
+ 	}
+ 	fprintf(fp, "\n");
+ 	fflush(fp);
+@@ -1075,9 +1075,9 @@
+ 		} else {
+ 			fprintf(fp, "  %3ld KB  ", TLB->pagesize[l + 1] / 1024);
+ 		}
+-		fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + 1] - TLB->latency2[l]), round(CYperIt(TLB->latency2[l + 1] - TLB->latency2[l])));
++		fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + 1] - TLB->latency2[l]), custom_round(CYperIt(TLB->latency2[l + 1] - TLB->latency2[l])));
+ /*
+-		fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + 1] - TLB->latency1[l]), round(CYperIt(TLB->latency1[l + 1] - TLB->latency1[l])));
++		fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + 1] - TLB->latency1[l]), custom_round(CYperIt(TLB->latency1[l + 1] - TLB->latency1[l])));
+ */
+ 		fprintf(fp, "\n");
+ 	}