Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 1/1] src_distribute.bbclass, src_distribute_local.bbclass: mostly rewritten
From: Otavio Salvador @ 2011-10-17 13:04 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318856652.git.otavio@ossystems.com.br>

The code used to reference unavailable variables and mistakenly define
the tasks so fully demonstrating this have not been in use for a
while.

During the code rewrite, it was extended to copy also the patches into
the source distribution directory but using the PF as prefix to avoid
name colision among other recipes.

As 'distsrcall' task was not properly defined and noone noticed it,
until now, it got renamed to 'distribute_sources_all' as it is a
better and more meanful name for the task.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/classes/src_distribute.bbclass       |   54 ++++++++++++++++++++---------
 meta/classes/src_distribute_local.bbclass |   28 ++++++++-------
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/meta/classes/src_distribute.bbclass b/meta/classes/src_distribute.bbclass
index 17d6c09..fbfbdf0 100644
--- a/meta/classes/src_distribute.bbclass
+++ b/meta/classes/src_distribute.bbclass
@@ -2,28 +2,48 @@ SRC_DISTRIBUTECOMMAND[func] = "1"
 python do_distribute_sources () {
 	l = bb.data.createCopy(d)
 	bb.data.update_data(l)
-	licenses = (bb.data.getVar('LICENSE', d, 1) or "unknown").split()
 
 	sources_dir = bb.data.getVar('SRC_DISTRIBUTEDIR', d, 1)
-	import re
-	for license in licenses:
-		for entry in license.split("|"):
-			for s in (bb.data.getVar('A', d, 1) or "").split():
-				s = re.sub(';.*$', '', s)
-				cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
-				if not cmd:
-					raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not defined")
-				bb.data.setVar('SRC', s, d)
-				bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, entry), d)
-				bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
+	src_uri = bb.data.getVar('SRC_URI', d, 1).split()
+	fetcher = bb.fetch2.Fetch(src_uri, d)
+	ud = fetcher.ud
+
+	licenses = bb.data.getVar('LICENSE', d, 1).replace('&', '|')
+	licenses = licenses.replace('(', '').replace(')', '')
+	clean_licenses = ""
+	for x in licenses.split():
+		if x.strip() == '' or x == 'CLOSED':
+			continue
+
+		if x != "|":
+			clean_licenses += x
+
+	for license in clean_licenses.split('|'):
+		for url in ud.values():
+			cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
+			if not cmd:
+				raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not defined")
+			url.setup_localpath(d)
+			bb.data.setVar('SRC', url.localpath, d)
+			if url.type == 'file':
+				if url.basename == '*':
+					import os.path
+					dest_dir = os.path.basename(os.path.dirname(os.path.abspath(url.localpath)))
+					bb.data.setVar('DEST', "%s_%s/" % (bb.data.getVar('PF', d, 1), dest_dir), d)
+				else:
+					bb.data.setVar('DEST', "%s_%s" % (bb.data.getVar('PF', d, 1), url.basename), d)
+			else:
+				bb.data.setVar('DEST', '', d)
+
+			bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, license), d)
+			bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
 }
 
 addtask distribute_sources before do_build after do_fetch
 
-addtask distsrcall after do_distribute_sources
-do_distall[recrdeptask] = "do_distribute_sources"
-base_do_distsrcall() {
+addtask distribute_sources_all after do_distribute_sources
+do_distribute_sources_all[recrdeptask] = "do_distribute_sources"
+do_distribute_sources_all[nostamp] = "1"
+do_distribute_sources_all () {
 	:
 }
-
-EXPORT_FUNCTIONS do_distsrcall
diff --git a/meta/classes/src_distribute_local.bbclass b/meta/classes/src_distribute_local.bbclass
index 5f0cef5..17b67e3 100644
--- a/meta/classes/src_distribute_local.bbclass
+++ b/meta/classes/src_distribute_local.bbclass
@@ -1,31 +1,33 @@
 inherit src_distribute
 
 # SRC_DIST_LOCAL possible values:
-# copy		copies the files from ${A} to the distributedir
-# symlink	symlinks the files from ${A} to the distributedir
+# copy		copies the files to the distributedir
+# symlink	symlinks the files to the distributedir
 # move+symlink	moves the files into distributedir, and symlinks them back
 SRC_DIST_LOCAL ?= "move+symlink"
 SRC_DISTRIBUTEDIR ?= "${DEPLOY_DIR}/sources"
 SRC_DISTRIBUTECOMMAND () {
 	s="${SRC}"
-	if [ ! -L "$s" ] && (echo "$s"|grep "^${DL_DIR}"); then
-		:
-	else
-		exit 0;
-	fi
+	d="${DEST}"
+
 	mkdir -p ${SRC_DISTRIBUTEDIR}
+
+	if echo $d | grep -q '/$'; then
+		mkdir -p ${SRC_DISTRIBUTEDIR}/$d
+	fi
+
 	case "${SRC_DIST_LOCAL}" in
 		copy)
-			test -e $s.md5 && cp -f $s.md5 ${SRC_DISTRIBUTEDIR}/
-			cp -f $s ${SRC_DISTRIBUTEDIR}/
+			test -e $s.md5 && cp -f $s.md5 ${SRC_DISTRIBUTEDIR}/$d.md5
+			cp -f $s ${SRC_DISTRIBUTEDIR}/$d
 			;;
 		symlink)
-			test -e $s.md5 && ln -sf $s.md5 ${SRC_DISTRIBUTEDIR}/
-			ln -sf $s ${SRC_DISTRIBUTEDIR}/
+			test -e $s.md5 && ln -sf $s.md5 ${SRC_DISTRIBUTEDIR}/$d.md5
+			ln -sf $s ${SRC_DISTRIBUTEDIR}/$d
 			;;
 		move+symlink)
-			mv $s ${SRC_DISTRIBUTEDIR}/
-			ln -sf ${SRC_DISTRIBUTEDIR}/`basename $s` $s
+			mv $s ${SRC_DISTRIBUTEDIR}/$d
+			ln -sf ${SRC_DISTRIBUTEDIR}/$d $s
 			;;
 	esac
 }
-- 
1.7.2.5




^ permalink raw reply related

* Re: [RFC] bitbake.conf: include only ${libdir}/${BPN}/*${SOLIBS} not whole ${libdir}/${BPN}/* in FILES_${PN}-dev
From: Otavio Salvador @ 2011-10-17 12:55 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1318855942-8677-1-git-send-email-Martin.Jansa@gmail.com>

On Mon, Oct 17, 2011 at 10:52, Martin Jansa <martin.jansa@gmail.com> wrote:
> * ie syslog-ng has a lot of .so and .la files in ${libdir}/${BPN}/ and
>  fails with this QA check:
> | ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: syslog-ng path
> '/work/i586-oe-linux/syslog-ng-3.2.2-r6.1/packages-split/syslog-ng/usr/lib/syslog-ng/libafsocket.so'
> * I haven't tried to rebuild from scratch to check if this changes is
>  creating more QA issues about unpackaged files then what is trying to
>  fix (ie in syslog-ng), that's why it's RFC
...

Even it raising new warinings it seems the way to go.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br



^ permalink raw reply

* [RFC] bitbake.conf: include only ${libdir}/${BPN}/*${SOLIBS} not whole ${libdir}/${BPN}/* in FILES_${PN}-dev
From: Martin Jansa @ 2011-10-17 12:52 UTC (permalink / raw)
  To: openembedded-core

* ie syslog-ng has a lot of .so and .la files in ${libdir}/${BPN}/ and
  fails with this QA check:
| ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: syslog-ng path
'/work/i586-oe-linux/syslog-ng-3.2.2-r6.1/packages-split/syslog-ng/usr/lib/syslog-ng/libafsocket.so'
* I haven't tried to rebuild from scratch to check if this changes is
  creating more QA issues about unpackaged files then what is trying to
  fix (ie in syslog-ng), that's why it's RFC

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/bitbake.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e2c1b6f..772c09e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -262,7 +262,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
             ${base_bindir}/* ${base_sbindir}/* \
             ${base_libdir}/*${SOLIBS} \
-            ${datadir}/${BPN} ${libdir}/${BPN}/* \
+            ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers"
@@ -271,7 +271,7 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
             ${datadir}/gnome/help"
 SECTION_${PN}-doc = "doc"
 
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*${SOLIBSDEV} ${libdir}/*.la \
                 ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
                 ${datadir}/aclocal ${base_libdir}/*.o"
 SECTION_${PN}-dev = "devel"
-- 
1.7.7




^ permalink raw reply related

* Re: [PATCH 1/1] lsb: Change link of ${baselib} to lib64 for 64bits system
From: Richard Purdie @ 2011-10-17 12:43 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <9b6df8992d50fe277f28786dec2a13c75d09ad95.1318843077.git.xiaofeng.yan@windriver.com>

On Mon, 2011-10-17 at 17:24 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> Correct two faults:
> 
> 1 Binaries of lsb test suite need ld-linux.so* in /lib64.
> for example:
> Target$ ./lsbcmdchk
> -sh: ./lsbcmdchk: No such file or directory
> Target$ strings lsbcmdchk | grep "ld-"
> /lib64/ld-lsb-x86-64.so.3
> 
> "lsbcmdchk" from lsb test suite is a binary program.
> A new modification to lsb_1.4.bb caused that binaries from lsb test suite can't run
> because binaries of lsb test suite need ld-linux.so* in /lib64.
> But the link is changed due to adding multilib. I changed this link again.
> 
> 2 correct mandir
> Waring will appear when running task task do_populate_sysroot
> 
> NOTE: package lsb-1.4-r2: task do_populate_sysroot: Succeeded
> WARNING: For recipe lsb, the following files were installed but not shipped in any package:
> WARNING:   /{datadir}/man/man1/lsb_release.1.gz
> 
> I changed mandir=${D}/man to mandir=${D}/${datadir}/man
> 
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
>  meta/recipes-extended/lsb/lsb_1.4.bb |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)

Merged to master, thanks.

Richard




^ permalink raw reply

* Re: missing mesa-dri dependency?
From: Richard Purdie @ 2011-10-17 12:37 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <201110151452.31950.schnitzeltony@gmx.de>

On Sat, 2011-10-15 at 14:52 +0200, Andreas Müller wrote:
> On Thursday, October 13, 2011 10:24:19 AM Koen Kooi wrote:
> > Hi,
> > 
> > I remember fixing this in meta-oe, but now exactly how. IIRC both mesa-xlib and mesa-dri needed to get built.
> > 
> > configure: error: Package requirements (glproto >= 1.4.14 dri >= 7.8.0) were not met:
> > | 
> > | No package 'dri' found
> > | 
> > | Consider adjusting the PKG_CONFIG_PATH environment variable if you
> > | installed software in a non-standard prefix.
> > | 
> > | Alternatively, you may set the environment variables DRI_CFLAGS
> > | and DRI_LIBS to avoid the need to call pkg-config.
> > | See the pkg-config man page for more details.
> > | + bbfatal 'oe_runconf failed'
> > | + echo 'ERROR: oe_runconf failed'
> > | ERROR: oe_runconf failed
> > | + exit 1
> > | ERROR: Function 'do_configure' failed (see /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/xserver-xorg-1_1.11.1-r0/temp/log.do_configure.3602 for further information)
> > NOTE: package xserver-xorg-1_1.11.1-r0: task do_configure: Failed
> > ERROR: Task 1842 (/OE/tentacle/sources/openembedded-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb, do_configure) failed with exit code '1'
> > 
> > regards,
> > 
> > Koen
> ping - or how do you workaround this for machines not supporting mesa-dri?

All machines should support mesa-dri with just the swrast backend
enabled (which is the default). Xgl now requires dri. If you don't want
xgl you can use the xserver-xorg-lite recipe.

Cheers,

Richard




^ permalink raw reply

* Re: [v2 -CONSOLIDATED PULL 00/14] Updates and World Build Fixes
From: Richard Purdie @ 2011-10-17 12:33 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

On Sun, 2011-10-16 at 13:17 -0700, Saul Wold wrote:
> Richard,
> 
> This is version contains additional comments and fixes based on Khem's
> notes, I also fixes the Upstream-Status to have correct capitolization.
> 
> Sau!
> 
> The following changes since commit d1b12b92439805ec9ca5d031d34d264acd0cab3b:
> 
>   mesa-dri: Enable swrast only by default and intel drivers only on IA platform (2011-10-15 00:41:12 +0100)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib sgw/stage
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
> 
> Dmitry Cherukhin (1):
>   qt4: Added support for QtMobility 1.2
> 
> Dmitry Eremin-Solenikov (1):
>   default-provider: also define a default provider for gconf-native
> 
> Paul Eggleton (2):
>   pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
>   bluez4: disable hidd, pand & dund
> 
> Philip Balister (1):
>   cmake : Disable building ccmake.
> 
> Saul Wold (9):
>   bind: update to 9.8.1
>   resolvconf: Update to 1.61
>   glib-2.0: Add nativesdk depends for libffi
>   qmmp: Fix QA Packaging Errors
>   libomxil: Fix QA Package Errors
>   Distro Tracking: Fix dates
>   sysprof: remove duplicated patch
>   mktemp: Add patch to fix parallel make install
>   screen: Add patch to fix parallel make install

Merged to master apart from the qmmp change, thanks.

Richard




^ permalink raw reply

* Re: [v2 -CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors
From: Richard Purdie @ 2011-10-17 12:33 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <d8bdf3a41a8a090bccb7ffdbe937d9a586876a59.1318796061.git.sgw@linux.intel.com>

On Sun, 2011-10-16 at 13:17 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-qt/qt-apps/qmmp_0.5.1.bb |   36 +++++++++++++++++++++++++++-----
>  1 files changed, 30 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
> index 948c32a..3f710f5 100644
> --- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
> @@ -4,7 +4,7 @@ LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
>  SECTION = "multimedia"
>  
> -PR = "r0"
> +PR = "r1"
>  
>  DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
>  RDEPENDS_${PN} += "taglib alsa-lib curl"
> @@ -29,16 +29,40 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
>                          -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
>                          "
>  
> -FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \ 
> -               ${libdir}/qmmp/PlaylistFormats/*.so \
> -               ${libdir}/qmmp/Output/libalsa.so \
> -               ${libdir}/qmmp/Transports/libhttp.so \
> -               ${libdir}/qmmp/Visual/libanalyzer.so \
> +FILES_${PN} = "${bindir}/qmmp ${libdir}/*${SOLIBS} \ 
> +               ${libdir}/qmmp/PlaylistFormats/*${SOLIBS} \
> +               ${libdir}/qmmp/Output/libalsa${SOLIBS} \
> +               ${libdir}/qmmp/Transports/libhttp${SOLIBS} \
> +               ${libdir}/qmmp/Visual/libanalyzer${SOLIBS} \
>                 ${datadir}/icons/* \
>                 ${datadir}/qmmp/images/* \
>                 ${datadir}/applications/qmmp.desktop \
>                 "
>  
> +FILES_${PN}-dev += "${libdir}/qmmp/PlaylistFormats/*${SOLIBSDEV} \
> +               ${libdir}/qmmp/Output/libalsa${SOLIBSDEV} \
> +               ${libdir}/qmmp/Transports/libhttp${SOLIBSDEV} \
> +               ${libdir}/qmmp/Visual/libanalyzer${SOLIBSDEV} \
> +               "
> +
> +FILES_${PN}-dbg += "${libdir}/qmmp/PlaylistFormats/.debug \
> +               ${libdir}/qmmp/Output/.debug/libalsa* \
> +               ${libdir}/qmmp/Transports/.debug/libhttp* \
> +               ${libdir}/qmmp/Visual/.debug/libanalyzer* \
> +               "
> +
> +FILES_${PN}-others-dbg = "${libdir}/qmmp/PlaylistFormats/.debug \
> +               ${libdir}/qmmp/General/.debug \
> +               ${libdir}/qmmp/Input/.debug \
> +               ${libdir}/qmmp/Output/.debug \
> +               ${libdir}/qmmp/Effect/.debug \
> +               ${libdir}/qmmp/Engines/.debug \
> +               ${libdir}/qmmp/FileDialogs/.debug \
> +               ${libdir}/qmmp/Transports/.debug \
> +               ${libdir}/qmmp/Visual/.debug \
> +               ${libdir}/qmmp/CommandLineOptions/.debug \
> +               "

What is FILES_${PN}-others-dbg? Shouldn't these be in the -dbg package?
Is this package listed in PACKAGES?

Cheers,

Richard




^ permalink raw reply

* Re: [PATCH] mesa-dri: use DRIDRIVERS_append_arch to promote right usage for BSP layer maintainers
From: Richard Purdie @ 2011-10-17 12:28 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1318853908-5984-1-git-send-email-Martin.Jansa@gmail.com>

On Mon, 2011-10-17 at 14:18 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-graphics/mesa/mesa-dri.inc |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard




^ permalink raw reply

* Re: [PATCH 1/2] xserver-xorg: remove glx-use-tls again
From: Richard Purdie @ 2011-10-17 12:25 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1318674260-8320-1-git-send-email-Martin.Jansa@gmail.com>

On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> * khem confirmed that uclibc does support it now
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-graphics/mesa/glx-use-tls.inc         |    7 -------
>  .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    3 +--
>  2 files changed, 1 insertions(+), 9 deletions(-)
>  delete mode 100644 meta/recipes-graphics/mesa/glx-use-tls.inc

Merged to master, thanks.

Richard




^ permalink raw reply

* [PATCH] mesa-dri: use DRIDRIVERS_append_arch to promote right usage for BSP layer maintainers
From: Martin Jansa @ 2011-10-17 12:18 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <1318849592.21775.0.camel@ted>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/mesa/mesa-dri.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 795144a..fcce259 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -5,8 +5,8 @@ LIB_DEPS += "libdrm expat"
 DEFAULT_PREFERENCE = "-1"
 
 DRIDRIVERS = "swrast"
-DRIDRIVERS_x86 = "swrast,i915,i965"
-DRIDRIVERS_x86-64 = "swrast,i915,i965"
+DRIDRIVERS_append_x86 = ",i915,i965"
+DRIDRIVERS_append_x86-64 = ",i915,i965"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
 
-- 
1.7.7




^ permalink raw reply related

* Re: [RFC] Preventing race when compiling external kernel modules
From: Anders Darander @ 2011-10-17 11:54 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <1318592560.942.3.camel@ted>

* Richard Purdie <richard.purdie@linuxfoundation.org> [111014 13:43]:
> On Fri, 2011-10-14 at 12:47 +0200, Anders Darander wrote:
> > * Anders Darander <anders@chargestorm.se> [111014 09:55]:
> > > In our local tree, I've circumvented this race by applying a patch like
> > > [3]. (Well, we could likely have put the lock in do_make_scripts()
> > > instead of module_do_compile(), as we have done currently). Obviously,
> > > I'm not proposing to apply this patch, as it depends on lockfile from
> > > the procmail-package (host-package).

> > Just to confirm, it seems (after a very few tests) that it indeed is
> > enough to guard the do_make_scripts() with the lock.

> > However, the question on how to make the real solution remains...

> I've not tested this but it might give you enough info to test
> something:

> (Basic idea is to promote that function to a task, then apply a lock to
> it).

Thanks!

I had an idea that it might be something like this, but I didn't really
know if I was completely off... I'll try this and see if I can come up
with something that works reliable for us. When I've got something
ready, I'll send a real patch.

Cheers,
Anders


> diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
> index 572df0d..5602e74 100644
> --- a/meta/classes/module.bbclass
> +++ b/meta/classes/module.bbclass
> @@ -14,8 +14,10 @@ do_make_scripts() {
>                    -C ${STAGING_KERNEL_DIR} scripts
>  }

> +addtask make_scripts before compile
> +do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
> +
>  module_do_compile() {
> -       do_make_scripts
>         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
>         oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
>                    KERNEL_SRC=${STAGING_KERNEL_DIR}    \

-- 
Anders Darander
ChargeStorm AB / eStorm AB



^ permalink raw reply

* Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES
From: Richard Purdie @ 2011-10-17 11:06 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <20111017095002.GG12684@jama.jama.net>

On Mon, 2011-10-17 at 11:50 +0200, Martin Jansa wrote:
> On Sat, Oct 15, 2011 at 03:40:10PM +0100, Phil Blundell wrote:
> > On Sat, 2011-10-15 at 16:34 +0200, Martin Jansa wrote:
> > > On Sat, Oct 15, 2011 at 03:30:13PM +0100, Phil Blundell wrote:
> > > > On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> > > > > * this way we can use
> > > > >   EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
> > > > >   EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
> > > > >   of other modules in other layers in stack
> > > > 
> > > > Is this really better than using "DRIMODULES_append_armv4t = ..."?  
> > > 
> > > the point is that you don't need to know who is setting swrast there for
> > > armv4t...
> > 
> > I'm not sure I understand what you're saying there.  Can you be more
> > concrete?
> > 
> > > > 
> > > > It's not really true that you can do it without any knowledge of what
> > > > other layers are doing since if you end up with two competing
> > > > EXTRA_DRIMODULES_foo overrides then one of them will get lost.
> > > > 
> > > 
> > > so EXTRA_DRIMODULES_append_armv4t should be fine, right?
> > 
> > Well, yes, but in that case it doesn't seem as though the EXTRA_ bit
> > (and this patch) buys anything.
> 
> OK, forget this patch.. I've forgot this behavior of _append_armv4t
> syntax.. and I've changed meta-openmoko to use this too.
> 
> can we change x86 and x86-64 examples in mesa-dri.inc to
> DRIDRIVERS_append_x86 = ",i915,i965"
> DRIDRIVERS_append_x86-64 = ",i915,i965"
> so it will work as example for BSP layer maintainers that thay don't
> need to care about setting
> DRIDRIVERS = "swrast"
> for their arch?

I'll take that patch...

Cheers,

Richard




^ permalink raw reply

* OE Changelog for 2011-10-10 to 2011-10-17
From: cliff.brake @ 2011-10-17 10:29 UTC (permalink / raw)
  To: openembedded-core, openembedded-devel, angstrom-distro-devel

Changelog for 2011-10-10 to 2011-10-17.  Projects included in this report:

bitbake: git://git.openembedded.org/bitbake
openembedded-core: git://git.openembedded.org/openembedded-core
meta-openembedded: git://git.openembedded.org/meta-openembedded
meta-angstrom: git://git.angstrom-distribution.org/meta-angstrom
meta-yocto: git://git.yoctoproject.org/poky
meta-texasinstruments: git://git.angstrom-distribution.org/meta-texasinstruments
meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git
meta-micro: git://git.openembedded.org/meta-micro
meta-slugos: git://github.com/kraj/meta-slugos
meta-nslu2: git://github.com/kraj/meta-nslu2
meta-intel: git://git.yoctoproject.org/meta-intel
meta-handheld: git://git.openembedded.org/meta-handheld
meta-opie: git://git.openembedded.org/meta-opie
openembedded: git://git.openembedded.org/openembedded

====================================================
Changelog for bitbake:

====================================================
Changelog for openembedded-core:

Bruce Ashfield (1):
  linux-yocto: config cleanup and streamlining

Christopher Larson (2):
  autoconf: no need to hardcode the full path to m4
  autotools: fix multi-word arguments for EXTRA_OECONF

Khem Raj (4):
  farsight2, ldconfig-native, gnutls: There is no GPLv2.1, correct the fields
  qemu-0.15: Add recipe and forward port patches from 0.14
  glib-2.0: Extend to provide nativesdk recipe
  qemu.inc: Add glib-2.0-nativesdk to qemu-nativesdk DEPENDS

Klaus Kurzmann (1):
  eglibc-2.14: add patch to fix libdl crash

Koen Kooi (4):
  util-linux 2.19.1: split blkid out into its own subpackage
  git: update to 1.7.7
  linux-firmware: update, merge in OE classic updates, fix packaging
  alsa-utils 0.10.24.2: fix systemd units when there's no asound.state

Martin Jansa (48):
  xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
  xserver-xorg: remove old git recipe
  glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn'
  xserver-xorg-common: fix LIC_FILES_CHKSUM
  xserver-xorg-common: move SRC_URI closer together
  xserver-xorg-common: Split out some bigger modules and extensions from the m
  xserver-xorg-common: improve packaging
  xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.i
  xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config dependen
  xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .in
  xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ${b
  xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which
  xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
  xserver-xorg: add new version 1.11.1
  xserver-xorg: remove old 1.10.1 version
  xserver-xorg: remove COMPATIBLE_HOST
  xserver-xorg: drop unused files
  xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same dire
  xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2
  xorg-driver-common.inc: use virtual/xserver instead of older virtual/xserver
  xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new xserver-xo
  libx11: package xcb, merge few changes from meta-oe
  libx11: add new version 1.4.4
  libx11: remove older 1.3.4
  libx11: drop old 1.2.2 git version
  libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3
  libx11-diet: move old patches used only by libx11-diet-1.3 to separate direc
  python-argparse: import from meta-oe, needed for newer glib
  xf86-video-intel_2.16.0: fix buildfix.patch to apply
  glib: upgrade to 2.30.0
  gtk+: upgrade to 2.24.6
  xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
  xserver-xorg: move PE to xserver-xorg-common and bump it
  xorg-driver-common: bump PE for upgrade path for meta-oe users
  mesa-dri-glsl-native: fix LICENSE
  mesa: move common patches which could be used in both mesa-dri and mesa-xlib
  mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions
  mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR
  mesa-7.11: move shared DEPENDS, SRC_URI, checksums and do_configure_prepend 
  mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
  mesa-xlib: move shared options to .inc
  mesa-dri: move shared options to mesa-dri.inc
  mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging each lib
  mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add mesa-x
  mesa-git: lower D_P a bit more then all mesa-dri
  mesa-git: upgrade from 7.7+git to 7.11+git
  mesa-git: fix LIC_FILES_CHKSUM
  nfs-utils: separate nfs-utils-client and nfs-utils-stats

Noor Ahsan (1):
  bluez4: Add ending quote of FILES_${PN}-dbg

Otavio Salvador (4):
  image-live.bbclass: allow override of initrd image
  initramfs-live-boot: make it more generic and easy to use
  qt4: use 4.7.4 as default preference
  distro_tracking_fields.inc: update qt4 related entries

Richard Purdie (24):
  local.conf.sample: Fix typos and default to no patch resolver
  shared-mime-info: Fix a parallel make race
  eglibc: Drop 2.12
  gcc: Drop old version 4.5.1
  gnome-vfs: This is now unused in OE-Core and deprecated, drop
  qt4: Drop old version 4.7.3
  hal/hal-info: This is unsed in OE-Core and deprecated, drop
  mesa: Update 7.8.2 -> 7.11
  xf86-video-intel: Update 2.15.0 -> 2.16.0
  autotools: Enhance gettext handling to better work with SCM versions of code
  flac: Add missing gettext dependency (requires iconv)
  atk: Upgrade 1.32.0 -> 2.2.0
  Import python-setuptools from meta-oe (for glib-2.0)
  eds: Update to work with glib-2.0
  libunique: Update to work with glib-2.0
  pango: Update to work with glib-2.0
  gamin: Fix glib 2.30 deprecation issues
  clutter: Update git recipe to more recent version
  clutter-1.6: update to 1.6.18
  cogl: Add git recipe (required by clutter)
  bitbake.conf Exclude MACHINE from MACHINEOVERRIDE variable dependencies
  bitbake.conf: Use TRANSLATED_TARGET_ARCH in OVERRIDES since any variable wit
  arch-ia32: Add a generic x86 override (instead of i{3|4|5|6}86 and so on)
  mesa-dri: Enable swrast only by default and intel drivers only on IA platfor

Samuel Stirtzel (2):
  patch.py: fixed message domain errors
  data.py: fixed message domain errors

Saul Wold (11):
  shadow-native: Bump PR for patch update
  distro_tracking_fields: Updates
  v86d: update to 0.1.10
  libaio: Update to 0.3.109
  libtiff: Update to 3.9.5
  augeas: Update to 0.9.0
  libgcrypt: Update to 1.5.0
  rxvt-unicode: Update to 9.12
  rsync: Update to 3.0.9
  bash: update to 4.2
  qemu.inc: qemu-native also needs glib-2.0 native

Tom Rini (1):
  libnl2: Fix a race on route/pktloc_syntax.h

Wenzong Fan (1):
  qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.

Xiaofeng Yan (1):
  distro_tracking_fields.inc: Add maintainer for some packages without maintai

Zhai Edwin (2):
  libfm: Upgrade to 0.1.16
  pcmanfm: Upgrade to 0.9.9

====================================================
Changelog for meta-openembedded:

Andreas Müller (2):
  nautilus: fix compile errors by removing G_DISABLE_DEPRECATED
  nautilus: cleanup package directories

Denis 'GNUtoo' Carikli (1):
  xserver-common 1.34: Add Nexus S support

Denys Dmytriyenko (1):
  ltp-ddt: import initial version 0.0.4 plus fixes

GNUtoo (1):
  xserver-common 1.34: Add Nexus One support

Khem Raj (1):
  binutils-cross: Sync with oe-core

Koen Kooi (19):
  binutils 2.20.1: add -Werror hack to get the target version to build
  task-sdk-target: initial add - meant to be what task-sdk-native is in OE cla
  cloud9: add systemd unit
  libmikmod 3.1.12: import from OE classic
  libsdl-mixer 1.2.11: import from OE classic
  guile: fix licensing and gettext inherit
  pixman 0.23.6: add initial version with NEON bilinear patches
  cloud9 0.5.1: fix do_install
  systemd: update to v37
  systemd-speed-hacks: remove some (re)mount tasks that aren't needed yet in O
  gnome-vfs 2.24.4: import from OE-core
  contrib: import pw-am.sh and oe-stylize from OE classic
  task-basic: include util-linux-(u)mount, the busybox ones are broken, broken
  xfwm4: update to 4.8.2
  xfce4-settings 4.8.2: change default icon theme to 'gnome'
  libdivecomputer: initial add
  subsurface: inital add
  systemd-speed-hacks: disable remountfs removal, images ship util-linux-mount
  README: add top level readme, update meta-oe one

Martin Jansa (30):
  xserver-xorg: drop 1.10.2 and use xserver-xf86-lite-1.11.0 from oe-core inst
  libx11: drop here, 1.4.4 should be in oe-core
  recipes: use allarch instead of PACKAGE_ARCH = all
  pango: upgrade to 1.29.4
  poppler-data: upgrade from 0.4.0 to 0.4.5
  poppler: upgrade from 0.12.3 to 0.18.0
  python-cython: upgrade to 0.15.1 because 0.13 doesn't work with python-2.7.2
  python-cython: add patch to fix build error with some distutils packages
  pidgin: package purple-2/libymsg.so to libpurple-dev
  e-base: bump EFL_SRCREV
  e-wm: include /usr/lib/enlightenment/modules/wizard/favorites/.order in FILE
  e-wm-theme-illume-efenniht, exquisite-theme-illume, elementary-theme-efennih
  elementary: fir order of PACKAGES
  epdf: fix build with poppler >= 0.16
  elementary, ethumb, libeflvala: bump PR to rebuild against newer poppler
  python-efl: use INC_PR
  elfe: bump PR to rebuild against newer poppler
  eeze: add eeze_scanner also to -dbg package
  python-argparse: drop from meta-oe, moved to oe-core with glib
  glib-2.0: drop 2.29.3+git from meta-oe, there should be 2.30.0 in oe-core
  gdbus-binding-tool: drop from meta-oe, superseeded by glib-2.30.0 where it's
  e-wm-theme-illume-efenniht, elementary-theme-efenniht: break long DESCRIPTIO
  xorg-lib: use .inc file from oe-core
  glx-use-tls: moved to oe-core with mesa recipes
  mesa-common: use glx-use-tls.inc from oe-core instead of bbclass
  mesa: drop, there should be mesa-7.11 in oe-core
  atk: rename .bbappend to apply to newer version
  tiff: rename .bbappend to apply to new 3.9.5 version
  libgcrypt: rename .bbappend to apply to new 1.5.0 version
  nfs-utils: drop 1.1.2 from meta-oe there is 1.2.3 in oe-core

Otavio Salvador (1):
  xserver-nodm-init: exit 1 only if systemd is installed and use ${base_bindir

Simon Busch (1):
  meta-oe: xf86-input-mtev: add intial recipe for a multitouch input driver

====================================================
Changelog for meta-angstrom:

Denys Dmytriyenko (2):
  angstrom.inc: don't hard-depend on meta-efl layer
  preferred-versions: update glib-2.0 to 2.30.0 to match oe-core

Koen Kooi (12):
  angstrom core tweaks: fix task-sdk-target build
  systemd-image: add systemd-speed-hacks
  hardware-bringup-image: add systemd-speed-hacks
  anstrom: move to pango 1.28.4
  angstrom: move up to pango 1.29.4, it works a lot better than 1.28.x
  angstrom: use custom fs-perms.txt that doesn't destroy our /var setup
  base-files: bump PR to flush out stale packages generated by fs-perms.txt ex
  angstrom gdm xfce hack: hack to make xfce the default session, the gnome one
  tweaks: move over to recipes-tweaks
  README: encourage use of github mirror for pull requests
  images: move to recipes-images subdir
  xfce-nm-image: add back autologin hack

====================================================
Changelog for meta-yocto:

Bruce Ashfield (1):
  linux-yocto: config cleanup and streamlining

Christopher Larson (2):
  autoconf: no need to hardcode the full path to m4
  autotools: fix multi-word arguments for EXTRA_OECONF

Khem Raj (4):
  farsight2, ldconfig-native, gnutls: There is no GPLv2.1, correct the fields
  qemu-0.15: Add recipe and forward port patches from 0.14
  glib-2.0: Extend to provide nativesdk recipe
  qemu.inc: Add glib-2.0-nativesdk to qemu-nativesdk DEPENDS

Klaus Kurzmann (1):
  eglibc-2.14: add patch to fix libdl crash

Koen Kooi (4):
  util-linux 2.19.1: split blkid out into its own subpackage
  git: update to 1.7.7
  linux-firmware: update, merge in OE classic updates, fix packaging
  alsa-utils 0.10.24.2: fix systemd units when there's no asound.state

Martin Jansa (49):
  atk: add missing SOB line to remove.G_CONST_RETURN.patch
  xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
  xserver-xorg: remove old git recipe
  glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn'
  xserver-xorg-common: fix LIC_FILES_CHKSUM
  xserver-xorg-common: move SRC_URI closer together
  xserver-xorg-common: Split out some bigger modules and extensions from the m
  xserver-xorg-common: improve packaging
  xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.i
  xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config dependen
  xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .in
  xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ${b
  xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which
  xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
  xserver-xorg: add new version 1.11.1
  xserver-xorg: remove old 1.10.1 version
  xserver-xorg: remove COMPATIBLE_HOST
  xserver-xorg: drop unused files
  xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same dire
  xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2
  xorg-driver-common.inc: use virtual/xserver instead of older virtual/xserver
  xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new xserver-xo
  libx11: package xcb, merge few changes from meta-oe
  libx11: add new version 1.4.4
  libx11: remove older 1.3.4
  libx11: drop old 1.2.2 git version
  libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3
  libx11-diet: move old patches used only by libx11-diet-1.3 to separate direc
  python-argparse: import from meta-oe, needed for newer glib
  xf86-video-intel_2.16.0: fix buildfix.patch to apply
  glib: upgrade to 2.30.0
  gtk+: upgrade to 2.24.6
  xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
  xserver-xorg: move PE to xserver-xorg-common and bump it
  xorg-driver-common: bump PE for upgrade path for meta-oe users
  mesa-dri-glsl-native: fix LICENSE
  mesa: move common patches which could be used in both mesa-dri and mesa-xlib
  mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions
  mesa-common: MesaDemos is now separate recipes, bump PE, introduce INC_PR
  mesa-7.11: move shared DEPENDS, SRC_URI, checksums and do_configure_prepend 
  mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
  mesa-xlib: move shared options to .inc
  mesa-dri: move shared options to mesa-dri.inc
  mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging each lib
  mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add mesa-x
  mesa-git: lower D_P a bit more then all mesa-dri
  mesa-git: upgrade from 7.7+git to 7.11+git
  mesa-git: fix LIC_FILES_CHKSUM
  nfs-utils: separate nfs-utils-client and nfs-utils-stats

Noor Ahsan (1):
  bluez4: Add ending quote of FILES_${PN}-dbg

Otavio Salvador (4):
  image-live.bbclass: allow override of initrd image
  initramfs-live-boot: make it more generic and easy to use
  qt4: use 4.7.4 as default preference
  distro_tracking_fields.inc: update qt4 related entries

Richard Purdie (26):
  shared-mime-info: Fix a parallel make race
  eglibc: Drop 2.12
  gcc: Drop old version 4.5.1
  gnome-vfs: This is now unused in OE-Core and deprecated, drop
  qt4: Drop old version 4.7.3
  hal/hal-info: This is unsed in OE-Core and deprecated, drop
  mesa: Update 7.8.2 -> 7.11
  xf86-video-intel: Update 2.15.0 -> 2.16.0
  meta-yocto: Catch up with xserver and mesa upgrades/rename
  autotools: Enhance gettext handling to better work with SCM versions of code
  flac: Add missing gettext dependency (requires iconv)
  atk: Upgrade 1.32.0 -> 2.2.0
  Import python-setuptools from meta-oe (for glib-2.0)
  eds: Update to work with glib-2.0
  libunique: Update to work with glib-2.0
  pango: Update to work with glib-2.0
  gamin: Fix glib 2.30 deprecation issues
  clutter: Update git recipe to more recent version
  clutter-1.6: update to 1.6.18
  cogl: Add git recipe (required by clutter)
  clutter: Update bbappend after oe-core upgrade
  bitbake.conf Exclude MACHINE from MACHINEOVERRIDE variable dependencies
  meta-yocto: Sync with mesa/xserver changes and fix machines
  bitbake.conf: Use TRANSLATED_TARGET_ARCH in OVERRIDES since any variable wit
  arch-ia32: Add a generic x86 override (instead of i{3|4|5|6}86 and so on)
  mesa-dri: Enable swrast only by default and intel drivers only on IA platfor

Robert Yang (1):
  Fix typos in local.conf.sample and local.conf.sample.extended

Samuel Stirtzel (2):
  patch.py: fixed message domain errors
  data.py: fixed message domain errors

Saul Wold (11):
  shadow-native: Bump PR for patch update
  distro_tracking_fields: Updates
  v86d: update to 0.1.10
  libaio: Update to 0.3.109
  libtiff: Update to 3.9.5
  augeas: Update to 0.9.0
  libgcrypt: Update to 1.5.0
  rxvt-unicode: Update to 9.12
  rsync: Update to 3.0.9
  bash: update to 4.2
  qemu.inc: qemu-native also needs glib-2.0 native

Scott Rifenbark (4):
  documentation/dev-manual: Fixed five broken links and removed note
  documentation: Cleaned out bad links and replaced with good
  documentation/adt-manual/adt-eclipse.xml: fixed indigo typos
  documentation/adt-manual/adt-eclipse.xml: Added missing section for plug-in

Tom Rini (1):
  libnl2: Fix a race on route/pktloc_syntax.h

Wenzong Fan (1):
  qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.

Xiaofeng Yan (1):
  distro_tracking_fields.inc: Add maintainer for some packages without maintai

Zhai Edwin (2):
  libfm: Upgrade to 0.1.16
  pcmanfm: Upgrade to 0.9.9

====================================================
Changelog for meta-texasinstruments:

Joel A Fernandes (3):
  ti-hw-bringup-image: Add kernel-modules package
  beaglebone-tester: A component-based test framework for BeagleBone
  linux-am335x-joel: Enable g_file_storage kernel module

Koen Kooi (21):
  linux-am335x-joel 3.1rc: disable debug options like lockdep, switch to thumb
  u-boot 2011.09: switch to proper 2011.09 tag and add support for TCT beaconb
  u-boot 2011.09: add support for loop-through expansion boards on beagle and 
  linux 3.0: add support for loopthrough expansion boards like the uLCD-lite
  Matrix 2.0: initial add
  matrix 2.0: first round of fixes
  cloud9-image: add
  u-boot 2011.10rc: update to latest Joel, rebase Jasons patches
  cloud9-image: add vim and procps
  ti-hw-bringup-image: add systemd-speed-hacks
  sdcard_image bblass: all machines load from ext2/ext3 now, remove uImage cop
  u-boot 2010rc: switch to Toms latest branch, rediff env patches
  u-boot 2011.10rc: raise bootdelay to 1 for the time being
  task-ti-test: clean up machine specific bits, inherit allarch
  ti-hw-bringup-image: switch to task-ti-test
  matrix: merge changes from arago/next/fa8563ae1238c38c779226ebed375c61560c64
  cloud9-image: add beaglebone-tester app
  sdcard_image bbclass: move back to 2GB images, clarify LOOPDEV* usage
  sdcard_image bbclass: default to 4GiB, but use 2GiB for beaglebone
  u-boot: switch beagleboard and beaglebone to RO rootfs at boot
  linux-am335x-joel 3.1: lower gadget power budget, enable usb-test and uas

====================================================
Changelog for meta-smartphone:

Denis 'GNUtoo' Carikli (13):
  meta-shr: emtooth2: add LIC_FILES_CHKSUM and bump SRCREV
  meta-samsung: linux-samsung-crespo: update defconfig and cleanup recipe
  meta-htc: linux-nexusone: add defconfig
  meta-openmoko: linux-2.6.39: make bluetooth work for om-gta02
  meta-openmoko: om-gta02: fix bluetooth modules autoload
  meta-htc: add nexusone xorg.conf and bump PRINC
  meta-htc: linux-nexusone: add a ${KERNEL_IMAGE_SYMLINK_NAME}.fastboot symlin
  meta-htc: nexusone.conf: add alsa and wifi to MACHINE_EXTRA_RRECOMMENDS and 
  meta-htc: linux-leviathan: cleanup,add defconfig and move to linux-htcdream
  meta-smartphone: fsotdld: build the gpsd plugin
  meta-samsung: xf86-input-mtev_git.bbappend: make it MACHINE_ARCH for crespo
  meta-samsung: linux-samsung-crespo: bump SRCREV
  meta-samsung: linux-samsung-crespo: bump SRCREV

Martin Jansa (10):
  SHR: potential fix for multimachine builds rebuilding from scratch after eve
  meta-openmoko: mesa-dri: add glamo support
  meta-openmoko: linux-2.6.39: apply patch for setting DAI mode while pcm is a
  meta-openmoko: om-gta02: drop MACHINE_DRI_MODULES
  libdrm, mesa-dri: add glamo support for whole armv4t
  mesa-dri: move , to end of EXTRA_DRIDRIVERS
  mesa-dri: use DRIDRIVERS_append_armv4t
  meta-fso: fix licensing information for some recipes
  omhacks: bump SRCREV, fix help2man and licensing info
  meta-shr: themes: fix licensing info

Simon Busch (22):
  meta-fso: cornucopia: bump SRCREV
  meta-aurora: aurora-base: bump SRCREV
  meta-samsung: libsamsung-ipc: bump SRCREV
  meta-fso: msmcomm: bump SRCREV
  meta-fso: android-image-utils-native: bump SRCREV
  meta-fso: libsamsung-ipc: moved from meta-samsung in this place
  fsogsmd: package samsung modem plugins and bump PR
  meta-fso: android-image-utils-native: bump SRCREV
  meta-palm: linux-hpveer: port recipe from oe-dev
  meta-smasung: base-files: add additional mount directory and fstab file
  meta-samsung: crespo: add 200 megabyte of extra space in our images
  meta-fso: fsogsmd: fix names of packages for lowlevel-samsung-crespo plugin
  meta-fso: fsogsmd: add libfsotransport as dependency
  meta-palm: add machine description for hpveer
  meta-fso: cornucopia: bump SRCREV
  meta-samsung: crespo: add kernel-module-bcm4329 as extra runtime dependency
  meta-fso: fso-autorev.inc: add libsamsung-ipc
  meta-fso: libsamsung-ipc: bump SRCREV
  meta-fso: cornucopia: bump SRCREV
  meta-shr: libphone-ui: bump SRCREV to fix some unused variable compilation e
  meta-samsung: chroot-script: add little script to chroot into another rootfs
  meta-samsung: chroot-image: add chroot initramfs image for booting into anot

====================================================
Changelog for meta-micro:

====================================================
Changelog for meta-slugos:

Khem Raj (2):
  busybox: Move 1.18.4 -> 1.18.5
  slugos.conf: Change pinned version of binutils and eglibc

====================================================
Changelog for meta-nslu2:

====================================================
Changelog for meta-intel:

Eric Bénard (1):
  meta-emenlow: update qt4 to 4.7.4

Tom Zanussi (23):
  meta-emenlow: restore /usr/lib/dri for xpsb-glx
  meta-emenlow: upgrade clutter .bbappend
  meta-intel: /common xserver-xorg name change
  meta-sugarbay: xserver-xorg rename
  meta-sugarbay: remove meta-intel/common from BBFILES
  meta-crownbay: xserver-xorg renaming updates
  meta-fishriver: xserver-xorg renaming updates
  meta-fri2: xserver-xorg renaming updates
  meta-jasperforest: remove meta-intel/common from BBFILES
  meta-jasperforest: xserver-xorg renaming updates
  meta-jasperforest: remove obsolete xserver-xf86-dri-lite .bbappend
  meta-n450: xserver-xorg renaming updates
  meta-emenlow: update xserver-psb with xorg name change
  meta-emenlow: xserver-xorg renaming updates
  meta-intel: update SRCREVs
  crownbay-noemgd: set boot vga mode
  crownbay: set boot vga mode
  emenlow: set boot vga mode
  jasperforest: set boot vga mode
  fishriver: set boot vga mode
  meta-fishriver: add missing SMP/SCHED_SMT support
  fri2: set boot vga mode
  fri2-noemgd: set boot vga mode

====================================================
Changelog for meta-handheld:

Martin Jansa (2):
  xserver-xf86-config: add bbappend and spitz xorg.conf
  linux: bump SRCREV for 3.1.0-rc9 and use repo on kernel.org again

====================================================
Changelog for meta-opie:

====================================================
Changelog for openembedded:

Marco Cavallini (3):
  kaeilos.conf: added java support
  kaeilos-2010.conf: marked as obsolete
  python-numpy: copied missing files from arm directory

Paul Menzel (1):
  lightmediascanner: Add version 0.4.4





^ permalink raw reply

* Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES
From: Martin Jansa @ 2011-10-17  9:50 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1318689610.3158.8.camel@lenovo.internal.reciva.com>

[-- Attachment #1: Type: text/plain, Size: 1659 bytes --]

On Sat, Oct 15, 2011 at 03:40:10PM +0100, Phil Blundell wrote:
> On Sat, 2011-10-15 at 16:34 +0200, Martin Jansa wrote:
> > On Sat, Oct 15, 2011 at 03:30:13PM +0100, Phil Blundell wrote:
> > > On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> > > > * this way we can use
> > > >   EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
> > > >   EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
> > > >   of other modules in other layers in stack
> > > 
> > > Is this really better than using "DRIMODULES_append_armv4t = ..."?  
> > 
> > the point is that you don't need to know who is setting swrast there for
> > armv4t...
> 
> I'm not sure I understand what you're saying there.  Can you be more
> concrete?
> 
> > > 
> > > It's not really true that you can do it without any knowledge of what
> > > other layers are doing since if you end up with two competing
> > > EXTRA_DRIMODULES_foo overrides then one of them will get lost.
> > > 
> > 
> > so EXTRA_DRIMODULES_append_armv4t should be fine, right?
> 
> Well, yes, but in that case it doesn't seem as though the EXTRA_ bit
> (and this patch) buys anything.

OK, forget this patch.. I've forgot this behavior of _append_armv4t
syntax.. and I've changed meta-openmoko to use this too.

can we change x86 and x86-64 examples in mesa-dri.inc to
DRIDRIVERS_append_x86 = ",i915,i965"
DRIDRIVERS_append_x86-64 = ",i915,i965"
so it will work as example for BSP layer maintainers that thay don't
need to care about setting
DRIDRIVERS = "swrast"
for their arch?

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply

* [PATCH 1/1] lsb: Change link of ${baselib} to lib64 for 64bits system
From: Xiaofeng Yan @ 2011-10-17  9:24 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318843077.git.xiaofeng.yan@windriver.com>

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Correct two faults:

1 Binaries of lsb test suite need ld-linux.so* in /lib64.
for example:
Target$ ./lsbcmdchk
-sh: ./lsbcmdchk: No such file or directory
Target$ strings lsbcmdchk | grep "ld-"
/lib64/ld-lsb-x86-64.so.3

"lsbcmdchk" from lsb test suite is a binary program.
A new modification to lsb_1.4.bb caused that binaries from lsb test suite can't run
because binaries of lsb test suite need ld-linux.so* in /lib64.
But the link is changed due to adding multilib. I changed this link again.

2 correct mandir
Waring will appear when running task task do_populate_sysroot

NOTE: package lsb-1.4-r2: task do_populate_sysroot: Succeeded
WARNING: For recipe lsb, the following files were installed but not shipped in any package:
WARNING:   /{datadir}/man/man1/lsb_release.1.gz

I changed mandir=${D}/man to mandir=${D}/${datadir}/man

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-extended/lsb/lsb_1.4.bb |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index d472012..7cecdf2 100644
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "LSB support for Poky Linux"
 SECTION = "console/utils"
 HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
 LICENSE = "GPLv2+"
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
 
@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fd
 S = ${WORKDIR}/lsb-release-${PV}
 
 do_install(){
-	oe_runmake install prefix=${D}  mandir=${D}/man/ DESTDIR=${D} 
+	oe_runmake install prefix=${D}  mandir=${D}/${datadir}/man/ DESTDIR=${D} 
 	mkdir -p ${D}/bin
 	mkdir -p ${D}/${baselib}
 	mkdir -p ${D}/etc/lsb-release.d
@@ -69,7 +69,9 @@ do_install_append(){
        install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
        if [ "${TARGET_ARCH}" == "x86_64" ];then
 	       cd ${D}
-	       ln -sf ${baselib} lib
+               if [ "${baselib}" != "lib64" ]; then
+                   ln -sf ${baselib} lib64
+               fi
 	       cd ${D}/${baselib}
                ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
                ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
@@ -82,7 +84,9 @@ do_install_append(){
  
        if [ "${TARGET_ARCH}" == "powerpc64" ];then
   	       cd ${D}
-	       ln -sf ${baselib} lib
+               if [ "${baselib}" != "lib64" ]; then
+                   ln -sf ${baselib} lib64
+               fi
                cd ${D}/${baselib}
                ln -sf ld64.so.1 ld-lsb-ppc64.so.2
                ln -sf ld64.so.1 ld-lsb-ppc64.so.3
-- 
1.7.0.4




^ permalink raw reply related

* [OC-core][PATCH 0/1] lsb: Change link of ${baselib} to lib64 for 64bits system
From: Xiaofeng Yan @ 2011-10-17  9:24 UTC (permalink / raw)
  To: openembedded-core

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Hi Richard,

I modified my submitting according to your suggestion.
Change ln -sf ${baselib} lib64 to 
if [ "${baselib}" != "lib64" ]; then
	ln -sf ${baselib} lib64
fi

and correct a warning item caused by mandir. 

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/lsb64
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/lsb64

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  lsb: Change link of ${baselib} to lib64 for 64bits system

 meta/recipes-extended/lsb/lsb_1.4.bb |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)




^ permalink raw reply

* [v2 -CONSOLIDATED PULL 14/14] screen: Add patch to fix parallel make install
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../screen/screen-4.0.3/fix-parallel-make.patch    |   19 +++++++++++++++++++
 meta/recipes-extended/screen/screen_4.0.3.bb       |    3 ++-
 2 files changed, 21 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch

diff --git a/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch b/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
new file mode 100644
index 0000000..e0caf5d
--- /dev/null
+++ b/meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
@@ -0,0 +1,19 @@
+This fixes the parallel make install failure
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: screen-4.0.3/Makefile.in
+===================================================================
+--- screen-4.0.3.orig/Makefile.in
++++ screen-4.0.3/Makefile.in
+@@ -70,7 +70,7 @@ screen: $(OFILES)
+ .c.o:
+ 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
+ 
+-install_bin: .version screen
++install_bin: .version screen installdirs
+ 	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+ 		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
+ 	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb
index 27f39dd..a875a35 100644
--- a/meta/recipes-extended/screen/screen_4.0.3.bb
+++ b/meta/recipes-extended/screen/screen_4.0.3.bb
@@ -12,11 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0774d66808b0f602e94448108f59448b \
 SECTION = "console/utils"
 DEPENDS = "ncurses \
           ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \
            ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-11+lenny1.diff.gz;name=patch \
            file://configure.patch \
+           file://fix-parallel-make.patch \
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
 
 PAM_SRC_URI = "file://screen.pam"
-- 
1.7.6.2




^ permalink raw reply related

* [v2 -CONSOLIDATED PULL 11/14] Distro Tracking: Fix dates
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index eeac5d2..abc2cbf 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3447,32 +3447,32 @@ DISTRO_PN_ALIAS_pn-imake = "Mandriva=xutils Ubuntu=xutils"
 RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
 RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.4"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/09/01"
-RECIPE_LAST_UPDATE_pn-qt4-tools-native = "September 10, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-qt4-tools-native = "Sep 10, 2011"
 RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton <paul.eggleton@linux.intel.com>"
 DISTRO_PN_ALIAS_pn-qt4-tools-native = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
 
 RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
 RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.4"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/09/01"
-RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "September 10, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "Sep 10, 2011"
 RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <paul.eggleton@linux.intel.com>"
 DISTRO_PN_ALIAS_pn-qt4-tools-nativesdk = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
 
 RECIPE_STATUS_pn-qt4-embedded = "green"
 RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.4"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/09/01"
-RECIPE_LAST_UPDATE_pn-qt4-embedded = "September 10, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-qt4-embedded = "Sep 10, 2011"
 RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <paul.eggleton@linux.intel.com>"
 DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT"
 
 RECIPE_STATUS_pn-qt4-x11-free = "green"
 RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.4"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/09/01"
-RECIPE_LAST_UPDATE_pn-qt4-x11-free = "September 10, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "Sep 01, 2011"
+RECIPE_LAST_UPDATE_pn-qt4-x11-free = "Sep 10, 2011"
 RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton <paul.eggleton@linux.intel.com"
 DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"
 
-- 
1.7.6.2




^ permalink raw reply related

* [v2 -CONSOLIDATED PULL 13/14] mktemp: Add patch to fix parallel make install
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../mktemp/files/fix-parallel-make.patch           |   23 ++++++++++++++++++++
 meta/recipes-extended/mktemp/mktemp_1.7.bb         |    3 +-
 2 files changed, 25 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-extended/mktemp/files/fix-parallel-make.patch

diff --git a/meta/recipes-extended/mktemp/files/fix-parallel-make.patch b/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
new file mode 100644
index 0000000..8c693cc
--- /dev/null
+++ b/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
@@ -0,0 +1,23 @@
+This fixes the parallel make install failure
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: mktemp-1.7/Makefile.in
+===================================================================
+--- mktemp-1.7.orig/Makefile.in
++++ mktemp-1.7/Makefile.in
+@@ -94,10 +94,10 @@ install-dirs:
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \
+ 	    $(DESTDIR)$(mandir)/man1
+ 
+-install-binaries: $(PROG)
++install-binaries: install-dirs $(PROG)
+ 	$(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG)
+ 
+-install-man:
++install-man: install-dirs
+ 	$(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \
+ 	    $(DESTDIR)$(mandir)/man1/mktemp.1
+ 
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index d0479ce..65f542e 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -5,10 +5,11 @@ SECTION = "console/utils"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
         file://disable-strip.patch \
+        file://fix-parallel-make.patch \
         "
 
 SRC_URI[md5sum] = "787bbed9fa2ee8e7645733c0e8e65172"
-- 
1.7.6.2




^ permalink raw reply related

* [v2 -CONSOLIDATED PULL 12/14] sysprof: remove duplicated patch
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

Apparently this pactch was duplicated by backported
patch, and needed to be applied more broaded than to
just ppc.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../sysprof/files/ppc-macro-fix.patch              |   13 -------------
 meta/recipes-kernel/sysprof/sysprof_git.bb         |    1 -
 2 files changed, 0 insertions(+), 14 deletions(-)
 delete mode 100644 meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch

diff --git a/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch b/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
deleted file mode 100644
index a2e015a..0000000
--- a/meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/collector.c
-===================================================================
---- git.orig/collector.c	2010-12-09 19:42:12.292040001 -0600
-+++ git/collector.c	2010-12-09 19:42:23.352039997 -0600
-@@ -175,7 +175,7 @@
- #define __NR_perf_counter_open 337
- #elif defined(__hppa__)
- #define __NR_perf_counter_open 318
--#elif defined(__ppc__) || defined(__ppc64__)
-+#elif defined(__powerpc__) || defined(__powerpc64__)
- #define __NR_perf_counter_open 319
- #elif defined(__s390__)
- #define __NR_perf_counter_open 331
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index c553263..bd34f00 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
 
 SRC_URI_append_arm  = " file://rmb-arm.patch"
 SRC_URI_append_mips = " file://rmb-mips.patch"
-SRC_URI_append_powerpc = " file://ppc-macro-fix.patch"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.6.2




^ permalink raw reply related

* [v2 -CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-qt/qt-apps/qmmp_0.5.1.bb |   36 +++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
index 948c32a..3f710f5 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 SECTION = "multimedia"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
 RDEPENDS_${PN} += "taglib alsa-lib curl"
@@ -29,16 +29,40 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
                         -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
                         "
 
-FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \ 
-               ${libdir}/qmmp/PlaylistFormats/*.so \
-               ${libdir}/qmmp/Output/libalsa.so \
-               ${libdir}/qmmp/Transports/libhttp.so \
-               ${libdir}/qmmp/Visual/libanalyzer.so \
+FILES_${PN} = "${bindir}/qmmp ${libdir}/*${SOLIBS} \ 
+               ${libdir}/qmmp/PlaylistFormats/*${SOLIBS} \
+               ${libdir}/qmmp/Output/libalsa${SOLIBS} \
+               ${libdir}/qmmp/Transports/libhttp${SOLIBS} \
+               ${libdir}/qmmp/Visual/libanalyzer${SOLIBS} \
                ${datadir}/icons/* \
                ${datadir}/qmmp/images/* \
                ${datadir}/applications/qmmp.desktop \
                "
 
+FILES_${PN}-dev += "${libdir}/qmmp/PlaylistFormats/*${SOLIBSDEV} \
+               ${libdir}/qmmp/Output/libalsa${SOLIBSDEV} \
+               ${libdir}/qmmp/Transports/libhttp${SOLIBSDEV} \
+               ${libdir}/qmmp/Visual/libanalyzer${SOLIBSDEV} \
+               "
+
+FILES_${PN}-dbg += "${libdir}/qmmp/PlaylistFormats/.debug \
+               ${libdir}/qmmp/Output/.debug/libalsa* \
+               ${libdir}/qmmp/Transports/.debug/libhttp* \
+               ${libdir}/qmmp/Visual/.debug/libanalyzer* \
+               "
+
+FILES_${PN}-others-dbg = "${libdir}/qmmp/PlaylistFormats/.debug \
+               ${libdir}/qmmp/General/.debug \
+               ${libdir}/qmmp/Input/.debug \
+               ${libdir}/qmmp/Output/.debug \
+               ${libdir}/qmmp/Effect/.debug \
+               ${libdir}/qmmp/Engines/.debug \
+               ${libdir}/qmmp/FileDialogs/.debug \
+               ${libdir}/qmmp/Transports/.debug \
+               ${libdir}/qmmp/Visual/.debug \
+               ${libdir}/qmmp/CommandLineOptions/.debug \
+               "
+
 PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
 
 FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
-- 
1.7.6.2




^ permalink raw reply related

* [v2 -CONSOLIDATED PULL 10/14] libomxil: Fix QA Package Errors
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
index 665601f..da3ddde 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
                     file://src/omxcore.h;beginline=1;endline=27;md5=c2e37f68ba9652ca9b2431f466944174"
 DEPENDS = "libvorbis libogg alsa-lib libmad"
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-B-${PV}.tar.gz"
 
 S = "${WORKDIR}/${BPN}-B-${PV}"
@@ -13,6 +15,9 @@ inherit autotools
 
 EXTRA_OECONF += "--disable-ffmpegcomponents"
 
-FILES_${PN} += "${libdir}/omxilcomponents/*.so*"
-FILES_${PN}-dev += "${libdir}/omxilcomponents/*.*a"
+FILES_${PN} += "${libdir}/omxilcomponents/*${SOLIBS} \
+                ${datadir}/libomxil-B"
+FILES_${PN}-staticdev += "${libdir}/omxilcomponents/*.a"
+FILES_${PN}-dev += "${libdir}/omxilcomponents/*.la \
+                    ${libdir}/omxilcomponents/*${SOLIBSDEV}"
 FILES_${PN}-dbg += "${libdir}/omxilcomponents/.debug/"
-- 
1.7.6.2




^ permalink raw reply related

* [v2 -CONSOLIDATED PULL 08/14] glib-2.0: Add nativesdk depends for libffi
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb |    3 ++-
 meta/recipes-gnome/libffi/libffi_3.0.9.bb     |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
index 8fc6c81..566355d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
@@ -1,10 +1,11 @@
 require glib.inc
 
-PR = "r1"
+PR = "r2"
 PE = "1"
 
 DEPENDS += "libffi python-argparse-native"
 DEPENDS_virtclass-native += "libffi-native python-argparse-native"
+DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk"
 
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
diff --git a/meta/recipes-gnome/libffi/libffi_3.0.9.bb b/meta/recipes-gnome/libffi/libffi_3.0.9.bb
index 0ea2284..fae1adb 100644
--- a/meta/recipes-gnome/libffi/libffi_3.0.9.bb
+++ b/meta/recipes-gnome/libffi/libffi_3.0.9.bb
@@ -7,7 +7,7 @@ library really only provides the lowest, machine dependent layer of a fully feat
 A layer must exist above `libffi' that handles type conversions for values passed between the two languages."
 SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "1f300a7a7f975d4046f51c3022fa5ff1"
 SRC_URI[sha256sum] = "589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452"
@@ -16,4 +16,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa09cb778aaba64dc9eac37ab7e4e5d8"
 inherit autotools
 
 FILES_${PN}-dev += "${libdir}/libffi-${PV}"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
-- 
1.7.6.2




^ permalink raw reply related

* [v2 -CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

From: Paul Eggleton <paul.eggleton@linux.intel.com>

If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on
bluez4, otherwise disable it.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    5 +++--
 .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
 .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2a8e74d..bb32467 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
                     file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
 DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11"
 # optional
-DEPENDS += "bluez4 udev alsa-lib glib-2.0 dbus consolekit"
+DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
+           ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
            file://gcc4-compile-fix.patch \
@@ -19,7 +20,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "\
 		--disable-lynx \
-		--enable-bluez \
+		${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
 		--disable-polkit \
 		--with-x \
 		--without-jack \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
index da2e988..3067365 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r6"
+PR = "r7"
 
 DEPENDS += "gdbm speex"
 
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 1edd913..33f5e15 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r4"
+PR = "r5"
 
 DEPENDS += "gdbm speex"
 
-- 
1.7.6.2




^ permalink raw reply related

* [v2 -CONSOLIDATED PULL 07/14] bluez4: disable hidd, pand & dund
From: Saul Wold @ 2011-10-16 20:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>

From: Paul Eggleton <paul.eggleton@linux.intel.com>

These daemons have been deprecated for some time, as their functionality
is now provided within the main bluetoothd daemon.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-connectivity/bluez/bluez4.inc     |    6 +++---
 meta/recipes-connectivity/bluez/bluez4_4.96.bb |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index 5dacd92..fc515f6 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -27,9 +27,9 @@ EXTRA_OECONF = "\
   --enable-bccmd \
   --enable-hid2hci \
   --enable-dfutool \
-  --enable-hidd \
-  --enable-pand \
-  --enable-dund \
+  --disable-hidd \
+  --disable-pand \
+  --disable-dund \
   --disable-cups \
   --enable-test \
   --enable-datafiles \
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index 420a525..52268cf 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -1,6 +1,6 @@
 require bluez4.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://bluetooth.conf"
 
-- 
1.7.6.2




^ permalink raw reply related


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox