* [PATCH 1/3] calibrator: Move to latest SVN rev 138
@ 2011-07-18 19:25 Raymond Danks
2011-07-18 19:25 ` [PATCH 2/3] rt-tests: Upgrade to latest version 0.73 Raymond Danks
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Raymond Danks @ 2011-07-18 19:25 UTC (permalink / raw)
To: openembedded-devel
* 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"
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");
+ }
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/3] rt-tests: Upgrade to latest version 0.73.
2011-07-18 19:25 [PATCH 1/3] calibrator: Move to latest SVN rev 138 Raymond Danks
@ 2011-07-18 19:25 ` Raymond Danks
2011-07-18 20:16 ` Paul Menzel
2011-07-26 20:20 ` [PATCH 2/3 v2] " Raymond Danks
2011-07-18 19:25 ` [PATCH 3/3] libpng: Corrected SRC_URI Raymond Danks
` (2 subsequent siblings)
3 siblings, 2 replies; 12+ messages in thread
From: Raymond Danks @ 2011-07-18 19:25 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
---
recipes/rt-tests/rt-tests_0.73.bb | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
create mode 100644 recipes/rt-tests/rt-tests_0.73.bb
diff --git a/recipes/rt-tests/rt-tests_0.73.bb b/recipes/rt-tests/rt-tests_0.73.bb
new file mode 100644
index 0000000..bebf89e
--- /dev/null
+++ b/recipes/rt-tests/rt-tests_0.73.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Real-time tests, such as cyclictest, for real-time linux PREEMPT RT kernels"
+HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2"
+
+S = "${WORKDIR}/rt-tests"
+
+CFLAGS += "-D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include"
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+# Limit to cyclictest only for non-real-time kernels.
+# EXTRA_OEMAKE = "cyclictest"
+
+do_install() {
+ install -d ${D}${bindir}
+ # any file that is executable by user and/or group
+ for binary in `find . -perm /u+x,g+x -type f`
+ do
+ install -m 0755 $binary ${D}${bindir}
+ done
+}
+
+SRC_URI[md5sum] = "98da46135f0a91c96cb7e5b27c7e3bb6"
+SRC_URI[sha256sum] = "f8d396ecd6aa5526c49919acbac0ea4936f27f2410ca806570d8c92c1067c29d"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/3] rt-tests: Upgrade to latest version 0.73.
2011-07-18 19:25 ` [PATCH 2/3] rt-tests: Upgrade to latest version 0.73 Raymond Danks
@ 2011-07-18 20:16 ` Paul Menzel
2011-07-26 20:20 ` [PATCH 2/3 v2] " Raymond Danks
1 sibling, 0 replies; 12+ messages in thread
From: Paul Menzel @ 2011-07-18 20:16 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2203 bytes --]
Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:
No full stop at the end of commit summaries, please.
> Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
> ---
> recipes/rt-tests/rt-tests_0.73.bb | 27 +++++++++++++++++++++++++++
> 1 files changed, 27 insertions(+), 0 deletions(-)
> create mode 100644 recipes/rt-tests/rt-tests_0.73.bb
>
> diff --git a/recipes/rt-tests/rt-tests_0.73.bb b/recipes/rt-tests/rt-tests_0.73.bb
> new file mode 100644
> index 0000000..bebf89e
> --- /dev/null
> +++ b/recipes/rt-tests/rt-tests_0.73.bb
> @@ -0,0 +1,27 @@
> +DESCRIPTION = "Real-time tests, such as cyclictest, for real-time linux PREEMPT RT kernels"
> +HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest"
> +LICENSE = "GPL"
> +PR = "r1"
Please start at `r0`.
> +
> +SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2"
> +
> +S = "${WORKDIR}/rt-tests"
> +
> +CFLAGS += "-D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include"
> +TARGET_CC_ARCH += "${LDFLAGS}"
> +
> +# Limit to cyclictest only for non-real-time kernels.
> +# EXTRA_OEMAKE = "cyclictest"
> +
> +do_install() {
> + install -d ${D}${bindir}
> + # any file that is executable by user and/or group
> + for binary in `find . -perm /u+x,g+x -type f`
> + do
> + install -m 0755 $binary ${D}${bindir}
> + done
> +}
Hmm, I am wondering how does this recipe work anyway. `inherit
autotools` is missing, so how are the tasks configure and compile
executed?
> +
> +SRC_URI[md5sum] = "98da46135f0a91c96cb7e5b27c7e3bb6"
> +SRC_URI[sha256sum] = "f8d396ecd6aa5526c49919acbac0ea4936f27f2410ca806570d8c92c1067c29d"
Ok, it looks like you just adapted the recipe of the old version already
in included in OE.
1. Please use `git format-patch -M -M -C -C -C` – I do not know how
often those arguments have to be passed – so that Git detects renames
and makes the diff smaller and easier to review.
2. Could you please send a follow up patch removing the old version?
3. If there are any errors with the old version which you experienced
and have been fixed, please mention those in the commit message.
Thanks,
Paul
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 2/3 v2] rt-tests: Upgrade to latest version 0.73
2011-07-18 19:25 ` [PATCH 2/3] rt-tests: Upgrade to latest version 0.73 Raymond Danks
2011-07-18 20:16 ` Paul Menzel
@ 2011-07-26 20:20 ` Raymond Danks
1 sibling, 0 replies; 12+ messages in thread
From: Raymond Danks @ 2011-07-26 20:20 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
---
v2:
* Start with PR=0
* Remove old version 0.28.
.../{rt-tests_0.28.bb => rt-tests_0.73.bb} | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
rename recipes/rt-tests/{rt-tests_0.28.bb => rt-tests_0.73.bb} (74%)
diff --git a/recipes/rt-tests/rt-tests_0.28.bb b/recipes/rt-tests/rt-tests_0.73.bb
similarity index 74%
rename from recipes/rt-tests/rt-tests_0.28.bb
rename to recipes/rt-tests/rt-tests_0.73.bb
index af3bb30..26ea2cf 100644
--- a/recipes/rt-tests/rt-tests_0.28.bb
+++ b/recipes/rt-tests/rt-tests_0.73.bb
@@ -1,12 +1,13 @@
DESCRIPTION = "Real-time tests, such as cyclictest, for real-time linux PREEMPT RT kernels"
HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest"
LICENSE = "GPL"
-PR = "r1"
+PR = "r0"
SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2"
S = "${WORKDIR}/rt-tests"
+CFLAGS += "-D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include"
TARGET_CC_ARCH += "${LDFLAGS}"
# Limit to cyclictest only for non-real-time kernels.
@@ -21,5 +22,6 @@ do_install() {
done
}
-SRC_URI[md5sum] = "761c3e9fab16290c10ab9421182d16e7"
-SRC_URI[sha256sum] = "48e5a43c03f42524dd91873d649a0b8a287debd727da993ab256dc4e839b0cee"
+SRC_URI[md5sum] = "98da46135f0a91c96cb7e5b27c7e3bb6"
+SRC_URI[sha256sum] = "f8d396ecd6aa5526c49919acbac0ea4936f27f2410ca806570d8c92c1067c29d"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] libpng: Corrected SRC_URI
2011-07-18 19:25 [PATCH 1/3] calibrator: Move to latest SVN rev 138 Raymond Danks
2011-07-18 19:25 ` [PATCH 2/3] rt-tests: Upgrade to latest version 0.73 Raymond Danks
@ 2011-07-18 19:25 ` Raymond Danks
2011-07-18 19:51 ` [PATCH 1/3] calibrator: Move to latest SVN rev 138 Paul Menzel
2011-07-26 21:03 ` [PATCH 1/3 v2] calibrator: Move to latest SVN rev 138 Raymond Danks
3 siblings, 0 replies; 12+ messages in thread
From: Raymond Danks @ 2011-07-18 19:25 UTC (permalink / raw)
To: openembedded-devel
Point to the SOURCEFORGE_MIRROR as the other mirror had archived files and was periodically offline.
Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
---
recipes/libpng/libpng.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/recipes/libpng/libpng.inc b/recipes/libpng/libpng.inc
index 7c6d247..3461c14 100644
--- a/recipes/libpng/libpng.inc
+++ b/recipes/libpng/libpng.inc
@@ -12,7 +12,8 @@ BBCLASSEXTEND = "native"
RPROVIDES += "libpng3"
-SRC_URI = "ftp://ftp.simplesystems.org/pub/png/src/libpng-${PV}.tar.bz2;name=libpng"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2;name=libpng"
+
S = "${WORKDIR}/libpng-${PV}"
inherit autotools pkgconfig binconfig
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/3] calibrator: Move to latest SVN rev 138
2011-07-18 19:25 [PATCH 1/3] calibrator: Move to latest SVN rev 138 Raymond Danks
2011-07-18 19:25 ` [PATCH 2/3] rt-tests: Upgrade to latest version 0.73 Raymond Danks
2011-07-18 19:25 ` [PATCH 3/3] libpng: Corrected SRC_URI Raymond Danks
@ 2011-07-18 19:51 ` Paul Menzel
2011-07-18 20:04 ` Paul Menzel
2011-07-26 21:03 ` [PATCH 1/3 v2] calibrator: Move to latest SVN rev 138 Raymond Danks
3 siblings, 1 reply; 12+ messages in thread
From: Paul Menzel @ 2011-07-18 19:51 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2082 bytes --]
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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/3] calibrator: Move to latest SVN rev 138
2011-07-18 19:51 ` [PATCH 1/3] calibrator: Move to latest SVN rev 138 Paul Menzel
@ 2011-07-18 20:04 ` Paul Menzel
2011-07-20 21:47 ` calibrator: also problems with <svn://svn.bec-systems.com/> (was: [PATCH 1/3] calibrator: Move to latest SVN rev 138) Paul Menzel
0 siblings, 1 reply; 12+ messages in thread
From: Paul Menzel @ 2011-07-18 20:04 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2428 bytes --]
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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* calibrator: also problems with <svn://svn.bec-systems.com/> (was: [PATCH 1/3] calibrator: Move to latest SVN rev 138)
2011-07-18 20:04 ` Paul Menzel
@ 2011-07-20 21:47 ` Paul Menzel
2011-07-26 18:09 ` calibrator: also problems with <svn://svn.bec-systems.com/> Raymond Danks
0 siblings, 1 reply; 12+ messages in thread
From: Paul Menzel @ 2011-07-20 21:47 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3180 bytes --]
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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: calibrator: also problems with <svn://svn.bec-systems.com/>
2011-07-20 21:47 ` calibrator: also problems with <svn://svn.bec-systems.com/> (was: [PATCH 1/3] calibrator: Move to latest SVN rev 138) Paul Menzel
@ 2011-07-26 18:09 ` Raymond Danks
2011-07-26 19:43 ` Koen Kooi
0 siblings, 1 reply; 12+ messages in thread
From: Raymond Danks @ 2011-07-26 18:09 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: calibrator: also problems with <svn://svn.bec-systems.com/>
2011-07-26 18:09 ` calibrator: also problems with <svn://svn.bec-systems.com/> Raymond Danks
@ 2011-07-26 19:43 ` Koen Kooi
2011-07-26 21:05 ` Raymond Danks
0 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2011-07-26 19:43 UTC (permalink / raw)
To: openembedded-devel
-----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-----
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: calibrator: also problems with <svn://svn.bec-systems.com/>
2011-07-26 19:43 ` Koen Kooi
@ 2011-07-26 21:05 ` Raymond Danks
0 siblings, 0 replies; 12+ messages in thread
From: Raymond Danks @ 2011-07-26 21:05 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3 v2] calibrator: Move to latest SVN rev 138
2011-07-18 19:25 [PATCH 1/3] calibrator: Move to latest SVN rev 138 Raymond Danks
` (2 preceding siblings ...)
2011-07-18 19:51 ` [PATCH 1/3] calibrator: Move to latest SVN rev 138 Paul Menzel
@ 2011-07-26 21:03 ` Raymond Danks
3 siblings, 0 replies; 12+ messages in thread
From: Raymond Danks @ 2011-07-26 21:03 UTC (permalink / raw)
To: openembedded-devel
* 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>
---
v2:
* Fix end quote on SRC_URI
* Actually - it looks like the SRC_URI is correct after all. Note that both the hostname and path have changed.
recipes/calibrator/calibrator_svn.bb | 7 +-
.../calibrator/files/round_conflicting_types.patch | 91 ++++++++++++++++++++
2 files changed, 96 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..4410dc4 100644
--- a/recipes/calibrator/calibrator_svn.bb
+++ b/recipes/calibrator/calibrator_svn.bb
@@ -2,11 +2,14 @@ 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-syste1ms.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");
+ }
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-07-26 21:09 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-18 19:25 [PATCH 1/3] calibrator: Move to latest SVN rev 138 Raymond Danks
2011-07-18 19:25 ` [PATCH 2/3] rt-tests: Upgrade to latest version 0.73 Raymond Danks
2011-07-18 20:16 ` Paul Menzel
2011-07-26 20:20 ` [PATCH 2/3 v2] " Raymond Danks
2011-07-18 19:25 ` [PATCH 3/3] libpng: Corrected SRC_URI Raymond Danks
2011-07-18 19:51 ` [PATCH 1/3] calibrator: Move to latest SVN rev 138 Paul Menzel
2011-07-18 20:04 ` Paul Menzel
2011-07-20 21:47 ` calibrator: also problems with <svn://svn.bec-systems.com/> (was: [PATCH 1/3] calibrator: Move to latest SVN rev 138) Paul Menzel
2011-07-26 18:09 ` calibrator: also problems with <svn://svn.bec-systems.com/> Raymond Danks
2011-07-26 19:43 ` Koen Kooi
2011-07-26 21:05 ` Raymond Danks
2011-07-26 21:03 ` [PATCH 1/3 v2] calibrator: Move to latest SVN rev 138 Raymond Danks
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.