Skip to contentSkip to conversation

Package upgrades

PATCH New Cristiana Voicu 1 participant 3 messages Oct 31, 2013

lore
Share & tools
lore

Cristiana Voicu

author
#0 lore raw

cover Package upgrades

Hi,

Tests done:
* build tested on AB running following nightlies: build-appliance, x86, x86_64, ppc, mips, arm;
* checked with rpm if the packages were installed and their version on a sato image;
basic functionality for rxvt terminal and lttng for liburcu

Thanks,
Cristiana

The following changes since commit 523f2a9ea970713fb775bc48f84b67420b1106a0:

cross-canadian: Improve comment (2013-10-30 18:01:34 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib cvoicu/work
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=cvoicu/work

Cristiana Voicu (2):
rxvt-unicode: upgrade to 9.19
liburcu: upgrade to 0.8.0

 .../rxvt.desktop                                   |    0
 .../rxvt.png                                       |  Bin 2847 -> 2847 bytes
 .../xwc.patch                                      |    0
 .../{rxvt-unicode_9.18.bb => rxvt-unicode_9.19.bb} |    4 ++--
 meta/recipes-support/liburcu/files/fixCCflag.patch |   20 ++++++++++++++++++++
 .../liburcu/files/fixsepbuild.patch                |   19 +++++++++++++++++++
 .../liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} |    8 +++++---
 7 files changed, 46 insertions(+), 5 deletions(-)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.18 => rxvt-unicode-9.19}/rxvt.desktop (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.18 => rxvt-unicode-9.19}/rxvt.png (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.18 => rxvt-unicode-9.19}/xwc.patch (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.18.bb => rxvt-unicode_9.19.bb} (93%)
 create mode 100644 meta/recipes-support/liburcu/files/fixCCflag.patch
 create mode 100644 meta/recipes-support/liburcu/files/fixsepbuild.patch
 rename meta/recipes-support/liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} (74%)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 rxvt-unicode: upgrade to 9.19

Signed-off-by Cristiana Voicu <[email protected]>
---
 .../rxvt.desktop                                   |    0
 .../rxvt.png                                       |  Bin 2847 -> 2847 bytes
 .../xwc.patch                                      |    0
 .../{rxvt-unicode_9.18.bb => rxvt-unicode_9.19.bb} |    4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.18 => rxvt-unicode-9.19}/rxvt.desktop (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.18 => rxvt-unicode-9.19}/rxvt.png (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.18 => rxvt-unicode-9.19}/xwc.patch (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.18.bb => rxvt-unicode_9.19.bb} (93%)
meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.desktop renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop +0 -0
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.desktop
meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.png renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png +0 -0
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.png
meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/xwc.patch renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch +0 -0
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/xwc.patch
meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.19.bb renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb +2 -2
similarity index 93%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.19.bb
index c3770ae..fca26ba 100644
@@ -16,8 +16,8 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2
 	   file://rxvt.desktop \
 	   file://rxvt.png"
 
-SRC_URI[md5sum] = "963ccc748fe5bca925e7b92c0404d68b"
-SRC_URI[sha256sum] = "87b72a43cac7c9362a984094c661a632ce1a829ad90f149142ab1953854b433f"
+SRC_URI[md5sum] = "45ad197eb9b5a840c0f65e3a8131921c"
+SRC_URI[sha256sum] = "d9237cf1973af461ecbeeb708e4d00893294771558e8338b4f33418ed52d3241"
 
 inherit autotools update-alternatives
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/2 liburcu: upgrade to 0.8.0

In reply to Cristiana Voicu

Fix case where ${B} != ${S}; add patch to allow out of tree doc exemples build to work
Add patch to remove CC=gcc when CC is defined, in order to use the cross compiler.

Signed-off-by Cristiana Voicu <[email protected]>
---
 meta/recipes-support/liburcu/files/fixCCflag.patch |   20 ++++++++++++++++++++
 .../liburcu/files/fixsepbuild.patch                |   19 +++++++++++++++++++
 .../liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} |    8 +++++---
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-support/liburcu/files/fixCCflag.patch
 create mode 100644 meta/recipes-support/liburcu/files/fixsepbuild.patch
 rename meta/recipes-support/liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} (74%)
meta/recipes-support/liburcu/files/fixCCflag.patch new file +20 -0
new file mode 100644
index 0000000..2e526d4
@@ -0,0 +1,20 @@
+Upstream-Status: Pending
+
+Use cross compiler for doc exemples too
+
+Signed-off-by: Cristiana Voicu <[email protected]>
+
+Index: userspace-rcu-0.8.0/doc/examples/Makefile.examples.template
+===================================================================
+--- userspace-rcu-0.8.0.orig/doc/examples/Makefile.examples.template	2013-08-30 21:25:20.000000000 +0300
++++ userspace-rcu-0.8.0/doc/examples/Makefile.examples.template	2013-10-23 13:34:30.405550556 +0300
+@@ -11,7 +11,9 @@
+ #
+ # This makefile is purposefully kept simple to support GNU and BSD make.
+ 
++ifndef CC
+ CC = gcc
++endif
+ CFLAGS = -g -O2 -Wall
+ 
+ all: $(BINARY)
meta/recipes-support/liburcu/files/fixsepbuild.patch new file +19 -0
new file mode 100644
index 0000000..9cd0ab9
@@ -0,0 +1,19 @@
+Upstream-Status: Pending
+
+Fix out of tree build for doc examples
+
+Signed-off-by: Cristiana Voicu <[email protected]>
+
+Index: userspace-rcu-0.8.0/doc/examples/Makefile.am
+===================================================================
+--- userspace-rcu-0.8.0.orig/doc/examples/Makefile.am	2013-08-30 21:25:20.000000000 +0300
++++ userspace-rcu-0.8.0/doc/examples/Makefile.am	2013-10-21 17:52:34.774597179 +0300
+@@ -128,7 +128,7 @@
+ 			cp -fR $(srcdir)/$$subdir $(builddir); \
+ 		done; \
+ 	fi
+-	$(MAKE) -f dist-files/Makefile AM_CPPFLAGS="$(CPPFLAGS) -I../../../urcu/ -I../../../" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath="$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all
++	$(MAKE) -f dist-files/Makefile AM_CPPFLAGS="$(CPPFLAGS) -I$(top_srcdir) -I../../../urcu/ -I../../../" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath="$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all
+ 
+ clean-local:
+ 	$(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean
meta/recipes-support/liburcu/liburcu_0.8.0.bb renamed from meta/recipes-support/liburcu/liburcu_0.7.7.bb +5 -3
similarity index 74%
rename from meta/recipes-support/liburcu/liburcu_0.7.7.bb
rename to meta/recipes-support/liburcu/liburcu_0.8.0.bb
index a75e92e..0bb4545 100644
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f060c30a27922ce9c0d557a639b4fa3 \
                     file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \
                     file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42"
 
-SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2"
+SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \
+           file://fixsepbuild.patch \
+           file://fixCCflag.patch"
 
-SRC_URI[md5sum] = "d14de3ff32eb1ab9424b258599c8a6f3"
-SRC_URI[sha256sum] = "8ab8a7d8fea47c09ceac24c9277f00da626bbd9426c973eb325b1baf33b4bdfb"
+SRC_URI[md5sum] = "ddf193131b9f172c8f540b60d9d339f4"
+SRC_URI[sha256sum] = "49fbe70af47945037f437931c9539bfb9cb03ba28b813649ea7394dbdca70658"
 
 S = "${WORKDIR}/userspace-rcu-${PV}"
 CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
Signature · 1 line
1.7.9.5