* [PATCH 1/4] clutter-gst: update to 1.4.6
2012-01-24 23:26 [PATCH 0/4] Various updates Joshua Lock
@ 2012-01-24 23:26 ` Joshua Lock
2012-01-24 23:26 ` [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE Joshua Lock
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Joshua Lock @ 2012-01-24 23:26 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
...r-gst-1.8_1.4.4.bb => clutter-gst-1.8_1.4.6.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/clutter/{clutter-gst-1.8_1.4.4.bb => clutter-gst-1.8_1.4.6.bb} (80%)
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.4.bb b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
similarity index 80%
rename from meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.4.bb
rename to meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
index a0616c7..facb0a1 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.4.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb
@@ -13,8 +13,8 @@ SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst
S = "${WORKDIR}/clutter-gst-${PV}"
-SRC_URI[md5sum] = "c660649907785ee96f6e84d97f19d574"
-SRC_URI[sha256sum] = "23cb10e7629696a696ca8619614c517ff0a341e89a701075f2a123a2e26999e9"
+SRC_URI[md5sum] = "98aeed6baa7b3a80f10e7733080eb088"
+SRC_URI[sha256sum] = "54e2966e507563bd3f123a4e25780c2487f854c6cc3df3bedc8c6b5eb45e9769"
do_configure_prepend () {
# Disable DOLT
--
1.7.7.6
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE
2012-01-24 23:26 [PATCH 0/4] Various updates Joshua Lock
2012-01-24 23:26 ` [PATCH 1/4] clutter-gst: update to 1.4.6 Joshua Lock
@ 2012-01-24 23:26 ` Joshua Lock
2012-01-24 23:42 ` Khem Raj
2012-01-25 12:31 ` Richard Purdie
2012-01-24 23:26 ` [PATCH 3/4] cogl: update upstream status for build_for_armv4t.patch Joshua Lock
` (2 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Joshua Lock @ 2012-01-24 23:26 UTC (permalink / raw)
To: openembedded-core
As binutils is required by perf to build and is GPLv3 licensed adding
GPLv3 to INCOMPATIBLE_LICENSE will cause linux-yocto to be skipped.
Long term we should look at moving perf to a separate recipe but as a
short term solution this patch will ensure that when GPLv3 is in
INCOMPATIBLE_LICENSE perf is not built and it's dependencies are not
added to build.
Fixes [YOCTO #1880]
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/recipes-kernel/linux/linux-tools.inc | 20 ++++++++++++++++++--
meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
index aa45dba..69e68c0 100644
--- a/meta/recipes-kernel/linux/linux-tools.inc
+++ b/meta/recipes-kernel/linux/linux-tools.inc
@@ -1,5 +1,18 @@
# included by kernel recipes if they want to build/provide
# perf functionality from their tree.
+
+# perf requires binutils which is GPLv3 licensed, don't prevent the entire kernel
+# being built if GPLv3 is in INCOMPATIBLE_LICENSE
+python () {
+ d.setVar("BUILDPERF", "yes")
+ d.setVar("PERFDEPENDS", "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot")
+
+ if ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
+ # GPLv3, drop perf
+ d.setVar("BUILDPERF", "no")
+ d.setVar("PERFDEPENDS", "")
+}
+
do_compile_perf_libc-uclibc () {
:
}
@@ -7,11 +20,15 @@ do_install_perf_libc-uclibc () {
:
}
do_compile_perf() {
+ if [ "${BUILDPERF}" = "yes" ]; then
oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} NO_NEWT=1 NO_DWARF=1
+ fi
}
fakeroot do_install_perf() {
+ if [ "${BUILDPERF}" = "yes" ]; then
oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} DESTDIR=${D} install NO_NEWT=1 NO_DWARF=1
+ fi
}
@@ -22,9 +39,8 @@ addtask install_perf after do_install before do_package
do_compile_perf[umask] = 022
do_install_perf[umask] = 022
-PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot"
-PERFDEPENDS_libc-uclibc = ""
PERFRDEPENDS = "python perl elfutils"
PERFRDEPENDS_libc-uclibc = ""
do_compile_perf[depends] = "${PERFDEPENDS}"
+do_compile_perf_libc-uclibc[depends] = ""
RDEPENDS_perf += "${PERFRDEPENDS}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
index 34e563c..ce71393 100644
--- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
@@ -20,7 +20,7 @@ SRCREV_machine_qemux86-64 = "af2bfbe5f757361b5b027a24d67a93bfdfaaf33c"
SRCREV_machine = "4ae8f8605c81c39b959948e23f7123294a5dfb3f"
SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e"
-PR = "r21"
+PR = "r22"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 10859e7..9d51bd0 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86-64 ?= "3551fd0412965b1f6b0b2f6ba35f7fecdaddb58a"
SRCREV_machine ?= "6f5b11830deba4a6262c8c4abf67e608924f649e"
SRCREV_meta ?= "665fea1c249b4f335cb1c9a46a9f2c138d611f1a"
-PR = "r2"
+PR = "r3"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE
2012-01-24 23:26 ` [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE Joshua Lock
@ 2012-01-24 23:42 ` Khem Raj
2012-01-24 23:59 ` Saul Wold
2012-01-25 12:31 ` Richard Purdie
1 sibling, 1 reply; 12+ messages in thread
From: Khem Raj @ 2012-01-24 23:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, Jan 24, 2012 at 3:26 PM, Joshua Lock <josh@linux.intel.com> wrote:
> Long term we should look at moving perf to a separate recipe but as a
> short term solution this patch will ensure that when GPLv3 is in
would I be asking too much to do that instead of this patch :)
I think it will be good thing in general since other layers
now have to define these tasks if they inherit from oe-core kernel class.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE
2012-01-24 23:42 ` Khem Raj
@ 2012-01-24 23:59 ` Saul Wold
2012-01-25 1:04 ` Khem Raj
2012-01-25 10:11 ` Andrei Gherzan
0 siblings, 2 replies; 12+ messages in thread
From: Saul Wold @ 2012-01-24 23:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 01/24/2012 03:42 PM, Khem Raj wrote:
> On Tue, Jan 24, 2012 at 3:26 PM, Joshua Lock<josh@linux.intel.com> wrote:
>> Long term we should look at moving perf to a separate recipe but as a
>> short term solution this patch will ensure that when GPLv3 is in
>
> would I be asking too much to do that instead of this patch :)
> I think it will be good thing in general since other layers
> now have to define these tasks if they inherit from oe-core kernel class.
>
Khem,
The issue is timing and resources to do this work, it a larger task that
may take more than a few days to refactor perf into it's own recipe and
share the source area (ala work-shared/gcc). We need to get the
non-GPLv3 build working again and this seems like the most direct route
to accomplish that.
Sau!
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE
2012-01-24 23:59 ` Saul Wold
@ 2012-01-25 1:04 ` Khem Raj
2012-01-25 1:10 ` Saul Wold
2012-01-25 10:11 ` Andrei Gherzan
1 sibling, 1 reply; 12+ messages in thread
From: Khem Raj @ 2012-01-25 1:04 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On Tue, Jan 24, 2012 at 3:59 PM, Saul Wold <sgw@linux.intel.com> wrote:
>
>
> The issue is timing and resources to do this work, it a larger task that may
> take more than a few days to refactor perf into it's own recipe and share
> the source area (ala work-shared/gcc). We need to get the non-GPLv3 build
> working again and this seems like the most direct route to accomplish that.
is that a blocker for oe-core ?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE
2012-01-25 1:04 ` Khem Raj
@ 2012-01-25 1:10 ` Saul Wold
0 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-01-25 1:10 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On 01/24/2012 05:04 PM, Khem Raj wrote:
> On Tue, Jan 24, 2012 at 3:59 PM, Saul Wold<sgw@linux.intel.com> wrote:
>>
>>
>> The issue is timing and resources to do this work, it a larger task that may
>> take more than a few days to refactor perf into it's own recipe and share
>> the source area (ala work-shared/gcc). We need to get the non-GPLv3 build
>> working again and this seems like the most direct route to accomplish that.
>
> is that a blocker for oe-core ?
>
It's a blocker for oe-core & 1.2, and we are not sure get can get the
refactor done by 1.2 given all the the other activities the team has, if
there are some external resources available o complete this work, that
would be very helpful!
Sau!
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE
2012-01-24 23:59 ` Saul Wold
2012-01-25 1:04 ` Khem Raj
@ 2012-01-25 10:11 ` Andrei Gherzan
1 sibling, 0 replies; 12+ messages in thread
From: Andrei Gherzan @ 2012-01-25 10:11 UTC (permalink / raw)
To: openembedded-core
On 01/25/2012 01:59 AM, Saul Wold wrote:
> On 01/24/2012 03:42 PM, Khem Raj wrote:
>> On Tue, Jan 24, 2012 at 3:26 PM, Joshua Lock<josh@linux.intel.com>
>> wrote:
>>> Long term we should look at moving perf to a separate recipe but as a
>>> short term solution this patch will ensure that when GPLv3 is in
>>
>> would I be asking too much to do that instead of this patch :)
>> I think it will be good thing in general since other layers
>> now have to define these tasks if they inherit from oe-core kernel
>> class.
>>
> Khem,
>
> The issue is timing and resources to do this work, it a larger task
> that may take more than a few days to refactor perf into it's own
> recipe and share the source area (ala work-shared/gcc). We need to
> get the non-GPLv3 build working again and this seems like the most
> direct route to accomplish that.
>
> Sau!
>
This is a good workaround for this bug. Obviously a "refactor way" would
be a better one in my opinion too. But for now, as this bug breaks a
non-GPLv3 build, a fast solution, like this, is needed.
@g
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE
2012-01-24 23:26 ` [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE Joshua Lock
2012-01-24 23:42 ` Khem Raj
@ 2012-01-25 12:31 ` Richard Purdie
1 sibling, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2012-01-25 12:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2012-01-24 at 15:26 -0800, Joshua Lock wrote:
> As binutils is required by perf to build and is GPLv3 licensed adding
> GPLv3 to INCOMPATIBLE_LICENSE will cause linux-yocto to be skipped.
>
> Long term we should look at moving perf to a separate recipe but as a
> short term solution this patch will ensure that when GPLv3 is in
> INCOMPATIBLE_LICENSE perf is not built and it's dependencies are not
> added to build.
>
> Fixes [YOCTO #1880]
>
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
> meta/recipes-kernel/linux/linux-tools.inc | 20 ++++++++++++++++++--
> meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 2 +-
> meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
> 3 files changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
> index aa45dba..69e68c0 100644
> --- a/meta/recipes-kernel/linux/linux-tools.inc
> +++ b/meta/recipes-kernel/linux/linux-tools.inc
> @@ -1,5 +1,18 @@
> # included by kernel recipes if they want to build/provide
> # perf functionality from their tree.
> +
> +# perf requires binutils which is GPLv3 licensed, don't prevent the entire kernel
> +# being built if GPLv3 is in INCOMPATIBLE_LICENSE
> +python () {
> + d.setVar("BUILDPERF", "yes")
> + d.setVar("PERFDEPENDS", "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot")
> +
> + if ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
> + # GPLv3, drop perf
> + d.setVar("BUILDPERF", "no")
> + d.setVar("PERFDEPENDS", "")
> +}
> +
Can we make this a little neater, something like:
BUILDPERF = "yes"
BUILDPERF_libc-uclib = "no"
PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot"
PERFDEPENDS_libc-uclibc = ""
Then just have the if statement in the anonymous python and drop the
do_compile_perf_libc-uclibc and PERFDEPENDS_libc-uclibc.
This also makes it easy for an external recipe to just disable this
code.
Cheers,
Richard
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/4] cogl: update upstream status for build_for_armv4t.patch
2012-01-24 23:26 [PATCH 0/4] Various updates Joshua Lock
2012-01-24 23:26 ` [PATCH 1/4] clutter-gst: update to 1.4.6 Joshua Lock
2012-01-24 23:26 ` [PATCH 2/4] linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE Joshua Lock
@ 2012-01-24 23:26 ` Joshua Lock
2012-01-24 23:26 ` [PATCH 4/4] distro-tracking-fields: update entries for clutter-gst-1.8 Joshua Lock
2012-01-25 14:34 ` [PATCH 0/4] Various updates Richard Purdie
4 siblings, 0 replies; 12+ messages in thread
From: Joshua Lock @ 2012-01-24 23:26 UTC (permalink / raw)
To: openembedded-core
This has patch has been merged into upstreams git repository and will be
available in the next stable release.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../clutter/cogl/build_for_armv4t.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
index 3635085..003e9ff 100644
--- a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
+++ b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
@@ -3,7 +3,7 @@ check this to turn off the use of 'clz' instructions, which otherwise would
cause compile errors like "selected processor does not support ARM mode
`clz r3,r0'".
-Upstream-Status: Submitted
+Upstream-Status: Accepted (should be in the next cogl stable release)
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
--
1.7.7.6
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4] distro-tracking-fields: update entries for clutter-gst-1.8
2012-01-24 23:26 [PATCH 0/4] Various updates Joshua Lock
` (2 preceding siblings ...)
2012-01-24 23:26 ` [PATCH 3/4] cogl: update upstream status for build_for_armv4t.patch Joshua Lock
@ 2012-01-24 23:26 ` Joshua Lock
2012-01-25 14:34 ` [PATCH 0/4] Various updates Richard Purdie
4 siblings, 0 replies; 12+ messages in thread
From: Joshua Lock @ 2012-01-24 23:26 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index ce88b2e..a047315 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5567,8 +5567,8 @@ RECIPE_MAINTAINER_pn-clutter-gtk-1.8 = "Joshua Lock <josh@linux.intel.com>"
RECIPE_STATUS_pn-clutter-gst-1.8 = "red"
DISTRO_PN_ALIAS_pn-clutter-gst-1.8 = "Fedora=clutter-gst Debian=libclutter-gst"
-RECIPE_LATEST_VERSION_pn-clutter-gst-1.8 = "1.4.2"
-RECIPE_LAST_UPDATE_pn-clutter-gst-1.8 = "Nov 09, 2011"
+RECIPE_LATEST_VERSION_pn-clutter-gst-1.8 = "1.4.6"
+RECIPE_LAST_UPDATE_pn-clutter-gst-1.8 = "Jan 24, 2012"
RECIPE_MAINTAINER_pn-clutter-gst-1.8 = "Joshua Lock <josh@linux.intel.com>"
RECIPE_STATUS_pn-clutter-box2d = "red"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/4] Various updates
2012-01-24 23:26 [PATCH 0/4] Various updates Joshua Lock
` (3 preceding siblings ...)
2012-01-24 23:26 ` [PATCH 4/4] distro-tracking-fields: update entries for clutter-gst-1.8 Joshua Lock
@ 2012-01-25 14:34 ` Richard Purdie
4 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2012-01-25 14:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2012-01-24 at 15:26 -0800, Joshua Lock wrote:
> The key patch in this series is the linux-tools change. With builds that don't
> include GPLv3 licensed packages the linux-yocto kernel was being skipped due to
> it pulling in perf and perf requiring binutils.
>
> The short-term fix is to not build perf if GPLv3 is in INCOMPATIBLE_LICENSE,
> long term there's a bug open to move perf to a separate package.
>
> Cheers,
> Joshua
>
> The following changes since commit a4a98b6d6273d4e716afbff0880d0ac2ff7be0a9:
>
> gcc-common.inc: Fix comment (2012-01-24 14:38:31 +0000)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib josh/stuff
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/stuff
>
> Joshua Lock (4):
> clutter-gst: update to 1.4.6
> linux-tools: don't build perf when GPLv3 in INCOMPATIBLE_LICENSE
> cogl: update upstream status for build_for_armv4t.patch
> distro-tracking-fields: update entries for clutter-gst-1.8
Merged to master apart from linux-tools which I think can be improved
slightly.
Cheers,
Richard
^ permalink raw reply [flat|nested] 12+ messages in thread