Skip to contentSkip to conversation

Package upgrades

PATCH New Cristiana Voicu 1 participant 3 messages May 6, 2014

lore
Share & tools
lore
#0 lore raw

cover Package upgrades

The packages has been succesfully compiled for all major architectures. Tested locally on a core-image-sato image.

The following changes since commit 7b78c364b7de901f97cd8dbe56d5e02f545bf3d3:

cleanup-workdir: Fix crosssdk reference after addition of PN (2014-05-05 09:05:42 +0100)

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):
babeltrace: upgrade to 1.2.1
rxvt-unicode: upgrade to 9.20

 ...-Support-out-of-tree-builds-in-babeltrace.patch |   17 +++++++++++++++++
 .../{babeltrace_1.1.1.bb => babeltrace_1.2.1.bb}   |    7 ++++---
 .../rxvt.desktop                                   |    0
 .../{rxvt-unicode-9.19 => rxvt-unicode}/rxvt.png   |  Bin 2847 -> 2847 bytes
 .../{rxvt-unicode-9.19 => rxvt-unicode}/xwc.patch  |    0
 .../{rxvt-unicode_9.19.bb => rxvt-unicode_9.20.bb} |    4 ++--
 6 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch
 rename meta/recipes-kernel/lttng/{babeltrace_1.1.1.bb => babeltrace_1.2.1.bb} (72%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.19 => rxvt-unicode}/rxvt.desktop (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.19 => rxvt-unicode}/rxvt.png (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.19 => rxvt-unicode}/xwc.patch (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.19.bb => rxvt-unicode_9.20.bb} (93%)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 babeltrace: upgrade to 1.2.1

The release for 1.2.1 is on branch stable-1.2.
Backported a patch to fix out of tree build.

---
 ...-Support-out-of-tree-builds-in-babeltrace.patch |   17 +++++++++++++++++
 .../{babeltrace_1.1.1.bb => babeltrace_1.2.1.bb}   |    7 ++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch
 rename meta/recipes-kernel/lttng/{babeltrace_1.1.1.bb => babeltrace_1.2.1.bb} (72%)
meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch new file +17 -0
new file mode 100644
index 0000000..258eedd
@@ -0,0 +1,17 @@
+Upstream-Status: backport
+
+babeltrace: Fix support out of tree builds in babeltrace
+
+Signed-off-by: Lars Persson <[email protected]>
+
+diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am
+index c834699..2c6b0bd 100644
+--- a/formats/lttng-live/Makefile.am
++++ b/formats/lttng-live/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include
++AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)
+ 
+ lib_LTLIBRARIES = libbabeltrace-lttng-live.la
+ 
+
meta/recipes-kernel/lttng/babeltrace_1.2.1.bb renamed from meta/recipes-kernel/lttng/babeltrace_1.1.1.bb +4 -3
similarity index 72%
rename from meta/recipes-kernel/lttng/babeltrace_1.1.1.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.2.1.bb
index a6b8a97..5c105d8 100644
@@ -10,10 +10,11 @@ inherit autotools
 
 DEPENDS = "glib-2.0 util-linux popt"
 
-SRCREV = "a386e24609752742b100120db6798d311fab512a"
-PV = "1.1.1+git${SRCPV}"
+SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79"
+PV = "1.2.1+git${SRCPV}"
 
-SRC_URI = "git://git.efficios.com/babeltrace.git"
+SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \
+           file://0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/2 rxvt-unicode: upgrade to 9.20

In reply to Cristiana Voicu
---
 .../rxvt.desktop                                   |    0
 .../{rxvt-unicode-9.19 => rxvt-unicode}/rxvt.png   |  Bin 2847 -> 2847 bytes
 .../{rxvt-unicode-9.19 => rxvt-unicode}/xwc.patch  |    0
 .../{rxvt-unicode_9.19.bb => rxvt-unicode_9.20.bb} |    4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.19 => rxvt-unicode}/rxvt.desktop (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.19 => rxvt-unicode}/rxvt.png (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.19 => rxvt-unicode}/xwc.patch (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.19.bb => rxvt-unicode_9.20.bb} (93%)
meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.desktop +0 -0
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.desktop
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.png +0 -0
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/rxvt.png
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png
meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/xwc.patch +0 -0
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.19/xwc.patch
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch
meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.19.bb +2 -2
similarity index 93%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.19.bb
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
index 72eca6d..3a1ea66 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] = "45ad197eb9b5a840c0f65e3a8131921c"
-SRC_URI[sha256sum] = "d9237cf1973af461ecbeeb708e4d00893294771558e8338b4f33418ed52d3241"
+SRC_URI[md5sum] = "4a5b823f08d21036f94a6c51e94d025b"
+SRC_URI[sha256sum] = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e"
 
 inherit autotools update-alternatives
 
Signature · 1 line
1.7.9.5