* [daisy][PATCH 00/10] Daisy backports I
@ 2014-05-12 11:34 Martin Jansa
2014-05-12 11:34 ` [daisy][PATCH 01/10] libnotify: add dbus-glib dependency Martin Jansa
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw)
To: openembedded-core
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
--
1.9.2
^ permalink raw reply [flat|nested] 13+ messages in thread* [daisy][PATCH 01/10] libnotify: add dbus-glib dependency 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 02/10] gsettings-desktop-schemas: add missing dependency on intltool-native Martin Jansa ` (8 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core From: Martin Jansa <martin.jansa@gmail.com> * | 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 <alexandrux.palalau@intel.com> 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 <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-gnome/libnotify/libnotify_0.6.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb index a1f2fbc..1d92b64 100644 --- a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb +++ b/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb @@ -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" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 02/10] gsettings-desktop-schemas: add missing dependency on intltool-native 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 01/10] libnotify: add dbus-glib dependency Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 03/10] qt4: Explicitly disable sqlite2 Martin Jansa ` (7 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core From: Martin Jansa <martin.jansa@gmail.com> * 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 <alexandrux.palalau@linux.intel.com> Date: Tue Mar 11 13:27:46 2014 +0000 gsettings-desktop-schemas: removed unneeded class inheritance Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb index 7217c66..eb09d2f 100644 --- a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb +++ b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb @@ -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 -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 03/10] qt4: Explicitly disable sqlite2 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 01/10] libnotify: add dbus-glib dependency Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 02/10] gsettings-desktop-schemas: add missing dependency on intltool-native Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 04/10] defaultsetup: enable blacklist by default Martin Jansa ` (6 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core * 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 <Martin.Jansa@gmail.com> --- meta/recipes-qt/qt4/qt4.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 9a10138..223b29c 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -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 ?= "" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 04/10] defaultsetup: enable blacklist by default 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa ` (2 preceding siblings ...) 2014-05-12 11:34 ` [daisy][PATCH 03/10] qt4: Explicitly disable sqlite2 Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 05/10] lttng-modules-2.3.3: Fix build on ARM Martin Jansa ` (5 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/conf/distro/defaultsetup.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index 6fc522c..9ba8651 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf @@ -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}" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 05/10] lttng-modules-2.3.3: Fix build on ARM 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa ` (3 preceding siblings ...) 2014-05-12 11:34 ` [daisy][PATCH 04/10] defaultsetup: enable blacklist by default Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-15 12:10 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 06/10] grub git: workaround debugedit problems Martin Jansa ` (4 subsequent siblings) 9 siblings, 1 reply; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core From: Khem Raj <raj.khem@gmail.com> Update the structure to work with immutable bio_vecs Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../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 diff --git a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch new file mode 100644 index 0000000..3644a47 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch @@ -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 <raj.khem@gmail.com> +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", diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb index dd06546..94e18b2 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb @@ -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}" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [daisy][PATCH 05/10] lttng-modules-2.3.3: Fix build on ARM 2014-05-12 11:34 ` [daisy][PATCH 05/10] lttng-modules-2.3.3: Fix build on ARM Martin Jansa @ 2014-05-15 12:10 ` Martin Jansa 2014-05-15 12:23 ` [daisy][PATCHv2] lttng-modules: Add bio-bvec-iter.patch also for 2.3.3 version Martin Jansa 0 siblings, 1 reply; 13+ messages in thread From: Martin Jansa @ 2014-05-15 12:10 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 6419 bytes --] On Mon, May 12, 2014 at 01:34:54PM +0200, Martin Jansa wrote: > From: Khem Raj <raj.khem@gmail.com> > > 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 > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > .../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 > > diff --git a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch > new file mode 100644 > index 0000000..3644a47 > --- /dev/null > +++ b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch > @@ -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 <raj.khem@gmail.com> > +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", > diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb > index dd06546..94e18b2 100644 > --- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb > +++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb > @@ -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}" > -- > 1.9.2 > -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* [daisy][PATCHv2] lttng-modules: Add bio-bvec-iter.patch also for 2.3.3 version 2014-05-15 12:10 ` Martin Jansa @ 2014-05-15 12:23 ` Martin Jansa 0 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-15 12:23 UTC (permalink / raw) To: openembedded-core Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb index dd06546..4f18ddc 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb @@ -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}" -- 1.9.3 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 06/10] grub git: workaround debugedit problems 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa ` (4 preceding siblings ...) 2014-05-12 11:34 ` [daisy][PATCH 05/10] lttng-modules-2.3.3: Fix build on ARM Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 07/10] console-tools: Remove floating runtime dependency on flex Martin Jansa ` (3 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core From: Koen Kooi <koen.kooi@linaro.org> 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 <koen.kooi@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-bsp/grub/grub_git.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index 9b5d9bb..114cf77 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -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" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 07/10] console-tools: Remove floating runtime dependency on flex 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa ` (5 preceding siblings ...) 2014-05-12 11:34 ` [daisy][PATCH 06/10] grub git: workaround debugedit problems Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 08/10] gst-plugins-bad: add PACKAGECONFIG for schro, dc1394 and faac Martin Jansa ` (2 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core From: Jacob Kroon <jacob.kroon@mikrodidakt.se> The 'loadkeys' program defines its own yywrap()/yylex() functions, there is no need to link with flex shared library. Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- .../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 diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch new file mode 100644 index 0000000..a6735a5 --- /dev/null +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch @@ -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 <jacob.kroon@mikrodidakt.se> + +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 diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb index 80fab55..c60a5a0 100644 --- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb +++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb @@ -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" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 08/10] gst-plugins-bad: add PACKAGECONFIG for schro, dc1394 and faac 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa ` (6 preceding siblings ...) 2014-05-12 11:34 ` [daisy][PATCH 07/10] console-tools: Remove floating runtime dependency on flex Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 09/10] gst-plugins-good: add PACKAGECONFIG for x11 Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 10/10] gstreamer1.0-plugins-good: add libxfixes and libxdamange to x11 depends Martin Jansa 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core * 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 <Martin.Jansa@gmail.com> --- meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb index dceb12c..110a505 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb @@ -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" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 09/10] gst-plugins-good: add PACKAGECONFIG for x11 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa ` (7 preceding siblings ...) 2014-05-12 11:34 ` [daisy][PATCH 08/10] gst-plugins-bad: add PACKAGECONFIG for schro, dc1394 and faac Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 10/10] gstreamer1.0-plugins-good: add libxfixes and libxdamange to x11 depends Martin Jansa 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core * fixes following issues from test-dependencies report: gst-plugins-good/gst-plugins-good-ximagesrc/latest lost dependency on libxdamage Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb index e044340..88f90f3 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb @@ -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" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [daisy][PATCH 10/10] gstreamer1.0-plugins-good: add libxfixes and libxdamange to x11 depends 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa ` (8 preceding siblings ...) 2014-05-12 11:34 ` [daisy][PATCH 09/10] gst-plugins-good: add PACKAGECONFIG for x11 Martin Jansa @ 2014-05-12 11:34 ` Martin Jansa 9 siblings, 0 replies; 13+ messages in thread From: Martin Jansa @ 2014-05-12 11:34 UTC (permalink / raw) To: openembedded-core * 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 <Martin.Jansa@gmail.com> --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index 06de4da..febff3a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc @@ -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}" -- 1.9.2 ^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2014-05-15 12:23 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-12 11:34 [daisy][PATCH 00/10] Daisy backports I Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 01/10] libnotify: add dbus-glib dependency Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 02/10] gsettings-desktop-schemas: add missing dependency on intltool-native Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 03/10] qt4: Explicitly disable sqlite2 Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 04/10] defaultsetup: enable blacklist by default Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 05/10] lttng-modules-2.3.3: Fix build on ARM Martin Jansa 2014-05-15 12:10 ` Martin Jansa 2014-05-15 12:23 ` [daisy][PATCHv2] lttng-modules: Add bio-bvec-iter.patch also for 2.3.3 version Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 06/10] grub git: workaround debugedit problems Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 07/10] console-tools: Remove floating runtime dependency on flex Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 08/10] gst-plugins-bad: add PACKAGECONFIG for schro, dc1394 and faac Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 09/10] gst-plugins-good: add PACKAGECONFIG for x11 Martin Jansa 2014-05-12 11:34 ` [daisy][PATCH 10/10] gstreamer1.0-plugins-good: add libxfixes and libxdamange to x11 depends Martin Jansa
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.