Skip to contentSkip to conversation

calibrator: Move to latest SVN rev 138

PATCH Superseded Raymond Danks 3 participants 12 messages Jul 18, 2011 – Jul 26, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 calibrator: Move to latest SVN rev 138

* The SVN repository for this project has changed URI.
* Upgrade to and patch the latest version for use with current tools.

---
 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
recipes/calibrator/calibrator_svn.bb +4 -2
index bd7bb1f..60eeaf9 100644
@@ -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
 
recipes/calibrator/files/round_conflicting_types.patch new file +91 -0

91 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/3 rt-tests: Upgrade to latest version 0.73.

---
 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
recipes/rt-tests/rt-tests_0.73.bb new file +27 -0
new file mode 100644
index 0000000..bebf89e
@@ -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"
+
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 2/3] rt-tests: Upgrade to latest version 0.73.

Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:

No full stop at the end of commit summaries, please.

Quoted 12 lines
---
 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
recipes/rt-tests/rt-tests_0.73.bb new file +0 -0
new file mode 100644
index 0000000..bebf89e

recipes/rt-tests/rt-tests_0.73.bb line 4

Quoted 4 lines
recipes/rt-tests/rt-tests_0.73.bb new file +4 -0
@@ -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.

Quoted 9 lines
recipes/rt-tests/rt-tests_0.73.bb new file +9 -0
+
+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.

recipes/rt-tests/rt-tests_0.73.bb line 23

Quoted 10 lines
recipes/rt-tests/rt-tests_0.73.bb new file +10 -0
+# 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?

recipes/rt-tests/rt-tests_0.73.bb line 26

Quoted 3 lines
recipes/rt-tests/rt-tests_0.73.bb new file +3 -0
+
+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

#3 lore raw

PATCH v2 2/3 rt-tests: Upgrade to latest version 0.73

In reply to Raymond Danks

---
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%)
recipes/rt-tests/rt-tests_0.73.bb renamed from recipes/rt-tests/rt-tests_0.28.bb +5 -3
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
@@ -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"
+
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH 3/3 libpng: Corrected SRC_URI

In reply to Raymond Danks

Point to the SOURCEFORGE_MIRROR as the other mirror had archived files and was periodically offline.

---
 recipes/libpng/libpng.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
recipes/libpng/libpng.inc +2 -1
index 7c6d247..3461c14 100644
@@ -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
Signature · 1 line
1.7.0.4
Acked-by on v1 1/3
#5 lore raw
In reply to Raymond Danks

Dear Raymond,

great to have you back!

Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:

Quoted 17 lines

* The SVN repository for this project has changed URI.
* Upgrade to and patch the latest version for use with current tools.

---
 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
recipes/calibrator/calibrator_svn.bb +0 -0
index bd7bb1f..60eeaf9 100644
@@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
 HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
 LICENSE = "AS IS"

recipes/calibrator/calibrator_svn.bb DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool" · line 11

Quoted 10 lines
recipes/calibrator/calibrator_svn.bb +4 -2
 
-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?

recipes/calibrator/files/round_conflicting_types.patch line 1

Quoted 9 lines
recipes/calibrator/calibrator_svn.bb +0 -0
 inherit autotools
 
recipes/calibrator/files/round_conflicting_types.patch new file +1 -0
new file mode 100644
index 0000000..520c945
@@ -0,0 +1,91 @@
+round is a conflicting type ; rename to custom_round instead.

Did you send that patch upstream?

Quoted 5 lines
recipes/calibrator/files/round_conflicting_types.patch new file +5 -0
+
+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 @@

[…]

Thanks,

Paul

#6 lore raw

Dear Raymond,

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

Quoted 5 lines

great to have you back!

Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:

Quoted 2 lines

* 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.

Quoted 48 lines
Quoted 15 lines
---
 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
recipes/calibrator/calibrator_svn.bb +0 -0
index bd7bb1f..60eeaf9 100644
@@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
 HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
 LICENSE = "AS IS"

recipes/calibrator/calibrator_svn.bb DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool" · line 11

Quoted 10 lines
recipes/calibrator/calibrator_svn.bb +4 -2
 
-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?

recipes/calibrator/files/round_conflicting_types.patch line 1

Quoted 9 lines
recipes/calibrator/calibrator_svn.bb +0 -0
 inherit autotools
 
recipes/calibrator/files/round_conflicting_types.patch new file +1 -0
new file mode 100644
index 0000000..520c945
@@ -0,0 +1,91 @@
+round is a conflicting type ; rename to custom_round instead.

Did you send that patch upstream?

Quoted 5 lines
recipes/calibrator/files/round_conflicting_types.patch new file +5 -0
+
+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 @@

[…]

Quoted 1 line

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

Thanks,

Paul

#7 lore raw

calibrator: also problems with <svn://svn.bec-systems.com/> (was: [PATCH 1/3] calibrator: Move to latest SVN rev 138)

Dear Raymond,

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

Quoted 4 lines

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

Quoted 2 lines

Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:

Quoted 1 line

* 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

Quoted 53 lines
Quoted 1 line
Quoted 1 line

* 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.

Quoted 48 lines
Quoted 15 lines
---
 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
recipes/calibrator/calibrator_svn.bb +0 -0
index bd7bb1f..60eeaf9 100644
@@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
 HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
 LICENSE = "AS IS"

recipes/calibrator/calibrator_svn.bb DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool" · line 11

Quoted 10 lines
recipes/calibrator/calibrator_svn.bb +4 -2
 
-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?

recipes/calibrator/files/round_conflicting_types.patch line 1

Quoted 9 lines
recipes/calibrator/calibrator_svn.bb +0 -0
 inherit autotools
 
recipes/calibrator/files/round_conflicting_types.patch new file +1 -0
new file mode 100644
index 0000000..520c945
@@ -0,0 +1,91 @@
+round is a conflicting type ; rename to custom_round instead.

Did you send that patch upstream?

Quoted 5 lines
recipes/calibrator/files/round_conflicting_types.patch new file +5 -0
+
+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 @@

[…]

Quoted 3 lines
Quoted 1 line

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

Thanks,

Paul

#8 lore raw

Re: calibrator: also problems with <svn://svn.bec-systems.com/>

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

Quoted 75 lines · Paul Menzel

Dear Raymond,

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

Quoted 3 lines

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

Quoted 2 lines

Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:

Quoted 1 line

* 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

Quoted 48 lines
Quoted 1 line
Quoted 1 line

* 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.

Quoted 44 lines
Quoted 14 lines
---
  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

recipes/calibrator/calibrator_svn.bb +0 -0
index bd7bb1f..60eeaf9 100644
@@ -2,11 +2,13 @@ DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool"
  HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/"
  LICENSE = "AS IS"

recipes/calibrator/calibrator_svn.bb DESCRIPTION = "The Calibrator, a Cache-Memory and TLB Calibration Tool" · line 11

Quoted 10 lines
recipes/calibrator/calibrator_svn.bb +4 -2
 
-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?

recipes/calibrator/files/round_conflicting_types.patch line 1

Quoted 9 lines
recipes/calibrator/calibrator_svn.bb +0 -0
  inherit autotools
 
recipes/calibrator/files/round_conflicting_types.patch new file +1 -0
new file mode 100644
index 0000000..520c945
@@ -0,0 +1,91 @@
+round is a conflicting type ; rename to custom_round instead.

Did you send that patch upstream?

Quoted 5 lines
recipes/calibrator/files/round_conflicting_types.patch new file +5 -0
+
+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 @@

[…]

Quoted 2 lines
Quoted 1 line

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

Thanks,

Paul

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#9 lore raw

Re: calibrator: also problems with <svn://svn.bec-systems.com/>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 26-07-11 20:09, Raymond Danks schreef:

Quoted 3 lines

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.

Quoted 45 lines

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

Thanks, Ray

Quoted 39 lines · Paul Menzel

Dear Raymond,

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

Quoted 3 lines

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

Quoted 2 lines

Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:

Quoted 1 line

* 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

Quoted 25 lines
Quoted 1 line
Quoted 1 line

* 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.

Quoted 13 lines

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

Quoted 9 lines

recipes/calibrator/files/round_conflicting_types.patch

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 renamed from recipes/calibrator/calibrator_svn.bb +0 -0

Tool" HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/" LICENSE = "AS IS"

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 renamed from recipes/calibrator/calibrator_svn.bb +0 -2
-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?

Quoted 2 lines

inherit autotools

Quoted 8 lines
Quoted 2 lines
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 renamed from recipes/calibrator/files/round_conflicting_types.patch +0 -0

; rename to custom_round instead.

Did you send that patch upstream?

Quoted 1 line

+ +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 @@

[…]

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

Quoted 8 lines
Quoted 6 lines

Thanks,

Paul

_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________ Openembedded-devel mailing list [email protected] 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-----

#10 lore raw

Re: calibrator: also problems with <svn://svn.bec-systems.com/>

Quoted 8 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 26-07-11 20:09, Raymond Danks schreef:

Quoted 3 lines

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...

Quoted 63 lines
Quoted 42 lines

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

Thanks, Ray

Quoted 37 lines · Paul Menzel

Dear Raymond,

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

Quoted 3 lines

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

Quoted 2 lines

Am Montag, den 18.07.2011, 13:25 -0600 schrieb Raymond Danks:

Quoted 1 line

* 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

Quoted 24 lines
Quoted 1 line
Quoted 1 line

* 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.

Quoted 21 lines

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

Quoted 9 lines

recipes/calibrator/files/round_conflicting_types.patch

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 renamed from recipes/calibrator/calibrator_svn.bb +0 -0

Tool" HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/" LICENSE = "AS IS"

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 renamed from recipes/calibrator/calibrator_svn.bb +0 -2
-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?

Quoted 4 lines

inherit autotools

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 renamed from recipes/calibrator/files/round_conflicting_types.patch +0 -0

; rename to custom_round instead.

Did you send that patch upstream?

Quoted 1 line

+ +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 @@

[…]

Quoted 8 lines
Quoted 7 lines
Quoted 1 line

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

Thanks,

Paul

_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________ Openembedded-devel mailing list [email protected] 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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#11 lore raw

PATCH v2 1/3 calibrator: Move to latest SVN rev 138

In reply to Raymond Danks

* The SVN repository for this project has changed URI.
* Upgrade to and patch the latest version for use with current tools.

---
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
recipes/calibrator/calibrator_svn.bb +5 -2
index bd7bb1f..4410dc4 100644
@@ -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
 
recipes/calibrator/files/round_conflicting_types.patch new file +91 -0

91 lines not on this page · raw message

Signature · 1 line
1.7.0.4