* Re: [PATCH 0/6] Add some intel-specific tune files, and related fixes
From: Saul Wold @ 2011-11-07 19:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1320638388.git.tom.zanussi@intel.com>
On 11/07/2011 07:53 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> This patchset adds some new tune files for corei7, ivb, and atom.
>
Tom,
Where is the repo containing this patch set? Are you using the
create_pull_request script, which generates the formatted message which
includes the repo from which to pull this patchset?
Thanks
Sau!
> The corei7 and atom were build- and boot-tested on sugarbay (with
> corei7-avx), jasperforest (corei7), crownbay, fri2, fishriver (atom).
> The ivb is one I'll be using for new Ivy Bridge development and
> hasn't been tested yet, but will be needed for that.
>
> This patchset also contains a few patches for packages that had build
> problems with the corei7-avx tuning. The python and gmp packages had
> problems because they tried to execute target code on the host and caused
> illegal instruction errors. The libzypp failed compilation because of
> the hyphens in the tune name (corei7-avx).
>
> Tom Zanussi (6):
> tune-corei7: Add tune file for Intel Core i7 machines
> tune-ivb: Add tune file for Intel Ivy Bridge machines
> machine/include/tune-atom.inc: add atom-specific settings
> gmp_5.0.2: Set CC_FOR_BUILD to BUILD_CC
> libzypp: fix mishandling of hyphenated arches
> python: skip setup.py
>
> meta/conf/machine/include/tune-atom.inc | 26 +++++++++++++++++-
> meta/conf/machine/include/tune-corei7.inc | 17 ++++++++++++
> meta/conf/machine/include/tune-ivb.inc | 11 ++++++++
> .../python/setup_py_skip_cross_import_check.patch | 27 ++++++++++++++++++++
> meta/recipes-devtools/python/python_2.7.2.bb | 7 ++++-
> meta/recipes-extended/libzypp/libzypp_git.bb | 8 +++---
> meta/recipes-support/gmp/gmp_5.0.2.bb | 3 +-
> 7 files changed, 91 insertions(+), 8 deletions(-)
> create mode 100644 meta/conf/machine/include/tune-corei7.inc
> create mode 100644 meta/conf/machine/include/tune-ivb.inc
> create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH 0/6] Add some intel-specific tune files, and related fixes
From: Tom Zanussi @ 2011-11-07 19:58 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4EB83144.70600@linux.intel.com>
On Mon, 2011-11-07 at 11:28 -0800, Saul Wold wrote:
> On 11/07/2011 07:53 AM, tom.zanussi@intel.com wrote:
> > From: Tom Zanussi<tom.zanussi@intel.com>
> >
> > This patchset adds some new tune files for corei7, ivb, and atom.
> >
> Tom,
>
> Where is the repo containing this patch set? Are you using the
> create_pull_request script, which generates the formatted message which
> includes the repo from which to pull this patchset?
>
I didn't push this patchset to a contrib repo, just posted them as
patches. Not ok?
Tom
> Thanks
> Sau!
>
> > The corei7 and atom were build- and boot-tested on sugarbay (with
> > corei7-avx), jasperforest (corei7), crownbay, fri2, fishriver (atom).
> > The ivb is one I'll be using for new Ivy Bridge development and
> > hasn't been tested yet, but will be needed for that.
> >
> > This patchset also contains a few patches for packages that had build
> > problems with the corei7-avx tuning. The python and gmp packages had
> > problems because they tried to execute target code on the host and caused
> > illegal instruction errors. The libzypp failed compilation because of
> > the hyphens in the tune name (corei7-avx).
> >
> > Tom Zanussi (6):
> > tune-corei7: Add tune file for Intel Core i7 machines
> > tune-ivb: Add tune file for Intel Ivy Bridge machines
> > machine/include/tune-atom.inc: add atom-specific settings
> > gmp_5.0.2: Set CC_FOR_BUILD to BUILD_CC
> > libzypp: fix mishandling of hyphenated arches
> > python: skip setup.py
> >
> > meta/conf/machine/include/tune-atom.inc | 26 +++++++++++++++++-
> > meta/conf/machine/include/tune-corei7.inc | 17 ++++++++++++
> > meta/conf/machine/include/tune-ivb.inc | 11 ++++++++
> > .../python/setup_py_skip_cross_import_check.patch | 27 ++++++++++++++++++++
> > meta/recipes-devtools/python/python_2.7.2.bb | 7 ++++-
> > meta/recipes-extended/libzypp/libzypp_git.bb | 8 +++---
> > meta/recipes-support/gmp/gmp_5.0.2.bb | 3 +-
> > 7 files changed, 91 insertions(+), 8 deletions(-)
> > create mode 100644 meta/conf/machine/include/tune-corei7.inc
> > create mode 100644 meta/conf/machine/include/tune-ivb.inc
> > create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
^ permalink raw reply
* Re: [CONSOLIDATED PULL 14/28] Add new IMAGE_CLASSES variable for classes for image generation
From: McClintock Matthew-B29882 @ 2011-11-07 20:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1320674653.23708.11.camel@ted>
On Mon, Nov 7, 2011 at 8:04 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Most initial new users don't need to see this. Can we place this into
> local.conf.sample.extended please?
Follow up patch sent on other thread.
-M
^ permalink raw reply
* [PATCH 0/6][v2] Add some intel-specific tune files, and related fixes
From: tom.zanussi @ 2011-11-07 20:28 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
This patchset adds some new tune files for corei7, ivb, and atom.
The corei7 and atom were build- and boot-tested on sugarbay (with
corei7-avx), jasperforest (corei7), crownbay, fri2, fishriver (atom).
The ivb is one I'll be using for new Ivy Bridge development and
hasn't been tested yet, but will be needed for that.
This patchset also contains a few patches for packages that had build
problems with the corei7-avx tuning. The python and gmp packages had
problems because they tried to execute target code on the host and caused
illegal instruction errors. The libzypp failed compilation because of
the hyphens in the tune name (corei7-avx).
v2: do it using create-pull-request, fix subject on python patch
The following changes since commit 28940eb97d835b45ecbf832f25e94fc1574f25a1:
Koen Kooi (1):
lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/newtune-v0
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/newtune-v0
Tom Zanussi (6):
tune-corei7: Add tune file for Intel Core i7 machines
tune-ivb: Add tune file for Intel Ivy Bridge machines
machine/include/tune-atom.inc: add atom-specific settings
gmp_5.0.2: Set CC_FOR_BUILD to BUILD_CC
libzypp: fix mishandling of hyphenated arches
python: skip setup.py 'import check' when cross-compiling
meta/conf/machine/include/tune-atom.inc | 26 +++++++++++++++++-
meta/conf/machine/include/tune-corei7.inc | 17 ++++++++++++
meta/conf/machine/include/tune-ivb.inc | 11 ++++++++
.../python/setup_py_skip_cross_import_check.patch | 27 ++++++++++++++++++++
meta/recipes-devtools/python/python_2.7.2.bb | 5 +++
meta/recipes-extended/libzypp/libzypp_git.bb | 8 +++---
meta/recipes-support/gmp/gmp_5.0.2.bb | 3 +-
7 files changed, 90 insertions(+), 7 deletions(-)
create mode 100644 meta/conf/machine/include/tune-corei7.inc
create mode 100644 meta/conf/machine/include/tune-ivb.inc
create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
^ permalink raw reply
* [PATCH 2/6] tune-ivb: Add tune file for Intel Ivy Bridge machines
From: tom.zanussi @ 2011-11-07 20:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320697346.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
Add a tune file for Intel Ivy Bridge machines.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/conf/machine/include/tune-ivb.inc | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
create mode 100644 meta/conf/machine/include/tune-ivb.inc
diff --git a/meta/conf/machine/include/tune-ivb.inc b/meta/conf/machine/include/tune-ivb.inc
new file mode 100644
index 0000000..3c0b670
--- /dev/null
+++ b/meta/conf/machine/include/tune-ivb.inc
@@ -0,0 +1,11 @@
+DEFAULTTUNE ?= "ivb"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "ivb", "ivb", "", d)}"
+
+require conf/machine/include/tune-x86_64.inc
+
+TUNEVALID[ivb] = "Enable ivb-specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ivb", "-march=core-avx-i", "", d)}"
+
+AVAILTUNES += "ivb"
+TUNE_FEATURES_tune-ivb = "${TUNE_FEATURES_tune-x86-64} ivb"
+PACKAGE_EXTRA_ARCHS_tune-ivb = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} ivb"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 4/6] gmp_5.0.2: Set CC_FOR_BUILD to BUILD_CC
From: tom.zanussi @ 2011-11-07 20:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320697346.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
CC_FOR_BUILD was compiling the test programs using the target's
compile options and executing those on the host, causing errors such
as:
/bin/sh: line 1: 15032 Illegal instruction ./gen-bases table 64 0 > mpn/mp_bases.c
/bin/sh: line 1: 15033 Illegal instruction ./gen-bases header 64 0 > mp_bases.h
Export CC_FOR_BUILD using BUILD_CC to fix the problem.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-support/gmp/gmp_5.0.2.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gmp/gmp_5.0.2.bb b/meta/recipes-support/gmp/gmp_5.0.2.bb
index 03fef45..16bdcbc 100644
--- a/meta/recipes-support/gmp/gmp_5.0.2.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.2.bb
@@ -2,11 +2,12 @@ require gmp.inc
LICENSE="LGPLv3&GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
-PR = "r0"
+PR = "r1"
SRC_URI_append += "file://sh4-asmfix.patch \
file://use-includedir.patch "
+export CC_FOR_BUILD = "${BUILD_CC}"
SRC_URI[md5sum] = "0bbaedc82fb30315b06b1588b9077cd3"
SRC_URI[sha256sum] = "dbc2db76fdd4e99f85d5e35aa378ed62c283e0d586b91bd8703aff75a7804c28"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 6/6] python: skip setup.py 'import check' when cross-compiling
From: tom.zanussi @ 2011-11-07 20:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320697346.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
build_extension() in setup.py, as part of the build process, does an
'import check' on the built extension. The import check in turn
dlopen()'s the shared library associated with the extension, which
isn't something that makes sense if that library was cross-compiled
for a different architecture.
This was noticed with an x86_64 target that was compiled with avx
support, because it caused 'illegal instruction' exceptions:
| /bin/sh: line 1: 14575 Illegal instruction ... -E ./setup.py -q build
For other target architectures, it doesn't necessarily cause illegal
instruction exceptions, but still fails. For example, on arm, the
failure pathway causes this warning:
*** WARNING: renaming "cmath" since importing it failed: .../cmath.so:
wrong ELF class: ELFCLASS32
This patch to setup.py and the associated recipe changes allow the
whole 'import check' logic to be skipped when cross-compiling.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../python/setup_py_skip_cross_import_check.patch | 27 ++++++++++++++++++++
meta/recipes-devtools/python/python_2.7.2.bb | 5 +++
2 files changed, 32 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
diff --git a/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
new file mode 100644
index 0000000..6ccdb94
--- /dev/null
+++ b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
@@ -0,0 +1,27 @@
+This patch skips over the 'import check' setup.py does when building
+extensions. This generally won't work when cross-compiling.
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+
+Index: Python-2.7.2/setup.py
+===================================================================
+--- Python-2.7.2.orig/setup.py 2011-11-04 16:46:34.553796410 -0500
++++ Python-2.7.2/setup.py 2011-11-04 16:59:49.692802313 -0500
+@@ -287,6 +287,15 @@
+ (ext.name, sys.exc_info()[1]))
+ self.failed.append(ext.name)
+ return
++
++ # If we're cross-compiling, we want to skip the import check
++ # i.e. we shouldn't be dynamically loading target shared libs
++ if os.environ.get('CROSS_COMPILE') is not None:
++ self.announce(
++ 'WARNING: skipping import check for cross-compiled "%s"' %
++ ext.name)
++ return
++
+ # Workaround for Mac OS X: The Carbon-based modules cannot be
+ # reliably imported into a command-line Python
+ if 'Carbon' in ext.extra_link_args:
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index bb088a4..360e64e 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -18,6 +18,7 @@ SRC_URI += "\
file://multilib.patch \
file://cgi_py.patch \
file://remove_sqlite_rpath.patch \
+ file://setup_py_skip_cross_import_check.patch \
"
S = "${WORKDIR}/Python-${PV}"
@@ -57,6 +58,8 @@ do_compile() {
# then call do_install twice we get Makefile.orig == Makefile.sysroot
install -m 0644 Makefile Makefile.sysroot
+ export CROSS_COMPILE="${TARGET_PREFIX}"
+
oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
STAGING_LIBDIR=${STAGING_LIBDIR} \
@@ -78,6 +81,8 @@ do_install() {
# make install needs the original Makefile, or otherwise the inclues would
# go to ${D}${STAGING...}/...
install -m 0644 Makefile.orig Makefile
+
+ export CROSS_COMPILE="${TARGET_PREFIX}"
oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/6] tune-corei7: Add tune file for Intel Core i7 machines
From: tom.zanussi @ 2011-11-07 20:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320697346.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
Add a tune file for Intel Core i7 machines both with and without AVX
support.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/conf/machine/include/tune-corei7.inc | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 meta/conf/machine/include/tune-corei7.inc
diff --git a/meta/conf/machine/include/tune-corei7.inc b/meta/conf/machine/include/tune-corei7.inc
new file mode 100644
index 0000000..2e0c67f
--- /dev/null
+++ b/meta/conf/machine/include/tune-corei7.inc
@@ -0,0 +1,17 @@
+DEFAULTTUNE ?= "corei7"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "avx", "corei7-avx", "corei7", d)}"
+
+require conf/machine/include/tune-x86_64.inc
+
+TUNEVALID[corei7] = "Enable corei7-specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "corei7", "-march=corei7${COREI7_AVX}", "", d)}"
+
+COREI7_AVX = "${@bb.utils.contains("TUNE_FEATURES", [ "corei7", "avx" ], "-avx", "", d)}"
+
+AVAILTUNES += "corei7"
+TUNE_FEATURES_tune-corei7 = "${TUNE_FEATURES_tune-x86-64} corei7"
+PACKAGE_EXTRA_ARCHS_tune-corei7 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} corei7"
+
+AVAILTUNES += "corei7-avx"
+TUNE_FEATURES_tune-corei7-avx = "${TUNE_FEATURES_tune-x86-64} corei7 avx"
+PACKAGE_EXTRA_ARCHS_tune-corei7-avx = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} corei7-avx"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 3/6] machine/include/tune-atom.inc: add atom-specific settings
From: tom.zanussi @ 2011-11-07 20:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320697346.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
Atom tunings are currently the same as core2; this patch changes them
to make use of atom-specific settings such as the atom arch and
instruction support in gcc.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/conf/machine/include/tune-atom.inc | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/tune-atom.inc
index 5e1bb74..ab4aa14 100644
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/meta/conf/machine/include/tune-atom.inc
@@ -1,2 +1,24 @@
-# Atom tunings are the same as core2 for now...
-require conf/machine/include/tune-core2.inc
+DEFAULTTUNE ?= "atom"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "atom", "atom-64", d)}"
+
+require conf/machine/include/tune-i586.inc
+
+# Extra tune features
+TUNEVALID[atom] = "Enable atom-specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "atom", "-march=atom -mssse3 -mfpmath=sse", "", d)}"
+
+# Extra tune selections
+AVAILTUNES += "atom"
+TUNE_FEATURES_tune-atom ?= "${TUNE_FEATURES_tune-x86} atom"
+BASE_LIB_tune-atom ?= "lib"
+PACKAGE_EXTRA_ARCHS_tune-atom = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586 i686 atom"
+
+AVAILTUNES += "atom-64"
+TUNE_FEATURES_tune-atom-64 ?= "${TUNE_FEATURES_tune-x86-64} atom"
+BASE_LIB_tune-atom-64 ?= "lib64"
+PACKAGE_EXTRA_ARCHS_tune-atom-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} atom-64"
+
+AVAILTUNES += "atom-64-x32"
+TUNE_FEATURES_tune-atom-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} atom"
+BASE_LIB_tune-atom-64-x32 ?= "libx32"
+PACKAGE_EXTRA_ARCHS_tune-atom-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} atom-64-x32"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 5/6] libzypp: fix mishandling of hyphenated arches
From: tom.zanussi @ 2011-11-07 20:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320697346.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
Several hyphen-to-underscore translations were missing, causing
compiler errors trying to build arches with hyphens in their names.
This adds the missing translations.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-extended/libzypp/libzypp_git.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 20e8f7c..a6b270c 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
S = "${WORKDIR}/git"
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}"
-PR = "r15"
+PR = "r16"
SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
file://no-doc.patch \
@@ -98,10 +98,10 @@ do_archgen () {
esac
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
- echo "(_${each_arch});" >> zypp/oe-arch.h
+ echo "(_${each_arch});" | tr - _ >> zypp/oe-arch.h
else
echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
- echo "( IdString ( \"${each_arch}\" ) );" >> zypp/oe-arch.h
+ echo "( IdString ( \"${each_arch}\" ) );" | tr - _ >> zypp/oe-arch.h
fi
done
echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h
@@ -142,7 +142,7 @@ do_archgen () {
COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
done
for each_compat in ${COMPAT_WITH} ; do
- echo " defCompatibleWith( ${each_compat} );" >> zypp/oe-arch.h
+ echo " defCompatibleWith( ${each_compat} );" | tr - _ >> zypp/oe-arch.h
done
echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h
echo "" >> zypp/oe-arch.h
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/2] useradd.bbclass: handle nativesdk case
From: Eric Bénard @ 2011-11-07 21:11 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <4EB8225D.6000804@intel.com>
* without this patch, building dbus-nativesdk leads to a missing
dependency on 'base-passwd-nativesdk'
This was added by commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13
* this patch handle the nativesdk case in the class useradd
* close bug 1702 http://bugzilla.pokylinux.org/show_bug.cgi?id=1702
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
meta/classes/useradd.bbclass | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index fb70b3e..b935d01 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -3,9 +3,16 @@ USERADDPN ?= "${PN}"
# base-passwd-cross provides the default passwd and group files in the
# target sysroot, and shadow -native and -sysroot provide the utilities
# and support files needed to add and modify user and group accounts
-DEPENDS_append = " base-passwd shadow-native shadow-sysroot"
RDEPENDS_${USERADDPN}_append = " base-passwd shadow"
+def useradd_dep_append(d):
+ deps = ' '
+ if not bb.data.inherits_class('nativesdk', d):
+ deps = ' shadow-native shadow-sysroot base-passwd'
+ return deps
+
+DEPENDS_append = "${@useradd_dep_append(d)}"
+
# This preinstall function will be run in two contexts: once for the
# native sysroot (as invoked by the useradd_sysroot() wrapper), and
# also as the preinst script in the target package.
@@ -96,8 +103,13 @@ useradd_sysroot_sstate () {
fi
}
-do_install[prefuncs] += "useradd_sysroot"
-SSTATEPOSTINSTFUNCS += "useradd_sysroot_sstate"
+python () {
+ if not bb.data.inherits_class('nativesdk', d):
+ funcs = bb.data.getVarFlag('do_install', 'prefuncs', d) or ""
+ funcs += 'useradd_sysroot'
+ bb.data.setVarFlag('do_install', 'prefuncs', funcs, d)
+ d.setVar('SSTATEPOSTINSTFUNCS', (bb.data.getVar('SSTATEPOSTINSTFUNCS', d, True) or "").join("useradd_sysroot_sstate"))
+}
# Recipe parse-time sanity checks
def update_useradd_after_parse(d):
--
1.7.6.4
^ permalink raw reply related
* [PATCH 2/2] dbus: fix install for virtclass-nativesdk
From: Eric Bénard @ 2011-11-07 21:11 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1320700315-11952-1-git-send-email-eric@eukrea.com>
* 46e6c3fa8034b12d178d605f3f5d7efe69671a13 changed do_install
which now fails for nativesdk (chown messagebus leads to no
such user)
* tested by building meta-toolchain-qte and running the generated
sdk
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
meta/recipes-core/dbus/dbus.inc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index caa781c..99b2fc7 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -105,4 +105,8 @@ do_install_virtclass-native() {
# dbus-glib-native and dbus-glib need this xml file
./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
}
+
+do_install_virtclass-nativesdk() {
+ autotools_do_install
+}
BBCLASSEXTEND = "native nativesdk"
--
1.7.6.4
^ permalink raw reply related
* Re: [PATCH 1/2] useradd.bbclass: handle nativesdk case
From: Scott Garman @ 2011-11-07 21:32 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1320700315-11952-1-git-send-email-eric@eukrea.com>
On 11/07/2011 01:11 PM, Eric Bénard wrote:
> * without this patch, building dbus-nativesdk leads to a missing
> dependency on 'base-passwd-nativesdk'
> This was added by commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13
> * this patch handle the nativesdk case in the class useradd
> * close bug 1702 http://bugzilla.pokylinux.org/show_bug.cgi?id=1702
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Scott Garman <scott.a.garman@intel.com>
> ---
> meta/classes/useradd.bbclass | 18 +++++++++++++++---
> 1 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
> index fb70b3e..b935d01 100644
> --- a/meta/classes/useradd.bbclass
> +++ b/meta/classes/useradd.bbclass
> @@ -3,9 +3,16 @@ USERADDPN ?= "${PN}"
> # base-passwd-cross provides the default passwd and group files in the
> # target sysroot, and shadow -native and -sysroot provide the utilities
> # and support files needed to add and modify user and group accounts
> -DEPENDS_append = " base-passwd shadow-native shadow-sysroot"
> RDEPENDS_${USERADDPN}_append = " base-passwd shadow"
>
> +def useradd_dep_append(d):
> + deps = ' '
> + if not bb.data.inherits_class('nativesdk', d):
> + deps = ' shadow-native shadow-sysroot base-passwd'
> + return deps
> +
> +DEPENDS_append = "${@useradd_dep_append(d)}"
> +
> # This preinstall function will be run in two contexts: once for the
> # native sysroot (as invoked by the useradd_sysroot() wrapper), and
> # also as the preinst script in the target package.
> @@ -96,8 +103,13 @@ useradd_sysroot_sstate () {
> fi
> }
>
> -do_install[prefuncs] += "useradd_sysroot"
> -SSTATEPOSTINSTFUNCS += "useradd_sysroot_sstate"
> +python () {
> + if not bb.data.inherits_class('nativesdk', d):
> + funcs = bb.data.getVarFlag('do_install', 'prefuncs', d) or ""
> + funcs += 'useradd_sysroot'
> + bb.data.setVarFlag('do_install', 'prefuncs', funcs, d)
> + d.setVar('SSTATEPOSTINSTFUNCS', (bb.data.getVar('SSTATEPOSTINSTFUNCS', d, True) or "").join("useradd_sysroot_sstate"))
> +}
>
> # Recipe parse-time sanity checks
> def update_useradd_after_parse(d):
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply
* Re: [PATCH 2/2] dbus: fix install for virtclass-nativesdk
From: Scott Garman @ 2011-11-07 21:32 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1320700315-11952-2-git-send-email-eric@eukrea.com>
On 11/07/2011 01:11 PM, Eric Bénard wrote:
> * 46e6c3fa8034b12d178d605f3f5d7efe69671a13 changed do_install
> which now fails for nativesdk (chown messagebus leads to no
> such user)
> * tested by building meta-toolchain-qte and running the generated
> sdk
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Scott Garman <scott.a.garman@intel.com>
> ---
> meta/recipes-core/dbus/dbus.inc | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
> index caa781c..99b2fc7 100644
> --- a/meta/recipes-core/dbus/dbus.inc
> +++ b/meta/recipes-core/dbus/dbus.inc
> @@ -105,4 +105,8 @@ do_install_virtclass-native() {
> # dbus-glib-native and dbus-glib need this xml file
> ./bus/dbus-daemon --introspect> ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
> }
> +
> +do_install_virtclass-nativesdk() {
> + autotools_do_install
> +}
> BBCLASSEXTEND = "native nativesdk"
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply
* Re: [PATCH 0/6][v2] Add some intel-specific tune files, and related fixes
From: Saul Wold @ 2011-11-07 22:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1320697346.git.tom.zanussi@intel.com>
On 11/07/2011 12:28 PM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> This patchset adds some new tune files for corei7, ivb, and atom.
>
> The corei7 and atom were build- and boot-tested on sugarbay (with
> corei7-avx), jasperforest (corei7), crownbay, fri2, fishriver (atom).
> The ivb is one I'll be using for new Ivy Bridge development and
> hasn't been tested yet, but will be needed for that.
>
> This patchset also contains a few patches for packages that had build
> problems with the corei7-avx tuning. The python and gmp packages had
> problems because they tried to execute target code on the host and caused
> illegal instruction errors. The libzypp failed compilation because of
> the hyphens in the tune name (corei7-avx).
>
> v2: do it using create-pull-request, fix subject on python patch
>
> The following changes since commit 28940eb97d835b45ecbf832f25e94fc1574f25a1:
> Koen Kooi (1):
> lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib.git tzanussi/newtune-v0
> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/newtune-v0
>
Tom,
Thank you, this makes it much easier to pull and merge into the testing
branch that I work with.
Sau!
> Tom Zanussi (6):
> tune-corei7: Add tune file for Intel Core i7 machines
> tune-ivb: Add tune file for Intel Ivy Bridge machines
> machine/include/tune-atom.inc: add atom-specific settings
> gmp_5.0.2: Set CC_FOR_BUILD to BUILD_CC
> libzypp: fix mishandling of hyphenated arches
> python: skip setup.py 'import check' when cross-compiling
>
> meta/conf/machine/include/tune-atom.inc | 26 +++++++++++++++++-
> meta/conf/machine/include/tune-corei7.inc | 17 ++++++++++++
> meta/conf/machine/include/tune-ivb.inc | 11 ++++++++
> .../python/setup_py_skip_cross_import_check.patch | 27 ++++++++++++++++++++
> meta/recipes-devtools/python/python_2.7.2.bb | 5 +++
> meta/recipes-extended/libzypp/libzypp_git.bb | 8 +++---
> meta/recipes-support/gmp/gmp_5.0.2.bb | 3 +-
> 7 files changed, 90 insertions(+), 7 deletions(-)
> create mode 100644 meta/conf/machine/include/tune-corei7.inc
> create mode 100644 meta/conf/machine/include/tune-ivb.inc
> create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH 0/8] Subversion-1.7.0 and arm/thumb work arounds
From: Martin Jansa @ 2011-11-07 22:34 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4EB82DE0.3090504@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 2546 bytes --]
On Mon, Nov 07, 2011 at 11:13:36AM -0800, Saul Wold wrote:
> On 10/21/2011 01:17 AM, Martin Jansa wrote:
> > Hi,
> >
> > arm mode was forced without PR bump, because if it was failing for someone he
> > will notice.
> >
> > Be carefull with using subversion-1.7.0 (read the commit message).
> >
> > Pulseaudio-1.1 was released, so hopefully this work arounds won't be needed
> > there or they could be resolved better with upgrade.
> >
> > Regards,
> >
> > The following changes since commit 99da9a4e65f9dffb04efc3ad60125194c476d6b3:
> >
> > distro-tracking-fields: update fields for tzdata and gst-plugins-good (2011-10-20 13:07:16 +0100)
> >
> > are available in the git repository at:
> > git://git.openembedded.org/openembedded-core-contrib jansa/pull2
> > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2
> >
> > Martin Jansa (8):
> > pulseaudio-0.9.23: inherit perlnative to work around build on host
> > without XML/Parser.pm
> > libatomics-ops: force ARM mode
> > pulseaudio-0.9.23: force ARM mode
> > webkit-gtk: force arm mode to work around binutils segfault
> Martin,
>
> What is the status of these various workarounds, did you do any further
> work to determine root causes, or do we still need these patches to do in?
I've only updated commit messages in branch and added the same
workaround for aspell which also fails for thumb.
All in jansa/pull
>
> Thanks
> Sau!
>
> > apr: add native support
> > neon: add native support
> > apr-util: add native support
> > subversion: add 1.7.0 with native support and negative D_P for now
> >
> > .../subversion/subversion-1.7.0/libtool2.patch | 15 ++++++++
> > .../subversion/subversion_1.7.0.bb | 37 ++++++++++++++++++++
> > .../pulseaudio/libatomics-ops_1.2.bb | 2 +
> > .../pulseaudio/pulseaudio_0.9.23.bb | 3 +-
> > meta/recipes-sato/webkit/webkit-gtk_svn.bb | 17 +++++++++
> > meta/recipes-support/apr/apr-util_1.3.12.bb | 8 ++++
> > meta/recipes-support/apr/apr_1.4.5.bb | 2 +
> > meta/recipes-support/neon/neon_0.29.5.bb | 3 ++
> > 8 files changed, 86 insertions(+), 1 deletions(-)
> > create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
> > create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb
> >
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* Re: [PATCH v2] Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE
From: McClintock Matthew-B29882 @ 2011-11-07 23:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1320442499.3296.4.camel@lenovo.internal.reciva.com>
On Fri, Nov 4, 2011 at 4:34 PM, Phil Blundell <philb@gnu.org> wrote:
>> --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>> +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>> @@ -25,6 +25,18 @@ do_install() {
>> if [ ! -z "${SERIAL_CONSOLE}" ]; then
>> echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
>> fi
>> +
>> + idx=0
>> + tmp="${SERIAL_CONSOLES}"
>> + if [ "x" != "x$tmp" ]; then
>> + for i in $tmp
>> + do
>> + j=`echo ${i} | sed s/\;/\ /g`
>> + echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
>> + idx=`expr $idx + 1`
>> + done
>> + fi
>> +
>
> Did you test that this actually solves the problem? It looks to me as
> though it will still do the wrong thing if the variable is not defined
> at all (as opposed to being defined to the empty string). The added
> "if" statement doesn't actually achieve much since, if $tmp is the empty
> string, the for-loop wouldn't have executed anyway and there is no need
> for an extra guard.
>
> Also, for what it's worth, the "x$tmp" idiom is unnecessary if you're
> going to quote the strings.
I don't get it. I think the first version was still OK. The first
version is pasted below.
> + idx=0
> + tmp="${SERIAL_CONSOLES}" <- If it's not defined this will catch it.
> + for i in $tmp
> + do
> + j=`echo ${i} | sed s/\;/\ /g`
> + echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
> + idx=`expr $idx + 1`
> + done
See my inline comment above, but if SERIAL_CONSOLES is not defined
tmp="" and the for loop won't execute. Not sure if there is a more
standard way to do this though.
-M
^ permalink raw reply
* Re: [PATCH] Introduce biarch DISTRO_FEATURE
From: Julian Pidancet @ 2011-11-07 23:14 UTC (permalink / raw)
To: McClintock Matthew-B29882; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CAEsOVNen8kUVPge_jZDq5LjhC7BAG0YKx=wxO+ZysNGAd_KwQg@mail.gmail.com>
On Wed, Oct 26, 2011 at 3:09 AM, McClintock Matthew-B29882
<B29882@freescale.com> wrote:
> On Mon, Oct 24, 2011 at 8:18 PM, Julian Pidancet
> <julian.pidancet@gmail.com> wrote:
>> This patch introduces a distro feature which enables gcc to produce
>> both 32bit and 64bit code, and enables binutils to operate on both
>> 32bit and 64bit binaries. It differs from multilib toolchains in
>> that it does not require to compile a version of the libc for each
>> architecture variant. However, the code produced for the secondary
>> architecture will not be linkable against the libc.
>>
>> This patch only works with x86 and x86_64 architectures, but can
>> probably be extended to support other architectures as well.
>>
>> One use-case would be when one wants to compile a system which runs
>> 32bit userspace applications with a 64bit kernel without having to
>> deal with two separate libc.
>
> What happens with the native gcc on the root file system. And what
> about meta-toolchain? Any effect?
>
Hi Matthew, sorry for the late answer.
I'm affraid I don't quite see what you mean by "the native gcc on the
root file system". Are you refering to the version of GCC present on
the build machine and built by OE ? Or are you refering instead about
a potential version of GCC running on the target ?
This patch should only make gcc-cross, and gcc running on the target
"biarch". It would also probably make sense to build a biarch GCC in
the meta-toolchain case.
To be honest, I have not really considered the meta-toolchain case as
I've never used it before and not quite sure how it works.
I can respin a patch to handle the meta-toolchain case. But in the
mean-time, it would be nice if I could get an opinion on wether this
"biarch" feature is a good idea or not, or, if not, maybe some
suggestions about how to address this specific 32bit/64bit use-case
differently.
--
Julian
^ permalink raw reply
* [PATCH 0/1] useradd.bbclass: fix how RDEPENDS is setup [v3]
From: Scott Garman @ 2011-11-07 23:36 UTC (permalink / raw)
To: openembedded-core
Fix bug where only packages named PN included base-passwd in
RDEPENDS.
This fixes [YOCTO #1727]
Including one more tweak based on feedback from Richard.
The following changes since commit e3c003282afb93ec52882496400b042620ab00ef:
rt-tests: update to 0.83 (2011-11-04 15:43:19 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/useradd-rdepends-final
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/useradd-rdepends-final
Scott Garman (1):
useradd.bbclass: fix how RDEPENDS is setup
meta/classes/useradd.bbclass | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
--
1.7.5.4
^ permalink raw reply
* [PATCH 1/1] useradd.bbclass: fix how RDEPENDS is setup
From: Scott Garman @ 2011-11-07 23:36 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320708905.git.scott.a.garman@intel.com>
Fix bug where only packages named PN included base-passwd in
RDEPENDS.
This fixes [YOCTO #1727]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/classes/useradd.bbclass | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index fb70b3e..0f9b84c 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -4,7 +4,6 @@ USERADDPN ?= "${PN}"
# target sysroot, and shadow -native and -sysroot provide the utilities
# and support files needed to add and modify user and group accounts
DEPENDS_append = " base-passwd shadow-native shadow-sysroot"
-RDEPENDS_${USERADDPN}_append = " base-passwd shadow"
# This preinstall function will be run in two contexts: once for the
# native sysroot (as invoked by the useradd_sysroot() wrapper), and
@@ -147,6 +146,11 @@ fakeroot python populate_packages_prepend () {
preinst += d.getVar('useradd_preinst', True)
bb.data.setVar('pkg_preinst_%s' % pkg, preinst, d)
+ # RDEPENDS setup
+ rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
+ rdepends += " base-passwd shadow"
+ bb.data.setVar("RDEPENDS_%s" % pkg, rdepends, d)
+
# We add the user/group calls to all packages to allow any package
# to contain files owned by the users/groups defined in the recipe.
# The user/group addition code is careful not to create duplicate
--
1.7.5.4
^ permalink raw reply related
* Re: [PATCH 1/2] useradd.bbclass: handle nativesdk case
From: Scott Garman @ 2011-11-07 23:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1320700315-11952-1-git-send-email-eric@eukrea.com>
Hi Eric,
Sorry to throw more churn into this, but can I ask you to submit a new
pull request for this?
In discussions with Richard today, he pointed out a few tricks that
would improve the patchset:
DEPENDS_append = "${USERADDDEPENDS}"
USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot"
USERADDDEPENDS_virtclass-nativesdk = ""
do_install[prefuncs] += "${SYSROOTFUNC}"
SYSROOTFUNC = "useradd_sysroot"
SYSROOTFUNC_virtclass-nativesdk = ""
I didn't want to take away credit for your patch, so if you'd be willing
to make these changes and respin your patch set, we'll take that.
The second thing is to avoid merge conflicts, can you rebase you
patchset on top of this branch:
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=sgarman/useradd-rdepends-final
...and Saul has been warned to apply these patches in the correct order.
Thanks,
Scott
PS - if this is a hassle, just let me know and I'm happy to take care of it.
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply
* [PATCH 00/12] Recipe upgrades, fixes and additions
From: Joshua Lock @ 2011-11-08 0:10 UTC (permalink / raw)
To: openembedded-core
All,
Here's a series of patches I developed whilst trying to play around with some
Clutter based software.
The interesting pieces may be:
Clutter 1.8 series recipes - do we want/need to keep clutter 1.6 around?
Are we OK with continuing to namespace the clutter recipes by clutter
version?
Gconf - I've pulled in GConf from upstream as the D-Bus backend is maintained
there now. For this I pulled in the gnome-related classes from meta-oe as they
simplified this recipe and I've been wanting to see them merged for some time.
Pulseaudio - whilst adding a required build dependency I changed the recipe so
that it doesn't require X unless the X11 distro feature is enabled.
Cheers,
Joshua
The following changes since commit 0809f98e995d3a2ce24ad25bade3dcd5154061fd:
lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR (2011-11-07 14:03:38 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/work
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/work
Joshua Lock (12):
cogl: add cogl 1.8.0 recipe
clutter-1.8: add 1.8.0
clutter-gst-1.8: add 1.4.2 for use with clutter 1.8
clutter-gtk-1.8: add clutter-gtk 0.11.4
mx: add mx toolkit 1.3.2
classes/[gnome|gnomebase|mime]: merge meta-oe's enhance gnome related
classes
gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
libcanberra: add libvorbis to DEPENDS
gypsy: fix packaging
connman: split scripts into separate package
pulseaudio: make X11 dependencies optional and add gtk+
contacts: fix packaging of icons
meta/classes/gnome-base.bbclass | 15 +++++
meta/classes/gnome.bbclass | 19 +-----
meta/classes/gnomebase.bbclass | 32 +++++++++++
meta/classes/mime.bbclass | 56 +++++++++++++++++++
meta/conf/distro/include/default-providers.inc | 2 -
meta/conf/multilib.conf | 2 +-
meta/recipes-connectivity/connman/connman.inc | 6 ++-
meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 4 +-
meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch | 59 ++++++++++++++++++++
meta/recipes-gnome/gnome/gconf-dbus_705.bb | 43 --------------
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 43 ++++++++++++++
meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb | 26 +++++++++
.../clutter/clutter-gst-1.8_1.4.2.bb | 22 +++++++
.../clutter/clutter-gst/enable_tests-1.8.bb | 15 +++++
.../clutter/clutter-gtk-1.8_0.11.4.bb | 11 ++++
meta/recipes-graphics/clutter/cogl.inc | 2 +-
.../clutter/cogl/macro-versions.patch | 26 +++++++++
meta/recipes-graphics/clutter/cogl_1.8.0.bb | 9 +++
meta/recipes-graphics/mx/mx_1.3.2.bb | 17 ++++++
.../pulseaudio/libcanberra_0.28.bb | 2 +-
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 +-
meta/recipes-sato/pimlico/contacts.inc | 3 +-
22 files changed, 348 insertions(+), 70 deletions(-)
create mode 100644 meta/classes/gnome-base.bbclass
create mode 100644 meta/classes/gnomebase.bbclass
create mode 100644 meta/classes/mime.bbclass
create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb
create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
create mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch
create mode 100644 meta/recipes-graphics/clutter/cogl_1.8.0.bb
create mode 100644 meta/recipes-graphics/mx/mx_1.3.2.bb
--
1.7.7
^ permalink raw reply
* [PATCH 01/12] cogl: add cogl 1.8.0 recipe
From: Joshua Lock @ 2011-11-08 0:10 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320709417.git.josh@linux.intel.com>
Cogl has been split into a separate recipe as of the clutter-1.8 series
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/recipes-graphics/clutter/cogl.inc | 2 +-
.../clutter/cogl/macro-versions.patch | 26 ++++++++++++++++++++
meta/recipes-graphics/clutter/cogl_1.8.0.bb | 9 +++++++
3 files changed, 36 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch
create mode 100644 meta/recipes-graphics/clutter/cogl_1.8.0.bb
diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
index 387f6ec..f264151 100644
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ b/meta/recipes-graphics/clutter/cogl.inc
@@ -8,7 +8,7 @@ BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
DEPENDS = "${STDDEPENDS} virtual/libgl"
EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
-FILESPATH = "${FILE_DIRNAME}/clutter"
+FILESPATH = "${FILE_DIRNAME}/cogl"
inherit autotools pkgconfig gtk-doc gettext
diff --git a/meta/recipes-graphics/clutter/cogl/macro-versions.patch b/meta/recipes-graphics/clutter/cogl/macro-versions.patch
new file mode 100644
index 0000000..87ea1f7
--- /dev/null
+++ b/meta/recipes-graphics/clutter/cogl/macro-versions.patch
@@ -0,0 +1,26 @@
+Index: cogl-1.8.0/configure.ac
+===================================================================
+--- cogl-1.8.0.orig/configure.ac
++++ cogl-1.8.0/configure.ac
+@@ -833,7 +833,7 @@ LT_INIT([disable-static])
+ dnl ================================================================
+ dnl I18n stuff.
+ dnl ================================================================
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+
+ GETTEXT_PACKAGE="cogl"
+Index: cogl-1.8.0/po/Makefile.in.in
+===================================================================
+--- cogl-1.8.0.orig/po/Makefile.in.in
++++ cogl-1.8.0/po/Makefile.in.in
+@@ -9,7 +9,7 @@
+ # General Public License and is *not* in the public domain.
+ #
+ # Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++GETTEXT_MACRO_VERSION = 0.18
+
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
diff --git a/meta/recipes-graphics/clutter/cogl_1.8.0.bb b/meta/recipes-graphics/clutter/cogl_1.8.0.bb
new file mode 100644
index 0000000..02ed67c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/cogl_1.8.0.bb
@@ -0,0 +1,9 @@
+require cogl.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
+ file://macro-versions.patch"
+
+SRC_URI[md5sum] = "cd18c28bf3dd0008b072cb9c5eed7821"
+SRC_URI[sha256sum] = "5ed9ee014367058a63d99a13e3fcc8cb8c6acb19ece00195c6df034fd8d8d8c7"
--
1.7.7
^ permalink raw reply related
* [PATCH 02/12] clutter-1.8: add 1.8.0
From: Joshua Lock @ 2011-11-08 0:10 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320709417.git.josh@linux.intel.com>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb | 26 ++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
new file mode 100644
index 0000000..efafbc2
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
@@ -0,0 +1,26 @@
+require recipes-graphics/clutter/clutter.inc
+
+PR = "r2"
+
+# Internal json-glib was removed in Clutter 1.5.2
+STDDEPENDS += "json-glib cogl atk"
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter/1.8/clutter-${PV}.tar.bz2 \
+ file://enable_tests-1.4.patch \
+ file://update_gettext_macro_version.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+S = "${WORKDIR}/clutter-${PV}"
+
+BASE_CONF += "--disable-introspection"
+
+do_configure_prepend () {
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
+
+SRC_URI[md5sum] = "71454425366d9a49948cdd2af9eafc89"
+SRC_URI[sha256sum] = "79cd42c9a208b1bd2e2a0866ad7eb047a00835beabb401e99737af846812119c"
--
1.7.7
^ permalink raw reply related
* [PATCH 03/12] clutter-gst-1.8: add 1.4.2 for use with clutter 1.8
From: Joshua Lock @ 2011-11-08 0:10 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320709417.git.josh@linux.intel.com>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../clutter/clutter-gst-1.8_1.4.2.bb | 22 ++++++++++++++++++++
.../clutter/clutter-gst/enable_tests-1.8.bb | 15 +++++++++++++
2 files changed, 37 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
new file mode 100644
index 0000000..54b1fc1
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
@@ -0,0 +1,22 @@
+require recipes-graphics/clutter/clutter-gst.inc
+
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
+
+DEPENDS += "clutter-1.8 gstreamer"
+RDEPENDS_${PN} += "gst-meta-base"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \
+ file://enable_tests-1.8.patch"
+
+S = "${WORKDIR}/clutter-gst-${PV}"
+
+SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5"
+SRC_URI[sha256sum] = "b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5"
+
+do_configure_prepend () {
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb
new file mode 100644
index 0000000..35e60ca
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb
@@ -0,0 +1,15 @@
+Install example binary needed for poky-image-clutter
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: clutter-gst-1.3.8/examples/Makefile.am
+===================================================================
+--- clutter-gst-1.3.8.orig/examples/Makefile.am
++++ clutter-gst-1.3.8/examples/Makefile.am
+@@ -1,6 +1,6 @@
+ NULL = #
+
+-noinst_PROGRAMS = video-player video-sink video-sink-navigation
++bin_PROGRAMS = video-player video-sink video-sink-navigation
+
+ INCLUDES = -I$(top_srcdir) \
+ $(MAINTAINER_CFLAGS) \
--
1.7.7
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox