Daisy backports I

PATCH In review Martin Jansa 1 participant 13 messages May 12, 2014 – May 15, 2014

lore

Share & tools

lore

Martin Jansa

author

2014-05-12 11:34 UTC #0 lore raw

cover Daisy backports I

The following changes since commit 82bd5fc58229df73d7aca93f41b13392f9fdc3dc:

build-appliance-image: Update to head revision (2014-04-22 22:53:27 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib jansa/daisy-backports
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/daisy-backports

Jacob Kroon (1):
console-tools: Remove floating runtime dependency on flex

Khem Raj (1):
lttng-modules-2.3.3: Fix build on ARM

Koen Kooi (1):
grub git: workaround debugedit problems

Martin Jansa (7):
libnotify: add dbus-glib dependency
gsettings-desktop-schemas: add missing dependency on intltool-native
qt4: Explicitly disable sqlite2
defaultsetup: enable blacklist by default
gst-plugins-bad: add PACKAGECONFIG for schro, dc1394 and faac
gst-plugins-good: add PACKAGECONFIG for x11 gstreamer1.0-plugins-good: add libxfixes and libxdamange to x11
depends

 meta/conf/distro/defaultsetup.conf                 |   3 +-
 meta/recipes-bsp/grub/grub_git.bb                  |   4 +
 .../console-tools-0.3.2/no-dep-on-libfl.patch      |  19 ++++
 .../console-tools/console-tools_0.3.2.bb           |   1 +
 .../gnome/gsettings-desktop-schemas_3.10.1.bb      |   2 +-
 meta/recipes-gnome/libnotify/libnotify_0.6.0.bb    |   2 +-
 .../lttng/lttng-modules/fixup_block_driver.patch   | 122 +++++++++++++++++++++
 meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb   |   4 +-
 .../gstreamer/gst-plugins-bad_0.10.23.bb           |   3 +
 .../gstreamer/gst-plugins-good_0.10.31.bb          |   6 +-
 .../gstreamer/gstreamer1.0-plugins-good.inc        |   2 +-
 meta/recipes-qt/qt4/qt4.inc                        |   2 +-
 12 files changed, 163 insertions(+), 7 deletions(-)
 create mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:34 UTC #1 lore raw

PATCH 1/10 libnotify: add dbus-glib dependency

From: Martin Jansa <[email protected]>

* | No package 'dbus-glib-1' found
| configure:11865: error: Package requirements (gtk+-2.0 >= 2.18, glib-2.0 >= 2.6,

    dbus-1 >= 0.76, dbus-glib-1 >= 0.76 gmodule-2.0) were not met:

* introduced in:
commit 5c1eeb5d16566521e45947b07fdcd9f552fec45b
Author: Alexandru Palalau <[email protected]>
Date: Thu Feb 27 12:05:41 2014 +0200

libnotify: don't use gnome.bbclass

because gnome.bbclass was adding gconf->dbus-glib dependency

* it was also causing other recipes to fail when they were depending on libnotify which has dbus-glib in pkg-config and dbus-glib was missing, e.g. firefox:
| checking for libnotify >= 0.4... Package dbus-glib-1 was not found in the pkg-config search path. Perhaps you should add the directory containing `dbus-glib-1.pc' to the PKG_CONFIG_PATH environment variable Package 'dbus-glib-1', required by 'libnotify', not found | configure: error: Library requirements (libnotify >= 0.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.

Signed-off-by Martin Jansa <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---
 meta/recipes-gnome/libnotify/libnotify_0.6.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-gnome/libnotify/libnotify_0.6.0.bb +1 -1

index a1f2fbc..1d92b64 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
 PR = "r1"
 
-DEPENDS = "dbus gtk+"
+DEPENDS = "dbus gtk+ dbus-glib"
 
 inherit gnomebase
 SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516"

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:34 UTC #2 lore raw

PATCH 2/10 gsettings-desktop-schemas: add missing dependency on intltool-native

In reply to Martin Jansa

From: Martin Jansa <[email protected]>

* do_configure fails with:
| NOTE: Executing intltoolize --copy --force --automake
| /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gsettings-desktop-schemas/3.10.1-r1/temp/run.do_configure.1111: 180:
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gsettings-desktop-schemas/3.10.1-r1/temp/run.do_configure.1111:
intltoolize: not found
| WARNING: exit code 127 from a shell command.
| ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gsettings-desktop-schemas/3.10.1-r1/temp/log.do_configure.1111)
NOTE: recipe gsettings-desktop-schemas-3.10.1-r1: task do_configure:

* introduced in:
commit 1138976f7bdcd24ef57451a2c2ceffa43666610f
Author: Alexandru Palalau <[email protected]>
Date: Tue Mar 11 13:27:46 2014 +0000

gsettings-desktop-schemas: removed unneeded class inheritance

Signed-off-by Martin Jansa <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---
 meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb +1 -1

index 7217c66..eb09d2f 100644
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 PR = "r1"
 
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 intltool-native"
 
 inherit gnomebase gsettings gettext

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:34 UTC #3 lore raw

PATCH 3/10 qt4: Explicitly disable sqlite2

In reply to Martin Jansa

* notice that this disables only sqlite2 (sqlite dependency), sqlite (sqlite3 dependency) stays enabled

* fixes these errors detected by test-dependencies.sh:
qt4-embedded/qt4-embedded-plugin-sqldriver-sqlite2/latest doesn't exist qt4-embedded/qt4-embedded-plugin-sqldriver-sqlite2-dbg/latest doesn't exist qt4-x11-free/qt4-plugin-sqldriver-sqlite2/latest doesn't exist qt4-x11-free/qt4-plugin-sqldriver-sqlite2-dbg/latest doesn't exist

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-qt/qt4/qt4.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-qt/qt4/qt4.inc +1 -1

index 9a10138..223b29c 100644
@@ -8,7 +8,7 @@ require qt4_arch.inc
 QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
 QT_DISTRO_FLAGS_linuxstdbase = "-sm"
 
-QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite -system-sqlite"
+QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -no-sql-sqlite2 -plugin-sql-sqlite -system-sqlite"
 
 QT_GLFLAGS ?= ""

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:34 UTC #4 lore raw

PATCH 4/10 defaultsetup: enable blacklist by default

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta/conf/distro/defaultsetup.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

meta/conf/distro/defaultsetup.conf +2 -1

index 6fc522c..9ba8651 100644
@@ -18,6 +18,7 @@ CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'
 
 USER_CLASSES ?= ""
 PACKAGE_CLASSES ?= "package_ipk"
+INHERIT_BLACKLIST = "blacklist"
 INHERIT_DISTRO ?= "debian devshell sstate license"
-INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO}"
+INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}"

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:34 UTC #5 lore raw

PATCH 5/10 lttng-modules-2.3.3: Fix build on ARM

In reply to Martin Jansa

From: Khem Raj <[email protected]>

Update the structure to work with immutable bio_vecs

Signed-off-by Khem Raj <[email protected]>

---
 .../lttng/lttng-modules/fixup_block_driver.patch   | 122 +++++++++++++++++++++
 meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb   |   4 +-
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch

meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch new file +122 -0

new file mode 100644
index 0000000..3644a47
@@ -0,0 +1,122 @@
+Fix errors like
+
+block.h:344:24: error: 'struct bio' has no member named 'bi_sector'
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+Index: git/instrumentation/events/lttng-module/block.h
+===================================================================
+--- git.orig/instrumentation/events/lttng-module/block.h	2014-05-02 22:20:01.814125429 -0700
++++ git/instrumentation/events/lttng-module/block.h	2014-05-02 22:28:48.927455709 -0700
+@@ -341,9 +341,9 @@
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev ?
+ 					  bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -385,14 +385,14 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+ 		tp_assign(error, error)
+ #else
+ 		tp_assign(error, 0)
+ #endif
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 	),
+ 
+ 	TP_printk("%d,%d %s %llu + %u [%d]",
+@@ -419,9 +419,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -485,9 +485,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -513,9 +513,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -587,10 +587,10 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio ? bio->bi_sector : 0)
+-		tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
++		tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
++		tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
+ 		blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
+-			      bio ? bio->bi_size >> 9 : 0)
++			      bio ? bio->bi_iter.bi_size >> 9 : 0)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+         ),
+ 
+@@ -759,9 +759,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
++		tp_assign(sector, bio->bi_iter.bi_sector)
+ 		tp_assign(new_sector, new_sector)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -805,11 +805,11 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
+ 		tp_assign(old_dev, dev)
+ 		tp_assign(old_sector, from)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 	),
+ 
+ 	TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",

meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb +3 -1

index dd06546..94e18b2 100644
@@ -14,7 +14,9 @@ SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377"
 PV = "2.3.3"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
-           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
+           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
+           file://fixup_block_driver.patch \
+          "
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 export KERNEL_SRC="${STAGING_KERNEL_DIR}"

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:34 UTC #8 lore raw

PATCH 6/10 grub git: workaround debugedit problems

In reply to Martin Jansa

From: Koen Kooi <[email protected]>

Debugedit errors out on bare metal binaries. The first version of this patch limited it to 64 bit targets, but the problem now shows up on 32 bit targets (minnowboard) as well.

Signed-off-by Koen Kooi <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---
 meta/recipes-bsp/grub/grub_git.bb | 4 ++++
 1 file changed, 4 insertions(+)

meta/recipes-bsp/grub/grub_git.bb +4 -0

index 9b5d9bb..114cf77 100644
@@ -53,8 +53,12 @@ do_configure_prepend() {
 do_install_append () {
     install -d ${D}${sysconfdir}/grub.d
     install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom
+ 
 }
 
+# debugedit chokes on bare metal binaries
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
 RDEPENDS_${PN} = "diffutils freetype"
 FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:34 UTC #9 lore raw

PATCH 7/10 console-tools: Remove floating runtime dependency on flex

In reply to Martin Jansa

From: Jacob Kroon <[email protected]>

The 'loadkeys' program defines its own yywrap()/yylex() functions, there is no need to link with flex shared library.

Signed-off-by Jacob Kroon <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---
 .../console-tools-0.3.2/no-dep-on-libfl.patch         | 19 +++++++++++++++++++
 .../recipes-core/console-tools/console-tools_0.3.2.bb |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch

meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch new file +19 -0

new file mode 100644
index 0000000..a6735a5
@@ -0,0 +1,19 @@
+No reason to link with libfl since 'loadkeys' implements
+its own yywrap()/yylex() functions.
+
+Upstream-Status: Pending
+Signed-off-by: Jacob Kroon <[email protected]>
+
+Index: console-tools-0.3.2/kbdtools/Makefile.am
+===================================================================
+--- console-tools-0.3.2.orig/kbdtools/Makefile.am
++++ console-tools-0.3.2/kbdtools/Makefile.am
+@@ -19,8 +19,6 @@ LDADD = ../lib/ctlocal/libctlocal.a ../l
+ 	../lib/cfont/libcfont.la \
+ 	../lib/console/libconsole.la ../lib/generic/libctgeneric.la
+ 
+-loadkeys_LDADD = $(LDADD) @LEXLIB@
+-
+ bin_SCRIPTS = mk_modmap
+ 
+ noinst_HEADERS = loadkeys.h

meta/recipes-core/console-tools/console-tools_0.3.2.bb +1 -0

index 80fab55..c60a5a0 100644
@@ -13,6 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
            file://uclibc-fileno.patch \
            file://nodocs.patch \
            file://fix-libconsole-linking.patch \
+           file://no-dep-on-libfl.patch \
            file://lcmessage.m4 \
            file://Makevars"

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:35 UTC #10 lore raw

PATCH 8/10 gst-plugins-bad: add PACKAGECONFIG for schro, dc1394 and faac

In reply to Martin Jansa

* resolve following issues from test-dependencies issues:
gst-plugins-bad/gst-plugins-bad-meta/latest lost dependency on
gst-plugins-bad-dc1394 gst-plugins-bad-faac gst-plugins-bad-schro
Found errors:
gst-plugins-bad/gst-plugins-bad-dc1394/latest doesn't exist gst-plugins-bad/gst-plugins-bad-dc1394-dev/latest doesn't exist gst-plugins-bad/gst-plugins-bad-faac/latest doesn't exist gst-plugins-bad/gst-plugins-bad-faac-dev/latest doesn't exist gst-plugins-bad/gst-plugins-bad-schro/latest doesn't exist gst-plugins-bad/gst-plugins-bad-schro-dev/latest doesn't exist

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb +3 -0

index dceb12c..110a505 100644
@@ -34,6 +34,9 @@ PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
 PACKAGECONFIG[vp8] = "--enable-vp8,--disable-vp8,libvpx"
 PACKAGECONFIG[ass] = "--enable-assrender,--disable-assrender,libass"
 PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
+PACKAGECONFIG[schro] = "--enable-schro,--disable-schro,schroedinger"
+PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394"
+PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac"
 
 ARM_INSTRUCTION_SET = "arm"

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:35 UTC #11 lore raw

PATCH 9/10 gst-plugins-good: add PACKAGECONFIG for x11

In reply to Martin Jansa

* fixes following issues from test-dependencies report:
gst-plugins-good/gst-plugins-good-ximagesrc/latest lost dependency on libxdamage

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +5 -1

index e044340..88f90f3 100644
@@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
 PR = "r8"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} jpeg"
+PACKAGECONFIG ?= "jpeg \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+"
 PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
 PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"

@@ -16,6 +19,7 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
 PACKAGECONFIG[v4l] = "--with-libv4l2,--without-libv4l2,libv4l"
 PACKAGECONFIG[bzip2] = "--enable-bz2,--disable-bz2,bzip2"
 PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
+PACKAGECONFIG[x11] = "--enable-x,--disable-x,virtual/libx11 libxfixes libxdamage"
 
 DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \
             speex libsoup-2.4"

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-12 11:35 UTC #12 lore raw

PATCH 10/10 gstreamer1.0-plugins-good: add libxfixes and libxdamange to x11 depends

In reply to Martin Jansa

* fixes following issue in test-dependencies report:
gstreamer1.0-plugins-good/gstreamer1.0-plugins-good-ximagesrc/latest lost dependency on libxdamage

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +1 -1

index 06de4da..febff3a 100644
@@ -14,7 +14,7 @@ PACKAGECONFIG ??= " \
     orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \
     "
 
-X11DEPENDS = "virtual/libx11 libsm libxrender"
+X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
 X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm"
 X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm"
 PACKAGECONFIG[x11]        = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"

Signature · 1 line

1.9.2

Martin Jansa

author

2014-05-15 12:10 UTC #6 lore raw

Re: [daisy][PATCH 05/10] lttng-modules-2.3.3: Fix build on ARM

In reply to Martin Jansa

Quoted 3 lines · Martin Jansa

From: Khem Raj <[email protected]>
Update the structure to work with immutable bio_vecs

Please don't merge this patch to daisy, there is different one already!

It's actually master which should be updated with patch from daisy:
http://lists.openembedded.org/pipermail/openembedded-core/2014-May/092591.html

Quoted 153 lines

Signed-off-by Khem Raj <[email protected]>

---
 .../lttng/lttng-modules/fixup_block_driver.patch   | 122 +++++++++++++++++++++
 meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb   |   4 +-
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch

meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch new file +122 -0

new file mode 100644
index 0000000..3644a47
@@ -0,0 +1,122 @@
+Fix errors like
+
+block.h:344:24: error: 'struct bio' has no member named 'bi_sector'
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+Index: git/instrumentation/events/lttng-module/block.h
+===================================================================
+--- git.orig/instrumentation/events/lttng-module/block.h	2014-05-02 22:20:01.814125429 -0700
++++ git/instrumentation/events/lttng-module/block.h	2014-05-02 22:28:48.927455709 -0700
+@@ -341,9 +341,9 @@
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev ?
+ 					  bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -385,14 +385,14 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+ 		tp_assign(error, error)
+ #else
+ 		tp_assign(error, 0)
+ #endif
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 	),
+ 
+ 	TP_printk("%d,%d %s %llu + %u [%d]",
+@@ -419,9 +419,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -485,9 +485,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -513,9 +513,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -587,10 +587,10 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio ? bio->bi_sector : 0)
+-		tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
++		tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
++		tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
+ 		blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
+-			      bio ? bio->bi_size >> 9 : 0)
++			      bio ? bio->bi_iter.bi_size >> 9 : 0)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+         ),
+ 
+@@ -759,9 +759,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
++		tp_assign(sector, bio->bi_iter.bi_sector)
+ 		tp_assign(new_sector, new_sector)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -805,11 +805,11 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
+ 		tp_assign(old_dev, dev)
+ 		tp_assign(old_sector, from)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 	),
+ 
+ 	TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",

meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb +3 -1

index dd06546..94e18b2 100644
@@ -14,7 +14,9 @@ SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377"
 PV = "2.3.3"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
-           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
+           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
+           file://fixup_block_driver.patch \
+          "
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 export KERNEL_SRC="${STAGING_KERNEL_DIR}"

Signature · 1 line

1.9.2

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2014-05-15 12:23 UTC #7 lore raw

PATCH v2 1/1 lttng-modules: Add bio-bvec-iter.patch also for 2.3.3 version

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb +2 -1

index dd06546..4f18ddc 100644
@@ -14,7 +14,8 @@ SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377"
 PV = "2.3.3"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
-           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
+           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
+           file://bio-bvec-iter.patch"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 export KERNEL_SRC="${STAGING_KERNEL_DIR}"

Signature · 1 line

1.9.3