Re: [OE-core] [PATCH] grub git: workaround debugedit problems for 64 bit targets
On 01/16/2014 11:47 AM, Otavio Salvador wrote: On Thu, Jan 16, 2014 at 8:46 AM, Koen Kooi koen.k...@linaro.org mailto:koen.k...@linaro.org wrote: Op 16 jan. 2014, om 11:38 heeft Otavio Salvador ota...@ossystems.com.br mailto:ota...@ossystems.com.br het volgende geschreven: On Thu, Jan 16, 2014 at 7:27 AM, Koen Kooi koen.k...@linaro.org mailto:koen.k...@linaro.org wrote: On 01/15/2014 12:22 PM, Otavio Salvador wrote: On Wed, Jan 15, 2014 at 8:15 AM, Koen Kooi koen.k...@linaro.org mailto:koen.k...@linaro.org mailto:koen.k...@linaro.org mailto:koen.k...@linaro.org wrote: I've limited it to 64bit targets, but to be honest debug splitting doesn't make sense for grub since it won't run in your rootfs and attaching gdb is pretty much impossible. Signed-off-by: Koen Kooi koen.k...@linaro.org mailto:koen.k...@linaro.org mailto:koen.k...@linaro.org mailto:koen.k...@linaro.org I'd prefer to remove the debug systems than skip the split. What others think? I'm not sure what you mean by that, do you mean using INHIBIT_PACKAGE_STRIP or something else? Yes and be sure it has been stripped during build. That seems to be a lot more work for the same effect. Stripping isn't the problem, it's debugedit trying to do its magic that fails. Well, if not stripped the symbols will be left in the binaries which is not expected. I've looked into package.bbclass and it's a classic case of code not matching docs :( -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH] package.bbclass: fix strip and split logic
Marks original commit message and variable documentation state that stripping
and splitting are independent of eachother, but package.bbclass ANDs the two
INHIBIT flags to see which files can be stripped and/or split.
Original behaviour:
INHIBIT_PACKAGE_STRIP: no strip, no debug split
INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split
Behaviour after this patch:
INHIBIT_PACKAGE_STRIP: no strip, no debug split
INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split
Signed-off-by: Koen Kooi koen.k...@linaro.org
---
meta/classes/package.bbclass | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 768047c..fa0b7eb 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -781,8 +781,7 @@ python split_and_strip_files () {
kernmods = []
libdir = os.path.abspath(dvar + os.sep + d.getVar(libdir, True))
baselibdir = os.path.abspath(dvar + os.sep + d.getVar(base_libdir, True))
-if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT', True) != '1') and \
-(d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
+if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
for root, dirs, files in cpath.walk(dvar):
for f in files:
file = os.path.join(root, f)
--
1.8.4.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] guile: don't use the identifier 'noreturn'
Fix the build error of autogen-native which depends on guile-native:
ysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:40:24: error:
expected ')' before '__attribute__'
sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:40:24: error:
expected ',' or ';' before ')' token
sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:42:27: error:
expected ')' before '__attribute__'
[YOCTO #5743]
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
.../guile/files/guile_2.0.9_fix_noreturn.patch | 65 ++
meta/recipes-devtools/guile/guile_2.0.9.bb | 1 +
2 files changed, 66 insertions(+)
create mode 100644
meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch
b/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch
new file mode 100644
index 000..3f65dce
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch
@@ -0,0 +1,65 @@
+From 36c40440078c005cd5e239cca487d29f6f60007d Mon Sep 17 00:00:00 2001
+From: Mark H Weaver m...@netris.org
+Date: Mon, 4 Nov 2013 19:41:52 -0500
+Subject: [PATCH] Don't use the identifier 'noreturn'.
+
+Fixes http://bugs.gnu.org/15798.
+Reported by Matt Sicker boa...@gmail.com.
+
+* libguile/__scm.h (SCM_NORETURN): Use ((__noreturn__)) instead of
+ ((noreturn)).
+
+* libguile/throw.h (scm_ithrow): Rename formal parameter from 'noreturn'
+ to 'no_return'.
+
+* libguile/throw.c (scm_ithrow): Rename formal parameter from 'noreturn'
+ to 'no_return'.
+---
+ libguile/__scm.h |2 +-
+ libguile/throw.c |2 +-
+ libguile/throw.h |2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+Upstream-Status: Backport
+
+diff --git a/libguile/__scm.h b/libguile/__scm.h
+index ed35d53..a0b02b6 100644
+--- a/libguile/__scm.h
b/libguile/__scm.h
+@@ -77,7 +77,7 @@
+ * 1) int foo (char arg) SCM_NORETURN;
+ */
+ #ifdef __GNUC__
+-#define SCM_NORETURN __attribute__ ((noreturn))
++#define SCM_NORETURN __attribute__ ((__noreturn__))
+ #else
+ #define SCM_NORETURN
+ #endif
+diff --git a/libguile/throw.c b/libguile/throw.c
+index 9c29351..7fc9edf 100644
+--- a/libguile/throw.c
b/libguile/throw.c
+@@ -436,7 +436,7 @@ scm_handle_by_throw (void *handler_data SCM_UNUSED, SCM
tag, SCM args)
+ }
+
+ SCM
+-scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED)
++scm_ithrow (SCM key, SCM args, int no_return SCM_UNUSED)
+ {
+ return scm_throw (key, args);
+ }
+diff --git a/libguile/throw.h b/libguile/throw.h
+index 6cf6790..62592d2 100644
+--- a/libguile/throw.h
b/libguile/throw.h
+@@ -79,7 +79,7 @@ SCM_API int scm_exit_status (SCM args);
+ SCM_API SCM scm_catch_with_pre_unwind_handler (SCM tag, SCM thunk, SCM
handler, SCM lazy_handler);
+ SCM_API SCM scm_catch (SCM tag, SCM thunk, SCM handler);
+ SCM_API SCM scm_with_throw_handler (SCM tag, SCM thunk, SCM handler);
+-SCM_API SCM scm_ithrow (SCM key, SCM args, int noreturn);
++SCM_API SCM scm_ithrow (SCM key, SCM args, int no_return);
+
+ SCM_API SCM scm_throw (SCM key, SCM args);
+ SCM_INTERNAL void scm_init_throw (void);
+--
+1.7.2.5
diff --git a/meta/recipes-devtools/guile/guile_2.0.9.bb
b/meta/recipes-devtools/guile/guile_2.0.9.bb
index 9845682..e1504bb 100644
--- a/meta/recipes-devtools/guile/guile_2.0.9.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.9.bb
@@ -19,6 +19,7 @@ SRC_URI = ${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
file://opensuse/guile-64bit.patch \
file://guile_2.0.6_fix_sed_error.patch \
file://arm_endianness.patch \
+ file://guile_2.0.9_fix_noreturn.patch \
# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] guile: don't use the identifier 'noreturn'
The following changes since commit eb0dc3fca77d82c21ad05330b006258ef363dba2: e2fsprogs/populate-extfs.sh: fix a problem on dash (2014-01-20 17:25:58 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib rbt/ag http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/ag Robert Yang (1): guile: don't use the identifier 'noreturn' .../guile/files/guile_2.0.9_fix_noreturn.patch | 65 ++ meta/recipes-devtools/guile/guile_2.0.9.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] refactor the archive*.bbcalss
Hi Mark,
I've tested the archiver.bbclass with rm_work.bbclasss again, it works for me,
it seems that you only downloaded the archiver.bbclass was not enough, would
you please try this PULL? It is really on oe-core-contrib now:-) And if the
error occurs, would you please show the configuration and error logs ?
git://git.openembedded.org/openembedded-core-contrib rbt/archiver
// Robert
On 01/18/2014 08:26 PM, Martin Jansa wrote:
On Thu, Jan 16, 2014 at 05:33:20PM +0800, Robert Yang wrote:
On 01/16/2014 05:25 PM, Martin Jansa wrote:
On Thu, Jan 16, 2014 at 10:14:30AM +0800, Robert Yang wrote:
On 01/16/2014 12:55 AM, Martin Jansa wrote:
On Tue, Jan 14, 2014 at 12:20:14AM +0800, Robert Yang wrote:
* The archive*.bbclass didn't work, and there were a few problems, for
example:
1) There were a few duplicated code
2) There was no src_dir.org (or orig), but the diff command still use
it, and it is not easy to fix this issue if we don't change a lot
of the code.
3) It didn't archive the source for the native or gcc
4) The work flow is not very well
5) The subprocess.call('fakeroot cp ' should be removed
6) And others ...
* So that we have to refactor it, the benefits are:
1) Fix the problems and make it work well.
2) Reduce more than 400 lines in total.
3) Make it easy to use.
// Robert
The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674:
bitbake: toaster: Toaster GUI, generic search, filter and order
(2014-01-10 15:20:26 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/archiver
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/archiver
Can you send pull-request for oe-core?
Here it is:
git://git.pokylinux.org/poky-contrib rbt/ar_oe
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=rbt/ar_oe
This still looks like poky-contrib (so it will download whole
poky-contrib when I add it as remote to oe-core repo).
Sorry, I can't create repo on oe-contrib, seems that I lost my key.
That's sad, you should send new one to khem to replace it, before
someone else finds your old key.
How about:
git fetch git://git.pokylinux.org/poky-contrib rbt/ar_oe
That still fetches whole poky repo I'm not interested in.
So I've downloaded just archiver.bbclass manually and tested it on my
use-case, I can confirm that it doesn't remove required file anymore,
but it seems that there is something terribly broken when used in
combination with rm_work or multimachine builds.
I haven't debugged it yet, but 2nd build (in the same directory) with
this new archiver included almost every recipe failed in do_patch task.
// Robert
Robert Yang (5):
classes/archive*.bbclass: remove archive-*-source.bbclass
archiver.bbclass: refactor it
package_rpm.bbclass: archive the source to srpm package
archiver.bbclass: move a few code to copyleft_compliance.bbclass
local.conf.sample.extended: update for the archiver
meta-yocto/conf/local.conf.sample.extended | 72 +--
meta/classes/archive-configured-source.bbclass | 65 ---
meta/classes/archive-original-source.bbclass | 65 ---
meta/classes/archive-patched-source.bbclass| 65 ---
meta/classes/archiver.bbclass | 723
-
meta/classes/copyleft_compliance.bbclass | 55 +-
meta/classes/package_rpm.bbclass | 31 +-
7 files changed, 316 insertions(+), 760 deletions(-)
delete mode 100644 meta/classes/archive-configured-source.bbclass
delete mode 100644 meta/classes/archive-original-source.bbclass
delete mode 100644 meta/classes/archive-patched-source.bbclass
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] refactor the archive*.bbcalss
Hi Martin,
I've tested the archiver.bbclass with rm_work.bbclasss again, it works for me,
it seems that you only downloaded the archiver.bbclass was not enough, would
you please try this PULL? It is based on oe-core and on oe-core-contrib now:-)
And if the error occurs, would you please show the configuration and error
logs ?
git://git.openembedded.org/openembedded-core-contrib rbt/archiver
// Robert
On 01/18/2014 08:26 PM, Martin Jansa wrote:
On Thu, Jan 16, 2014 at 05:33:20PM +0800, Robert Yang wrote:
On 01/16/2014 05:25 PM, Martin Jansa wrote:
On Thu, Jan 16, 2014 at 10:14:30AM +0800, Robert Yang wrote:
On 01/16/2014 12:55 AM, Martin Jansa wrote:
On Tue, Jan 14, 2014 at 12:20:14AM +0800, Robert Yang wrote:
* The archive*.bbclass didn't work, and there were a few problems, for
example:
1) There were a few duplicated code
2) There was no src_dir.org (or orig), but the diff command still use
it, and it is not easy to fix this issue if we don't change a lot
of the code.
3) It didn't archive the source for the native or gcc
4) The work flow is not very well
5) The subprocess.call('fakeroot cp ' should be removed
6) And others ...
* So that we have to refactor it, the benefits are:
1) Fix the problems and make it work well.
2) Reduce more than 400 lines in total.
3) Make it easy to use.
// Robert
The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674:
bitbake: toaster: Toaster GUI, generic search, filter and order
(2014-01-10 15:20:26 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/archiver
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/archiver
Can you send pull-request for oe-core?
Here it is:
git://git.pokylinux.org/poky-contrib rbt/ar_oe
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=rbt/ar_oe
This still looks like poky-contrib (so it will download whole
poky-contrib when I add it as remote to oe-core repo).
Sorry, I can't create repo on oe-contrib, seems that I lost my key.
That's sad, you should send new one to khem to replace it, before
someone else finds your old key.
How about:
git fetch git://git.pokylinux.org/poky-contrib rbt/ar_oe
That still fetches whole poky repo I'm not interested in.
So I've downloaded just archiver.bbclass manually and tested it on my
use-case, I can confirm that it doesn't remove required file anymore,
but it seems that there is something terribly broken when used in
combination with rm_work or multimachine builds.
I haven't debugged it yet, but 2nd build (in the same directory) with
this new archiver included almost every recipe failed in do_patch task.
// Robert
Robert Yang (5):
classes/archive*.bbclass: remove archive-*-source.bbclass
archiver.bbclass: refactor it
package_rpm.bbclass: archive the source to srpm package
archiver.bbclass: move a few code to copyleft_compliance.bbclass
local.conf.sample.extended: update for the archiver
meta-yocto/conf/local.conf.sample.extended | 72 +--
meta/classes/archive-configured-source.bbclass | 65 ---
meta/classes/archive-original-source.bbclass | 65 ---
meta/classes/archive-patched-source.bbclass| 65 ---
meta/classes/archiver.bbclass | 723
-
meta/classes/copyleft_compliance.bbclass | 55 +-
meta/classes/package_rpm.bbclass | 31 +-
7 files changed, 316 insertions(+), 760 deletions(-)
delete mode 100644 meta/classes/archive-configured-source.bbclass
delete mode 100644 meta/classes/archive-original-source.bbclass
delete mode 100644 meta/classes/archive-patched-source.bbclass
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 1/7] ltp: rename recipe to ltp_20140115.bb
On Mon, 2014-01-20 at 13:40 +0200, Fathi Boudra wrote: Signed-off-by: Fathi Boudra fathi.bou...@linaro.org --- meta/recipes-extended/ltp/ltp_20130904.bb | 78 --- meta/recipes-extended/ltp/ltp_20140115.bb | 78 +++ 2 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp_20130904.bb create mode 100644 meta/recipes-extended/ltp/ltp_20140115.bb So we rename the recipe but don't actually change the SRCREV to the new version (since you do that in 3/7)? This seems a little confusing? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd 208: move stray /usr/lib/systemd/* into /lib/systemd
From: Koen Kooi k...@dominion.thruhere.net
Apps testing for systemd config get confused when both /usr/lib/systemd and
/lib/systemd exist. This fixes (among other things) dracut systemd detections.
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-core/systemd/systemd_208.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_208.bb
b/meta/recipes-core/systemd/systemd_208.bb
index 6590235..710624c 100644
--- a/meta/recipes-core/systemd/systemd_208.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -113,6 +113,12 @@ do_install() {
# Delete journal README, as log can be symlinked inside volatile.
rm -f ${D}/${localstatedir}/log/README
+
+ # fix up libdir confusion
+ if [ -d ${D}${libdir}/systemd ] ; then
+ cp -a ${D}${libdir}/systemd/* ${D}${systemd_unitdir}
+ rm -rf ${D}${libdir}/systemd
+ fi
}
do_install_ptest () {
--
1.8.4.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cmake.bbclass: fix note when warning about deprecated variables
The note issues when OECMAKE_BUILDPATH and OECMAKE_SOURCEPATH were being used
stated that an in-tree build would be done, but the default is in fact an
out-of-tree build.
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/classes/cmake.bbclass |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 7ff9984..c9c15f3 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -66,7 +66,7 @@ addtask generate_toolchain_file after do_patch before
do_configure
cmake_do_configure() {
if [ ${OECMAKE_BUILDPATH} -o ${OECMAKE_SOURCEPATH} ]; then
- bbnote cmake.bbclass no longer uses OECMAKE_SOURCEPATH and
OECMAKE_BUILDPATH. This recipe now will do in-tree builds, to do out-of-tree
builds set S and B.
+ bbnote cmake.bbclass no longer uses OECMAKE_SOURCEPATH and
OECMAKE_BUILDPATH. The default behaviour is now out-of-tree builds with
B=WORKDIR/build.
fi
if [ ${S} != ${B} ]; then
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] cmake: default to out-of-tree builds
Good point, thanks. Patch sent.
Ross
On 16 January 2014 10:26, Stefan Herbrechtsmeier
ste...@herbrechtsmeier.net wrote:
Am 10.01.2014 18:54, schrieb Ross Burton:
Set B=${WORKDIR}/build in cmake.bbclass so that recipes using
cmake.bbclass do
out-of-tree builds by default.
You should update the note to reflect the new behaviour.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 1/7] ltp: rename recipe to ltp_20140115.bb
On 21 January 2014 12:41, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Mon, 2014-01-20 at 13:40 +0200, Fathi Boudra wrote: Signed-off-by: Fathi Boudra fathi.bou...@linaro.org --- meta/recipes-extended/ltp/ltp_20130904.bb | 78 --- meta/recipes-extended/ltp/ltp_20140115.bb | 78 +++ 2 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp_20130904.bb create mode 100644 meta/recipes-extended/ltp/ltp_20140115.bb So we rename the recipe but don't actually change the SRCREV to the new version (since you do that in 3/7)? This seems a little confusing? could be :) I sent the patchset as-is. I can squash the 2 patches if you prefer. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = # Package dependencies and provides. -- 1.8.4.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] refactor the archive*.bbcalss
On Tue, Jan 21, 2014 at 06:41:04PM +0800, Robert Yang wrote:
Hi Martin,
I've tested the archiver.bbclass with rm_work.bbclasss again, it works for me,
it seems that you only downloaded the archiver.bbclass was not enough, would
you please try this PULL? It is based on oe-core and on oe-core-contrib now:-)
And if the error occurs, would you please show the configuration and error
logs ?
I've tried to enable everything to test it properly, so my config
looks like this (BTW: it would be nice to show in local.conf.sample
what are the default values):
# Create source archive for complience with the licenses
# Enable all to properly test newer archiver backported from oe-core/master
INHERIT_DISTRO += archiver
ARCHIVER_MODE[src] = prepatch
ARCHIVER_MODE[diff] = 1
ARCHIVER_MODE[diff-exclude] ?= .pc autom4te.cache patches
ARCHIVER_MODE[dumpdata] = 1
ARCHIVER_MODE[recipe] = 1
ARCHIVER_MODE[log] = 1
And error in do_patch:
NOTE: recipe perf-1.0-r8: task do_patch: Started
ERROR: Error executing a python function in
/OE/openembedded-core/meta/recipes-kernel/perf/perf.bb:
OSError: [Errno 2] No such file or directory:
'/OE/tmp-eglibc/sysroots/qemux86/usr/src'
ERROR: The stack trace of python calls that resulted in this exception/failure
was:
ERROR: File do_ar_prepatch, line 6, in module
ERROR:
ERROR: File do_ar_prepatch, line 3, in do_ar_prepatch
ERROR:
ERROR: File archiver.bbclass, line 17, in create_tarball
ERROR:
ERROR: The code that was being executed was:
ERROR: 0002:def do_ar_prepatch(d):
ERROR: 0003:create_tarball(d, d.getVar('S', True), 'prepatch')
ERROR: 0004:
ERROR: 0005:
ERROR: *** 0006:do_ar_prepatch(d)
ERROR: 0007:
ERROR: [From file: 'do_ar_prepatch', lineno: 6, function: module]
ERROR: 0001:
ERROR: 0002:def do_ar_prepatch(d):
ERROR: *** 0003:create_tarball(d, d.getVar('S', True), 'prepatch')
ERROR: 0004:
ERROR: 0005:
ERROR: 0006:do_ar_prepatch(d)
ERROR: 0007:
ERROR: [From file: 'do_ar_prepatch', lineno: 3, function: do_ar_prepatch]
ERROR: 0013:srcdir = srcdir.rstrip('/')
ERROR: 0014:dirname = os.path.dirname(srcdir)
ERROR: 0015:basename = os.path.basename(srcdir)
ERROR: 0016:olddir = os.getcwd()
ERROR: *** 0017:os.chdir(dirname)
ERROR: 0018:bb.note(Creating %s % tarname)
ERROR: 0019:if (len(os.listdir(basename))) != 0:
ERROR: 0020:tar = tarfile.open(tarname, w:gz)
ERROR: 0021:tar.add(basename)
ERROR: [From file: 'archiver.bbclass', lineno: 17, function: create_tarball]
ERROR: Function failed: do_ar_prepatch
ERROR: Logfile of failure stored in:
/OE/tmp-eglibc/work/i586-oe-linux/perf/1.0-r8/temp/log.do_patch.28364
NOTE: recipe perf-1.0-r8: task do_patch: Failed
ERROR: Task 20159 (/OE/openembedded-core/meta/recipes-kernel/perf/perf.bb,
do_patch) failed with exit code '1'
git://git.openembedded.org/openembedded-core-contrib rbt/archiver
// Robert
On 01/18/2014 08:26 PM, Martin Jansa wrote:
On Thu, Jan 16, 2014 at 05:33:20PM +0800, Robert Yang wrote:
On 01/16/2014 05:25 PM, Martin Jansa wrote:
On Thu, Jan 16, 2014 at 10:14:30AM +0800, Robert Yang wrote:
On 01/16/2014 12:55 AM, Martin Jansa wrote:
On Tue, Jan 14, 2014 at 12:20:14AM +0800, Robert Yang wrote:
* The archive*.bbclass didn't work, and there were a few problems, for
example:
1) There were a few duplicated code
2) There was no src_dir.org (or orig), but the diff command still
use
it, and it is not easy to fix this issue if we don't change a
lot
of the code.
3) It didn't archive the source for the native or gcc
4) The work flow is not very well
5) The subprocess.call('fakeroot cp ' should be removed
6) And others ...
* So that we have to refactor it, the benefits are:
1) Fix the problems and make it work well.
2) Reduce more than 400 lines in total.
3) Make it easy to use.
// Robert
The following changes since commit
1b636173ca88e5ccca1992f9a12367a1189fa674:
bitbake: toaster: Toaster GUI, generic search, filter and order
(2014-01-10 15:20:26 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/archiver
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/archiver
Can you send pull-request for oe-core?
Here it is:
git://git.pokylinux.org/poky-contrib rbt/ar_oe
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=rbt/ar_oe
This still looks like poky-contrib (so it will download whole
poky-contrib when I add it as remote to oe-core repo).
Sorry, I can't create repo on oe-contrib, seems that I lost my key.
That's sad, you should send new one to khem to replace it, before
someone else finds your old key.
How about:
git fetch git://git.pokylinux.org/poky-contrib rbt/ar_oe
That still fetches whole poky repo I'm not interested
Re: [OE-core] [PATCH] systemd 208: move stray /usr/lib/systemd/* into /lib/systemd
On Tue, Jan 21, 2014 at 12:01:21PM +0100, Koen Kooi wrote:
From: Koen Kooi k...@dominion.thruhere.net
Apps testing for systemd config get confused when both /usr/lib/systemd and
/lib/systemd exist. This fixes (among other things) dracut systemd detections.
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-core/systemd/systemd_208.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_208.bb
b/meta/recipes-core/systemd/systemd_208.bb
index 6590235..710624c 100644
--- a/meta/recipes-core/systemd/systemd_208.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -113,6 +113,12 @@ do_install() {
# Delete journal README, as log can be symlinked inside volatile.
rm -f ${D}/${localstatedir}/log/README
+
+ # fix up libdir confusion
+ if [ -d ${D}${libdir}/systemd ] ; then
+ cp -a ${D}${libdir}/systemd/* ${D}${systemd_unitdir}
+ rm -rf ${D}${libdir}/systemd
+ fi
It's not your fault, but the indentation looks inconsistent with rest of
do_install()
}
do_install_ptest () {
--
1.8.4.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd 208: move stray /usr/lib/systemd/* into /lib/systemd
On 01/21/2014 02:01 PM, Martin Jansa wrote:
On Tue, Jan 21, 2014 at 12:01:21PM +0100, Koen Kooi wrote:
From: Koen Kooi k...@dominion.thruhere.net
Apps testing for systemd config get confused when both /usr/lib/systemd and
/lib/systemd exist. This fixes (among other things) dracut systemd detections.
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-core/systemd/systemd_208.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_208.bb
b/meta/recipes-core/systemd/systemd_208.bb
index 6590235..710624c 100644
--- a/meta/recipes-core/systemd/systemd_208.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -113,6 +113,12 @@ do_install() {
# Delete journal README, as log can be symlinked inside volatile.
rm -f ${D}/${localstatedir}/log/README
+
+ # fix up libdir confusion
+ if [ -d ${D}${libdir}/systemd ] ; then
+ cp -a ${D}${libdir}/systemd/* ${D}${systemd_unitdir}
+ rm -rf ${D}${libdir}/systemd
+ fi
It's not your fault, but the indentation looks inconsistent with rest of
do_install()
And I did especially pay attention to use tabs after all the meta-oe
patches I did :)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cmake: Fix freetype detection
On Sun, Jan 12, 2014 at 06:33:11PM +0100, Martin Jansa wrote:
* since last freetype upgrade cmake cannot detect it
* e.g. webkit-efl requires freetype and is failing because of this
ping
+ Ross as he is working on cmake as well as freetype
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-devtools/cmake/cmake.inc | 1 +
.../cmake/cmake/cmake-2.8.11.2-FindFreetype.patch | 47
++
2 files changed, 48 insertions(+)
create mode 100644
meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
diff --git a/meta/recipes-devtools/cmake/cmake.inc
b/meta/recipes-devtools/cmake/cmake.inc
index 69f4fe2..f76f68b 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -16,6 +16,7 @@ SRC_URI =
http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz
file://aarch64-cmake.patch \
file://aarch64-kwsys.patch \
file://qt4-fail-silent.patch \
+ file://cmake-2.8.11.2-FindFreetype.patch \
inherit autotools
diff --git
a/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
b/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
new file mode 100644
index 000..1b523c0
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
@@ -0,0 +1,47 @@
+From: Julian Ospald hasuf...@gentoo.org
+Date: Sun Dec 8 13:38:06 UTC 2013
+Subject: fix check for freetype-2.5.1
+
+Upstream-Status: Submitted http://www.cmake.org/Bug/view.php?id=14601
+
+Signed-off-by: Martin Jansa martin.ja...@gmail.com
+
+--- old/Modules/FindFreetype.cmake
new/Modules/FindFreetype.cmake
+@@ -64,6 +64,19 @@
+ PATH_SUFFIXES include/freetype2 include
+ )
+
++if(NOT FREETYPE_INCLUDE_DIR_freetype2)
++ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
++HINTS
++ ENV FREETYPE_DIR
++PATHS
++ /usr/X11R6
++ /usr/local/X11R6
++ /usr/local/X11
++ /usr/freeware
++PATH_SUFFIXES include/freetype2 include
++ )
++endif()
++
+ find_library(FREETYPE_LIBRARY
+ NAMES freetype libfreetype freetype219
+ HINTS
+@@ -82,8 +95,14 @@
+ endif()
+ set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
+
+-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS
${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h)
+-file(STRINGS ${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h
freetype_version_str
++if(EXISTS ${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h)
++ set(FREETYPE_H ${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h)
++elseif(EXISTS ${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h)
++ set(FREETYPE_H ${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h)
++endif()
++
++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
++file(STRINGS ${FREETYPE_H} freetype_version_str
+ REGEX ^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t
]+[0-9]+$)
+
+ unset(FREETYPE_VERSION_STRING)
--
1.8.5.2
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] package.bbclass: fix strip and split logic
On Tue, 2014-01-21 at 10:47 +0100, Koen Kooi wrote: Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split. Original behaviour: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split Behaviour after this patch: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split Signed-off-by: Koen Kooi koen.k...@linaro.org --- meta/classes/package.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) FWIW this resulted in a failure on minnow: http://autobuilder.yoctoproject.org/main/builders/minnow/builds/15/steps/BuildImages/logs/stdio So we may have some fixing up to do before this change can be merged... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] package.bbclass: fix strip and split logic
On 01/21/2014 02:57 PM, Richard Purdie wrote: On Tue, 2014-01-21 at 10:47 +0100, Koen Kooi wrote: Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split. Original behaviour: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split Behaviour after this patch: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split Signed-off-by: Koen Kooi koen.k...@linaro.org --- meta/classes/package.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) FWIW this resulted in a failure on minnow: http://autobuilder.yoctoproject.org/main/builders/minnow/builds/15/steps/BuildImages/logs/stdio So we may have some fixing up to do before this change can be merged... I have that QA issue as warning not as error. I guess that's why my builds kept working :) Aside from that, what are your thoughts on this patch? regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] package.bbclass: fix strip and split logic
On 1/21/14, 8:03 AM, Koen Kooi wrote: On 01/21/2014 02:57 PM, Richard Purdie wrote: On Tue, 2014-01-21 at 10:47 +0100, Koen Kooi wrote: Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split. Original behaviour: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split Behaviour after this patch: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split My memory of the original theory was that there would be three different uses: 1 - I want no debug (stripped) software on the target and debug binaries (split) 2 - I want debug (not-stripped/not-split) software on the target 3 - I want no debug (stripped) software on the target, and I don't want debug binaries So based on that, it looks like your change fixes things. As the original implementation didn't allow for #3. --Mark Signed-off-by: Koen Kooi koen.k...@linaro.org --- meta/classes/package.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) FWIW this resulted in a failure on minnow: http://autobuilder.yoctoproject.org/main/builders/minnow/builds/15/steps/BuildImages/logs/stdio So we may have some fixing up to do before this change can be merged... I have that QA issue as warning not as error. I guess that's why my builds kept working :) Aside from that, what are your thoughts on this patch? regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] Fixes for pybootchartgui
This corrects and improves pybootchartgui. It starts by correcting two flaws introduced in my last update of pybootchartgui. It then makes a little simplification, followed up by improving the naming of split output files. Finally it introduces a new option (--full-time or -T) which makes sure the graph(s) always show the full time span regadless of which bars are currently shown (this is especially useful in combination with the -s option). //Peter The following changes since commit 1105b46d8f0174edbc315370835546e8ba5f7fd9: poky.conf: Remove Debian Squeeze from SANITY_TESTED_DISTROS (2014-01-21 10:45:29 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib pkj/pybootchartgui2 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/pybootchartgui2 Peter Kjellerstedt (5): pybootchartgui: Make the -s option work again pybootchartgui: Correct the legend pybootchartgui: Simplify adding processes to the trace pybootchartgui: Adopt the width of the index in split output files pybootchartgui: Add option -T to allways use the full time scripts/pybootchartgui/pybootchartgui/draw.py| 8 ++- scripts/pybootchartgui/pybootchartgui/main.py.in | 8 ++- scripts/pybootchartgui/pybootchartgui/parsing.py | 63 3 files changed, 43 insertions(+), 36 deletions(-) -- 1.8.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] pybootchartgui: Add option -T to allways use the full time
When --full-time (or -T) is used, the graph allways shows the full
time regardless of which processes are currently shown. This is
especially useful in combinationm with the -s flag when outputting to
multiple files.
Signed-off-by: Peter Kjellerstedt peter.kjellerst...@axis.com
---
scripts/pybootchartgui/pybootchartgui/draw.py| 6 +-
scripts/pybootchartgui/pybootchartgui/main.py.in | 4 +++-
scripts/pybootchartgui/pybootchartgui/parsing.py | 15 ---
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py
b/scripts/pybootchartgui/pybootchartgui/draw.py
index 4a2ffd7..8c574be 100644
--- a/scripts/pybootchartgui/pybootchartgui/draw.py
+++ b/scripts/pybootchartgui/pybootchartgui/draw.py
@@ -314,6 +314,10 @@ def extents(options, xscale, trace):
end = trace.processes[proc][1]
processes += 1
+ if trace.min is not None and trace.max is not None:
+ start = trace.min
+ end = trace.max
+
w = int ((end - start) * sec_w_base * xscale) + 2 * off_x
h = proc_h * processes + header_h + 2 * off_y
@@ -433,7 +437,7 @@ def render_processes_chart(ctx, options, trace, curr_y, w,
h, sec_w):
y = curr_y+header_h
-offset = min(trace.start.keys())
+offset = trace.min or min(trace.start.keys())
for s in sorted(trace.start.keys()):
for val in sorted(trace.start[s]):
if not options.app_options.show_all and \
diff --git a/scripts/pybootchartgui/pybootchartgui/main.py.in
b/scripts/pybootchartgui/pybootchartgui/main.py.in
index e9d2c74..21bb0be 100644
--- a/scripts/pybootchartgui/pybootchartgui/main.py.in
+++ b/scripts/pybootchartgui/pybootchartgui/main.py.in
@@ -65,6 +65,8 @@ def _mk_options_parser():
# To create a single annotation when any one of a
set of processes is started, use commas to separate the names)
# parser.add_option(--annotate-file, dest=annotate_file,
metavar=FILENAME, default=None,
#help=filename to write annotation points to)
+ parser.add_option(-T, --full-time, action=store_true,
dest=full_time, default=False,
+ help=display the full time regardless of which
processes are currently shown)
return parser
class Writer:
@@ -153,7 +155,7 @@ def main(argv=None):
finally:
f.close()
filename = _get_filename(options.output)
- res_list = parsing.split_res(res, options.num)
+ res_list = parsing.split_res(res, options)
n = 1
width = len(str(len(res_list)))
s = _%%0%dd. % width
diff --git a/scripts/pybootchartgui/pybootchartgui/parsing.py
b/scripts/pybootchartgui/pybootchartgui/parsing.py
index 1cb4466..d423b9f 100644
--- a/scripts/pybootchartgui/pybootchartgui/parsing.py
+++ b/scripts/pybootchartgui/pybootchartgui/parsing.py
@@ -38,6 +38,8 @@ class Trace:
self.processes = {}
self.start = {}
self.end = {}
+self.min = None
+self.max = None
self.headers = None
self.disk_stats = None
self.ps_stats = None
@@ -55,6 +57,10 @@ class Trace:
if not self.valid():
raise ParseError(empty state: '%s' does not contain a valid
bootchart % , .join(paths))
+if options.full_time:
+self.min = min(self.start.keys())
+self.max = max(self.end.keys())
+
return
# Turn that parsed information into something more useful
@@ -700,12 +706,12 @@ def parse_paths(writer, state, paths):
state = parse_file(writer, state, path)
return state
-def split_res(res, n):
+def split_res(res, options):
Split the res into n pieces
res_list = []
-if n 1:
+if options.num 1:
s_list = sorted(res.start.keys())
-frag_size = len(s_list) / float(n)
+frag_size = len(s_list) / float(options.num)
# Need the top value
if frag_size int(frag_size):
frag_size = int(frag_size + 1)
@@ -716,6 +722,9 @@ def split_res(res, n):
end = frag_size
while start end:
state = Trace(None, [], None)
+if options.full_time:
+state.min = min(res.start.keys())
+state.max = max(res.end.keys())
for i in range(start, end):
# Add this line for reference
#state.add_process(pn + : + task, start, end)
--
1.8.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] pybootchartgui: Adopt the width of the index in split output files
Add minimum width zero-padding to the index used in split output files with -s and -o. I.e., if -s 200 is used, then the index will be zero-padded to three digits width. Signed-off-by: Peter Kjellerstedt peter.kjellerst...@axis.com --- scripts/pybootchartgui/pybootchartgui/main.py.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/pybootchartgui/pybootchartgui/main.py.in b/scripts/pybootchartgui/pybootchartgui/main.py.in index cc9c40b..e9d2c74 100644 --- a/scripts/pybootchartgui/pybootchartgui/main.py.in +++ b/scripts/pybootchartgui/pybootchartgui/main.py.in @@ -155,11 +155,13 @@ def main(argv=None): filename = _get_filename(options.output) res_list = parsing.split_res(res, options.num) n = 1 + width = len(str(len(res_list))) + s = _%%0%dd. % width for r in res_list: if len(res_list) == 1: f = filename + . + options.format else: - f = filename + _ + str(n) + . + options.format + f = filename + s % n + options.format n = n + 1 def render(): batch.render(writer, r, options, f) -- 1.8.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] pybootchartgui: Simplify adding processes to the trace
Signed-off-by: Peter Kjellerstedt peter.kjellerst...@axis.com --- scripts/pybootchartgui/pybootchartgui/parsing.py | 39 +--- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/scripts/pybootchartgui/pybootchartgui/parsing.py b/scripts/pybootchartgui/pybootchartgui/parsing.py index 0600b51..1cb4466 100644 --- a/scripts/pybootchartgui/pybootchartgui/parsing.py +++ b/scripts/pybootchartgui/pybootchartgui/parsing.py @@ -96,6 +96,16 @@ class Trace: return self.headers != None and self.disk_stats != None and \ self.ps_stats != None and self.cpu_stats != None +def add_process(self, process, start, end): +self.processes[process] = [start, end] +if start not in self.start: +self.start[start] = [] +if process not in self.start[start]: +self.start[start].append(process) +if end not in self.end: +self.end[end] = [] +if process not in self.end[end]: +self.end[end].append(process) def compile(self, writer): @@ -645,16 +655,7 @@ def _do_parse(writer, state, filename, file): elif line.startswith(Ended:): end = int(float(line.split()[-1])) if start and end: -k = pn + : + task -state.processes[pn + : + task] = [start, end] -if start not in state.start: -state.start[start] = [] -if k not in state.start[start]: -state.start[start].append(pn + : + task) -if end not in state.end: -state.end[end] = [] -if k not in state.end[end]: -state.end[end].append(pn + : + task) +state.add_process(pn + : + task, start, end) t2 = clock() writer.info( %s seconds % str(t2-t1)) return state @@ -716,22 +717,10 @@ def split_res(res, n): while start end: state = Trace(None, [], None) for i in range(start, end): -# Add these lines for reference -#state.processes[pn + : + task] = [start, end] -#state.start[start] = pn + : + task -#state.end[end] = pn + : + task +# Add this line for reference +#state.add_process(pn + : + task, start, end) for p in res.start[s_list[i]]: -s = s_list[i] -e = res.processes[p][1] -state.processes[p] = [s, e] -if s not in state.start: -state.start[s] = [] -if p not in state.start[s]: -state.start[s].append(p) -if e not in state.end: -state.end[e] = [] -if p not in state.end[e]: -state.end[e].append(p) +state.add_process(p, s_list[i], res.processes[p][1]) start = end end = end + frag_size if end len(s_list): -- 1.8.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] pybootchartgui: Make the -s option work again
[YOCTO #5588] Signed-off-by: Peter Kjellerstedt peter.kjellerst...@axis.com --- scripts/pybootchartgui/pybootchartgui/parsing.py | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/pybootchartgui/pybootchartgui/parsing.py b/scripts/pybootchartgui/pybootchartgui/parsing.py index daee593..0600b51 100644 --- a/scripts/pybootchartgui/pybootchartgui/parsing.py +++ b/scripts/pybootchartgui/pybootchartgui/parsing.py @@ -50,9 +50,10 @@ class Trace: self.parent_map = None self.mem_stats = None -parse_paths (writer, self, paths) -if not self.valid(): -raise ParseError(empty state: '%s' does not contain a valid bootchart % , .join(paths)) +if len(paths): +parse_paths (writer, self, paths) +if not self.valid(): +raise ParseError(empty state: '%s' does not contain a valid bootchart % , .join(paths)) return @@ -713,7 +714,7 @@ def split_res(res, n): start = 0 end = frag_size while start end: -state = ParserState() +state = Trace(None, [], None) for i in range(start, end): # Add these lines for reference #state.processes[pn + : + task] = [start, end] -- 1.8.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] package.bbclass: fix strip and split logic
On Tue, 2014-01-21 at 15:03 +0100, Koen Kooi wrote: On 01/21/2014 02:57 PM, Richard Purdie wrote: On Tue, 2014-01-21 at 10:47 +0100, Koen Kooi wrote: Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split. Original behaviour: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split Behaviour after this patch: INHIBIT_PACKAGE_STRIP: no strip, no debug split INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split Signed-off-by: Koen Kooi koen.k...@linaro.org --- meta/classes/package.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) FWIW this resulted in a failure on minnow: http://autobuilder.yoctoproject.org/main/builders/minnow/builds/15/steps/BuildImages/logs/stdio So we may have some fixing up to do before this change can be merged... I have that QA issue as warning not as error. I guess that's why my builds kept working :) Aside from that, what are your thoughts on this patch? I'm ok with it in principle but I'd like to see known build issues fixed before it goes in since red autobuilders cause me enough grief already ;-). Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] strange directories inside sdk build with with dora
Hi, I build a sdk with latest stable dora and in includes some x86 directories in the arm sysroot: pwd /opt/poky/1.5.1/sysroots/armv5te-poky-linux-gnueabi find | grep /opt ./opt ./opt/poky ./opt/poky/1.5.1 ./opt/poky/1.5.1/sysroots ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/bin ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/bin/chsh ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/bin/newgrp ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/bin/passwd ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/bin/opkg ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/bin/chfn ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/bin/groups ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/sbin ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/usr/sbin/chpasswd ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/bin ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/bin/su ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/bin/login ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/etc ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/etc/rcS.d ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/etc/rcS.d/S98run-postinsts ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/sbin ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/sbin/vigr ./opt/poky/1.5.1/sysroots/x86_64-pokysdk-linux/sbin/vipw Are the really used or are the just got wrongly included? Bye Henning ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cmake: Fix freetype detection
On 21 January 2014 13:02, Martin Jansa martin.ja...@gmail.com wrote: + Ross as he is working on cmake as well as freetype I think I need to state for the record that I only fixed up cmake's S/B stuff because it was driving me insane, and hate cmake. :) Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Membership in the OpenEmbedded eV
The OpenEmbedded eV is the organizational structure of the OpenEmbedded project. See: http://www.openembedded.org/wiki/Organization The Organization itself doesn't have much to do with the day to day work of the project, but does provide contact points for outside entities and the membership selects members of the Technical Steering Commmittee (and the eV board). If you are interested in the long term operation of the project and like a louder voice, I'd like to invite you to join the eV. The process is send me a short (one paragraph) bio including some information about your involvement with the project. I'll package these bios into a list and submit them to the current membership for approval via the eV online voting process. (The process takes about a month, due to the length of the discussion and voting periods). Philip ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [dylan][PATCH 2/2] guile: fix build with Texinfo 5.0
Backport a patch from upstream which fixes failures building
guile-native on newer distros such as Ubuntu 13.10. (This does not
affect dora or master because we are using Guile 2.0.9 there, which
already contains this patch.)
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
.../0001-doc-Fix-build-with-Texinfo-5.0.patch | 71 ++
meta/recipes-devtools/guile/guile_2.0.7.bb | 1 +
2 files changed, 72 insertions(+)
create mode 100644
meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
diff --git
a/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
b/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
new file mode 100644
index 000..f39905c
--- /dev/null
+++
b/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
@@ -0,0 +1,71 @@
+From 183d2ace576710079a2bcf2a8bfcbc39b7d9becc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= l...@gnu.org
+Date: Fri, 1 Mar 2013 17:49:24 +0100
+Subject: [PATCH] doc: Fix build with Texinfo 5.0.
+
+* doc/ref/api-control.texi (Handling Errors): Move misplaced description
+ for `scm_memory_error' co.
+* doc/ref/r6rs.texi (rnrs base): Change `deffnx' of `let-syntax' and
+ `letrec-syntax' to fit on one line.
+
+Upstream-Status: Backport [in 2.0.9 release]
+
+Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
+
+---
+ doc/ref/api-control.texi | 6 +++---
+ doc/ref/r6rs.texi| 8 +++-
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/doc/ref/api-control.texi b/doc/ref/api-control.texi
+index 95c4925..ea943d3 100644
+--- a/doc/ref/api-control.texi
b/doc/ref/api-control.texi
+@@ -1,7 +1,7 @@
+ @c -*-texinfo-*-
+ @c This is part of the GNU Guile Reference Manual.
+-@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2011,
2012
+-@c Free Software Foundation, Inc.
++@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010,
++@c 2011, 2012, 2013 Free Software Foundation, Inc.
+ @c See the file guile.texi for copying conditions.
+
+ @node Control Mechanisms
+@@ -1732,8 +1732,8 @@ and the call to these routines doesn't change
@code{errno}.
+ @deftypefnx {C Function} void scm_wrong_type_arg (char *@var{subr}, int
@var{argnum}, SCM @var{bad_value})
+ @deftypefnx {C Function} void scm_wrong_type_arg_msg (char *@var{subr}, int
@var{argnum}, SCM @var{bad_value}, const char *@var{expected})
+ @deftypefnx {C Function} void scm_memory_error (char *@var{subr})
+-Throw an error with the various keys described above.
+ @deftypefnx {C Function} void scm_misc_error (const char *@var{subr}, const
char *@var{message}, SCM @var{args})
++Throw an error with the various keys described above.
+
+ In @code{scm_wrong_num_args}, @var{proc} should be a Scheme symbol
+ which is the name of the procedure incorrectly invoked. The other
+diff --git a/doc/ref/r6rs.texi b/doc/ref/r6rs.texi
+index 2028ada..13f9e20 100644
+--- a/doc/ref/r6rs.texi
b/doc/ref/r6rs.texi
+@@ -1,6 +1,6 @@
+ @c -*-texinfo-*-
+ @c This is part of the GNU Guile Reference Manual.
+-@c Copyright (C) 2010, 2011, 2012
++@c Copyright (C) 2010, 2011, 2012, 2013
+ @c Free Software Foundation, Inc.
+ @c See the file guile.texi for copying conditions.
+
+@@ -273,10 +273,8 @@ grouped below by the existing manual sections to which
they correspond.
+ @end deffn
+
+ @deffn {Scheme Syntax} define-syntax keyword expression
+-@deffnx {Scheme Syntax} let-syntax ((keyword transformer) @dots{})
+-exp1 exp2 @dots{}
+-@deffnx {Scheme Syntax} letrec-syntax ((keyword transformer) @dots{})
+-exp1 exp2 @dots{}
++@deffnx {Scheme Syntax} let-syntax ((keyword transformer) @dots{}) exp1 exp2
@dots{}
++@deffnx {Scheme Syntax} letrec-syntax ((keyword transformer) @dots{}) exp1
exp2 @dots{}
+ @xref{Defining Macros}, for documentation.
+ @end deffn
+
+--
+1.8.4.2
+
diff --git a/meta/recipes-devtools/guile/guile_2.0.7.bb
b/meta/recipes-devtools/guile/guile_2.0.7.bb
index 5863014..e7191a7 100644
--- a/meta/recipes-devtools/guile/guile_2.0.7.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.7.bb
@@ -20,6 +20,7 @@ SRC_URI = ${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
file://guile_2.0.6_fix_sed_error.patch \
file://arm_endianness.patch \
file://fix_parallel_build_issue.patch \
+ file://0001-doc-Fix-build-with-Texinfo-5.0.patch \
# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
--
1.8.4.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [dylan][PATCH 1/2] grep: Add patch for texinfo 5.1
From: Saul Wold s...@linux.intel.com
(From OE-Core master rev: bc6258f88705b0e7989089a8666ac5e5d2355823)
Signed-off-by: Saul Wold s...@linux.intel.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
.../grep/grep-2.5.1a/fix-for-texinfo-5.1.patch | 13 +
meta/recipes-extended/grep/grep_2.5.1a.bb | 1 +
2 files changed, 14 insertions(+)
create mode 100644
meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
b/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
new file mode 100644
index 000..02dbd20
--- /dev/null
+++ b/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
@@ -0,0 +1,13 @@
+Index: grep-2.5.1a/doc/grep.texi
+===
+--- grep-2.5.1a.orig/doc/grep.texi
grep-2.5.1a/doc/grep.texi
+@@ -288,7 +288,7 @@ This version number should be included i
+ Print a usage message briefly summarizing these command-line options
+ and the bug-reporting address, then exit.
+
+-@itemx --binary-files=@var{type}
++@item --binary-files=@var{type}
+ @opindex --binary-files
+ @cindex binary files
+ If the first few bytes of a file indicate that the file contains binary
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb
b/meta/recipes-extended/grep/grep_2.5.1a.bb
index 247c837..088959c 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -14,6 +14,7 @@ SRC_URI = ${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://fix64-int-to-pointer.patch \
file://Makevars \
file://grep-CVE-2012-5667.patch \
+ file://fix-for-texinfo-5.1.patch \
SRC_URI[md5sum] = 52202fe462770fa6be1bb667bd6cf30c
--
1.8.4.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [dylan][PATCH 0/2] Texinfo fixes for dylan
One backport from master (already in dora) and one dylan-specific patch to fix failures building dylan on newer distributions such as Ubuntu 13.10. The following changes since commit bca606597de6c5c2de98ae1949857e4481623939: build-appliance-image: Update to dylan head revision (2014-01-15 17:49:59 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/dylan-next http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dylan-next Paul Eggleton (1): guile: fix build with Texinfo 5.0 Saul Wold (1): grep: Add patch for texinfo 5.1 .../0001-doc-Fix-build-with-Texinfo-5.0.patch | 71 ++ meta/recipes-devtools/guile/guile_2.0.7.bb | 1 + .../grep/grep-2.5.1a/fix-for-texinfo-5.1.patch | 13 meta/recipes-extended/grep/grep_2.5.1a.bb | 1 + 4 files changed, 86 insertions(+) create mode 100644 meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch create mode 100644 meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch -- 1.8.4.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Revert cross-canadian: Handle powerpc linux verses linux-gnuspe
Hi, Yes, the gcc configured for SPE (--target=powerpc-fsl_networking-linux-gnuspe) can generate both SPE and non-SPE code provided that software floating point is used. There are a couple of parameters (-mabi=no-spe -mno-spe) that will turn off SPE vector instructions generation. If the code contains floating point arithmethic -msoft-float needs to be used as well. This means that the GCC multilib setup has to be configured to include soft float and build coresponding version of libgcc and target fragments. But why would we want to generate code without SPE for e500v1/v2? Soft-float comes with a major performance penalty. Maybe I didn't understand correctly what kind of toolchain you want to be built in the end. Do you want to have a single GCC that builds all powerpc targets (e500v2, e5500, e6500 etc) and a separate sysroot for each target? This may be problematic since, for example, the compiler that can generate SPE (for e500v2) can't generate altivec instructions (for e6500). Kind regards, Alex -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Saturday, January 18, 2014 1:20 PM To: Sardan Alexandru Cezar-B41700 Cc: David Nyström; Luo Zhenhua-B19537; openembedded- c...@lists.openembedded.org Subject: Re: [OE-core] [PATCH] Revert cross-canadian: Handle powerpc linux verses linux-gnuspe On Fri, 2014-01-17 at 14:43 +, alexandru.sar...@freescale.com wrote: e500v1/v2 uses SPE to handle floating point operations using general purpose regs. So using the non-SPE compiler with SPE libraries won't work. However the soft-fp libraries are compatible with the e500 ABI (with a considerable performance penalty). From what I can see, eglibc is built with SPE. So GCC should be built also for SPE (target powerpc-poky-linux-gnuspe). The key question is this: Can one gcc binary generate code for both non-SPE and SPE targets, assuming its pointed at an appropriate sysroot containing appropriate libraries? If we can have one such binary, how do we configure it? If we can't, we need to redo the way gcc-cross-canadian is working on powerpc. The change there was to have one gcc for each different target architecture rather than each tune since that was horribly inefficient. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Revert cross-canadian: Handle powerpc linux verses linux-gnuspe
On Tue, 2014-01-21 at 17:39 +, alexandru.sar...@freescale.com wrote: Yes, the gcc configured for SPE (--target=powerpc-fsl_networking-linux-gnuspe) can generate both SPE and non-SPE code provided that software floating point is used. There are a couple of parameters (-mabi=no-spe -mno-spe) that will turn off SPE vector instructions generation. If the code contains floating point arithmethic -msoft-float needs to be used as well. This means that the GCC multilib setup has to be configured to include soft float and build coresponding version of libgcc and target fragments. But why would we want to generate code without SPE for e500v1/v2? Soft-float comes with a major performance penalty. Maybe I didn't understand correctly what kind of toolchain you want to be built in the end. Do you want to have a single GCC that builds all powerpc targets (e500v2, e5500, e6500 etc) and a separate sysroot for each target? Yes, this is exactly what is wanted. This is how the SDK is intended to operate. The alternative and what we had before was a separate compiler for each target which is rather wasteful. This may be problematic since, for example, the compiler that can generate SPE (for e500v2) can't generate altivec instructions (for e6500). Is there no way to configure gcc so it can generate for the different targets assuming you pass in the right runtime target options? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] lsbinitscripts: Update to 9.52
Signed-off-by: Saul Wold s...@linux.intel.com
---
.../lsb/{lsbinitscripts_9.50.bb = lsbinitscripts_9.52.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.50.bb =
lsbinitscripts_9.52.bb} (78%)
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.50.bb
b/meta/recipes-extended/lsb/lsbinitscripts_9.52.bb
similarity index 78%
rename from meta/recipes-extended/lsb/lsbinitscripts_9.50.bb
rename to meta/recipes-extended/lsb/lsbinitscripts_9.52.bb
index 347fa7f..11deae2 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.50.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.52.bb
@@ -6,12 +6,12 @@ DEPENDS = popt glib-2.0
LIC_FILES_CHKSUM = file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6
S=${WORKDIR}/initscripts-${PV}
-SRC_URI =
http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.50.tar.bz2/7252642952d33be10cc00beb862c7b7b/initscripts-9.50.tar.bz2
\
+SRC_URI =
http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/2453811ec27a781a77f309f356663d9e/initscripts-${PV}.tar.bz2
\
file://functions.patch \
-SRC_URI[md5sum] = 7252642952d33be10cc00beb862c7b7b
-SRC_URI[sha256sum] =
1d8fb32b9a7de0c24437acdab27d71deb58c05314f81978ec2aea574fba862e0
+SRC_URI[md5sum] = 2453811ec27a781a77f309f356663d9e
+SRC_URI[sha256sum] =
0b3bb828a5d3a3f210b8e606c0416813ba0d021a859658af14810865d2ee8867
inherit update-alternatives
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] libcgroup: Update to 0.41
Signed-off-by: Saul Wold s...@linux.intel.com
---
.../libcgroup/{libcgroup_0.38.bb = libcgroup_0.41.bb}| 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-core/libcgroup/{libcgroup_0.38.bb = libcgroup_0.41.bb}
(88%)
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.38.bb
b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
similarity index 88%
rename from meta/recipes-core/libcgroup/libcgroup_0.38.bb
rename to meta/recipes-core/libcgroup/libcgroup_0.41.bb
index 8bd0ead..5db1079 100644
--- a/meta/recipes-core/libcgroup/libcgroup_0.38.bb
+++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
@@ -6,16 +6,14 @@ SECTION = libs
LICENSE = LGPLv2.1
LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1
-PR = r1
-
inherit autotools pkgconfig
DEPENDS = ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}
-SRC_URI =
${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v.038/${BPN}-${PV}.tar.bz2
+SRC_URI =
${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2
-SRC_URI[md5sum] = f0f7d4060bf36ccc19d75dbf4f1695db
-SRC_URI[sha256sum] =
5d36d1a48b95f62fe9fcdf74a5a4089512e5e43e6011aa1504fd6f2a0909867f
+SRC_URI[md5sum] = 3dea9d50b8a5b73ff0bf1cdcb210f63f
+SRC_URI[sha256sum] =
e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
EXTRA_OECONF = ${@base_contains('DISTRO_FEATURES', 'pam',
'--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes',
'--enable-pam=no', d)}
--
1.8.3.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
On 01/21/2014 04:17 AM, Paul Eggleton wrote: The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = This seems to have caused a couple of problems with shadow-securetty, updaterc and depmodwrapper. There may be more. I will look to see what I can do to fix those recipes. Sau! # Package dependencies and provides. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
Hi Saul, On Tuesday 21 January 2014 14:09:16 Saul Wold wrote: On 01/21/2014 04:17 AM, Paul Eggleton wrote: The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = This seems to have caused a couple of problems with shadow-securetty, updaterc and depmodwrapper. There may be more. Can you perhaps be more specific as to what the problem is? Thanks, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
On Tue, 2014-01-21 at 12:17 +, Paul Eggleton wrote: The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = Perhaps we just shouldn't set it at all in bitbake.conf and let recipes elect to set it? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
On 01/21/2014 02:12 PM, Paul Eggleton wrote: Hi Saul, On Tuesday 21 January 2014 14:09:16 Saul Wold wrote: On 01/21/2014 04:17 AM, Paul Eggleton wrote: The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = This seems to have caused a couple of problems with shadow-securetty, updaterc and depmodwrapper. There may be more. Can you perhaps be more specific as to what the problem is? Sorry, thought perhaps you would see the autobuilder failures. ERROR: Task 1962 (/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-arm/build/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb, do_package_write_rpm) failed with exit code '1' NOTE: recipe shadow-securetty-4.1.4.3-r2: task do_package_write_deb: Started ERROR: Function failed: dpkg-deb execution failed ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-arm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/shadow-securetty/4.1.4.3-r2/temp/log.do_package_write_deb.8751 Log data follows: | DEBUG: Executing python function sstate_task_prefunc | DEBUG: Python function sstate_task_prefunc finished | DEBUG: Executing python function do_package_write_deb | DEBUG: Executing python function read_subpackage_metadata | DEBUG: Python function read_subpackage_metadata finished | DEBUG: Executing python function do_package_deb | dpkg-deb: error: parsing file '/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-arm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/shadow-securetty/4.1.4.3-r2/packages-split/shadow-securetty-dbg/DEBIAN/control' near line 11 package 'shadow-securetty-dbg': | EOF before value of field `Homepage' (missing final newline) | DEBUG: Python function do_package_deb finished | DEBUG: Python function do_package_write_deb finished | ERROR: Function failed: dpkg-deb execution failed NOTE: recipe shadow-securetty-4.1.4.3-r2: task do_package_write_deb: Failed ERROR: Task 4847 (/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-arm/build/meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb, do_package_write_deb) failed with exit code '1' ERROR: Function failed: BUILDSPEC (log file is located at /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-arm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/shadow-securetty/4.1.4.3-r2/temp/log.do_package_write_rpm.8020) ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-arm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/shadow-securetty/4.1.4.3-r2/temp/log.do_package_write_rpm.8020 Log data follows: | DEBUG: Executing python function sstate_task_prefunc | DEBUG: Python function sstate_task_prefunc finished | DEBUG: Executing python function do_package_write_rpm | DEBUG: Executing python function read_subpackage_metadata | DEBUG: Python function read_subpackage_metadata finished | DEBUG: Executing python function do_package_rpm | DEBUG: Executing python function write_specfile | NOTE: Creating EMPTY RPM Package for shadow-securetty-dbg | NOTE: Not creating empty RPM package for shadow-securetty-staticdev | NOTE: Creating EMPTY RPM Package for shadow-securetty-dev | NOTE: Not creating empty RPM package for shadow-securetty-doc | NOTE: Not creating empty RPM package for shadow-securetty-locale | NOTE: Creating RPM package for shadow-securetty | NOTE: Creating RPM package for shadow-securetty | DEBUG: Python function write_specfile finished | DEBUG: Executing shell function BUILDSPEC | error: line 8: Empty tag: URL: | error: Package has no %description: shadow-securetty-4.1.4.3-r2.qemuarm | Building target platforms: qemuarm-poky-linux-gnueabi | WARNING: /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-arm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/shadow-securetty/4.1.4.3-r2/temp/run.BUILDSPEC.8020:1 exit 1 from | rpmbuild --nodeps --short-circuit --target
[OE-core] [PATCH 06/15] tune-corei7: Add support for cpu-type corei7
corei7 offers a significant advancement since the previous core2
cpu-type described in the tune-core2 file.
From the GCC(1):
Intel Core i7 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3,
SSSE3, SSE4.1 and SSE4.2 instruction set support.
This offers optimizations for Nehalem and Silvermont (e.g. Bay Trail)
CPUs (and beyond).
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/tune-corei7.inc | 35 +
1 file changed, 35 insertions(+)
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 000..5464fed
--- /dev/null
+++ b/meta/conf/machine/include/tune-corei7.inc
@@ -0,0 +1,35 @@
+# Settings for the GCC(1) cpu-type corei7:
+#
+# Intel Core i7 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3,
SSE4.1
+# and SSE4.2 instruction set support.
+#
+# This tune is recommended for Intel Nehalem and Silvermont (e.g. Bay Trail)
CPUs
+# (and beyond).
+#
+DEFAULTTUNE ?= corei7-64
+
+# Pull in the previous tune in to pull in PACKAGE_EXTRA_ARCHS
+require conf/machine/include/tune-core2.inc
+
+# Extra tune features
+TUNEVALID[corei7] = Enable corei7 specific processor optimizations
+TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, corei7,
-march=corei7 -mtune=corei7 -mfpmath=sse -msse4.2, , d)}
+
+# Extra tune selections
+AVAILTUNES += corei7-32
+TUNE_FEATURES_tune-corei7-32 = ${TUNE_FEATURES_tune-x86} corei7
+BASE_LIB_tune-corei7-32 = lib
+TUNE_PKGARCH_tune-corei7-32 = corei7_32
+PACKAGE_EXTRA_ARCHS_tune-corei7-32 = ${PACKAGE_EXTRA_ARCHS_tune-core2}
corei7_32
+
+AVAILTUNES += corei7-64
+TUNE_FEATURES_tune-corei7-64 = ${TUNE_FEATURES_tune-x86-64} corei7
+BASE_LIB_tune-corei7-64 = lib64
+TUNE_PKGARCH_tune-corei7-64 = corei7_64
+PACKAGE_EXTRA_ARCHS_tune-corei7-64 = ${PACKAGE_EXTRA_ARCHS_tune-core2-64}
corei7_64
+
+AVAILTUNES += corei7-64-x32
+TUNE_FEATURES_tune-corei7-64-x32 = ${TUNE_FEATURES_tune-x86-64-x32} corei7
+BASE_LIB_tune-corei7-64-x32 = libx32
+TUNE_PKGARCH_tune-corei7-64-x32 = corei7_64_x32
+PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 =
${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7_64_x32
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/15] x86: Replace ia32 with x86 when referring to the generic architecture
ia32 implies 32bit, while these files provide descriptions for IA32,
X86_64, and X32 architectures. The term x86 fits this used better
without resorting to using the term Intel which isn't quite right as
it excludes things like the tune-c3 file describing a Via CPU.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/tune-c3.inc |2 +-
meta/conf/machine/include/tune-i586.inc|2 +-
meta/conf/machine/include/tune-x86_64.inc |2 +-
.../include/{ia32-base.inc = x86-base.inc}| 16
meta/conf/machine/include/{ia32 = x86}/README |6 +++---
.../{ia32/arch-ia32.inc = x86/arch-x86.inc} |2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
rename meta/conf/machine/include/{ia32-base.inc = x86-base.inc} (75%)
rename meta/conf/machine/include/{ia32 = x86}/README (81%)
rename meta/conf/machine/include/{ia32/arch-ia32.inc = x86/arch-x86.inc} (97%)
diff --git a/meta/conf/machine/include/tune-c3.inc
b/meta/conf/machine/include/tune-c3.inc
index 18865b7..fafc28a 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
TUNEVALID[c3] = VIA Cyrix III or VIA C3 specific optimizations
TUNECONFLICTS[c3] = m64 mx32
diff --git a/meta/conf/machine/include/tune-i586.inc
b/meta/conf/machine/include/tune-i586.inc
index 4542b9b..a315b35 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,6 +1,6 @@
DEFAULTTUNE ?= i586
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
# Extra tune features
TUNEVALID[i586] = Enable i586 specific processor optimizations
diff --git a/meta/conf/machine/include/tune-x86_64.inc
b/meta/conf/machine/include/tune-x86_64.inc
index 31e06da..ae48124 100644
--- a/meta/conf/machine/include/tune-x86_64.inc
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -1,4 +1,4 @@
DEFAULTTUNE ?= x86-64
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
diff --git a/meta/conf/machine/include/ia32-base.inc
b/meta/conf/machine/include/x86-base.inc
similarity index 75%
rename from meta/conf/machine/include/ia32-base.inc
rename to meta/conf/machine/include/x86-base.inc
index e15f927..421bdee 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -1,5 +1,5 @@
#
-# base machine settings for ia32-architecture BSPs
+# Base machine settings for Intel architecture BSPs
#
#
@@ -25,28 +25,28 @@ PREFERRED_VERSION_linux-yocto ??= 3.0%
#
# XSERVER subcomponents, used to build the XSERVER variable
#
-XSERVER_IA32_BASE = xserver-xorg \
+XSERVER_INTEL_BASE = xserver-xorg \
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-evdev \
xf86-input-synaptics \
-XSERVER_IA32_EXT = \
+XSERVER_INTEL_EXT = \
${@base_contains('DISTRO_FEATURES', 'opengl',
'xserver-xorg-extension-glx', '', d)} \
xserver-xorg-module-libint10 \
-XSERVER_IA32_I915 = xf86-video-intel \
+XSERVER_INTEL_I915 = xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915',
'', d)} \
-XSERVER_IA32_I965 = xf86-video-intel \
+XSERVER_INTEL_I965 = xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965',
'', d)} \
-XSERVER_IA32_VESA = xf86-video-vesa
+XSERVER_INTEL_VESA = xf86-video-vesa
-XSERVER_IA32_FBDEV = xf86-video-fbdev
+XSERVER_INTEL_FBDEV = xf86-video-fbdev
-XSERVER_IA32_MODESETTING = xf86-video-modesetting
+XSERVER_INTEL_MODESETTING = xf86-video-modesetting
diff --git a/meta/conf/machine/include/ia32/README
b/meta/conf/machine/include/x86/README
similarity index 81%
rename from meta/conf/machine/include/ia32/README
rename to meta/conf/machine/include/x86/README
index 8f80a5b..d8b6793 100644
--- a/meta/conf/machine/include/ia32/README
+++ b/meta/conf/machine/include/x86/README
@@ -1,12 +1,12 @@
2012/03/30 - Mark Hatle mark.ha...@windriver.com
- Initial version
-Most of the items for the IA architecture are defined in the single
-arch-ia32 file.
+Most of the items for the Intel architectures are defined in the single
+arch-x86 file.
Three ABIs are define, m32, mx32 and m64.
-The following is the list of ia32 specific variables:
+The following is the list of intel specific variables:
X86ARCH32 - This is the 32-bit architecture GNU canonical arch, TUNE_ARCH.
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc
[OE-core] [PATCH 11/15] qemux86_64: Use the core2-64 tune
As x86_64 has been demoted to an ABI definition rather than a concrete tune file, replace it with core2-64 for the qemux86-64 machine. Signed-off-by: Darren Hart dvh...@linux.intel.com --- meta/conf/machine/qemux86-64.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index c572225..6533e56 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -8,7 +8,8 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= mesa PREFERRED_PROVIDER_virtual/libgles2 ?= mesa require conf/machine/include/qemu.inc -require conf/machine/include/tune-x86_64.inc +DEFAULTTUNE ?= core2-64 +require conf/machine/include/tune-core2.inc KERNEL_IMAGETYPE = bzImage -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/15] Update x86 tune files
All,
The following lays the groundwork for some rethinking of support for x86
platforms. In particular, the meta-intel layer will undergo some major
refactoring once this is merged. We believe it is of value to keep as much
of the tune files available in oe-core as possible, rather than isolating
them all in meta-intel.
This series renames the x86-related tune files, documents best practices,
updates the core2 tune file, adds a corei7 tune file, and updates the dependent
machine configs. This spans oe-core and poky and I feel is best viewed as a
whole. Please forgive the cross-post.
The new corei7 tune file applies to Nehalem and Silvermont (Bay Trail) CPUs
which support up to SSE4.2. This provides an appropriate demarcation line while
maximizing compatibility as well as including optimal support for the current
generation of the embedded CPUs (Bay Trail) by including it in the new tune. AVX
(Sandy Bridge and beyond) is not included as that would not apply to Bay Trail,
although it can easily be added in a corei7-avx tune file as an additional
patch for users who care more about the last few percent of performance over
compatibility and consolidation.
An important note and likely a point of contention: The core2 update changes the
core2 arch to core2-32, making the 32 bit explicit rather than implied in order
to provide a consistent naming scheme going forward with newer tunes where
64 bit would be logical assumption if not explicitly stated. See patch 5/15 for
details on this bit.
Finally, update the machines dependent on these tune files to use the new names.
As we remove x86_64, the 64b x86 machines now build as core2-64 for maximum
compatibility.
For reference, the corei7-64 tune defines:
TARGET_CC_ARCH= -m64 -march=corei7 -mtune=corei7 -mfpmath=sse -msse4.2
While the corei2-32 tune defines:
TARGET_CC_ARCH= -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse
The following changes since commit 6e7047434fc1570146ebc94254412b99b1c4cab4:
poky.ent: Fixed broken OE_LISTS_URL. (2014-01-21 21:58:03 +)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib dvhart/intel-tune-ng-v3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dvhart/intel-tune-ng-v3
Darren Hart (15):
x86: Replace ia32 with x86 when referring to the generic architecture
i586: Only add the current tune to PACKAGE_EXTRA_ARCHS
tune-core2: Replace -mtune=generic with -mtune=core2
tune-core2: Only add the current ARCH to PACKAGE_EXTRA_ARCHS
tune: Make 32b or 64b explicit in tune name for core2
tune-corei7: Add support for cpu-type corei7
tune: Remove tune-x86_64.inc
tune: README: Whitespace cleanup
tune: README: Document best practice
tune: README: Typographical corrections
qemux86_64: Use the core2-64 tune
genericx86: Use the core2 tune file
genericx86-64: Use the core2-64 tune
genericx86: Use new x86 tune files
generixx86: Use require instead of include
meta-yocto-bsp/conf/machine/genericx86-64.conf |5 +-
meta-yocto-bsp/conf/machine/genericx86.conf|5 +-
.../conf/machine/include/genericx86-common.inc |2 +-
meta/conf/machine/include/README | 109
meta/conf/machine/include/tune-c3.inc |2 +-
meta/conf/machine/include/tune-core2.inc | 23 +++--
meta/conf/machine/include/tune-corei7.inc | 35 +++
meta/conf/machine/include/tune-i586.inc|4 +-
meta/conf/machine/include/tune-x86_64.inc |4 -
.../include/{ia32-base.inc = x86-base.inc}| 16 +--
meta/conf/machine/include/{ia32 = x86}/README |6 +-
.../{ia32/arch-ia32.inc = x86/arch-x86.inc} |2 +-
meta/conf/machine/qemux86-64.conf |3 +-
13 files changed, 139 insertions(+), 77 deletions(-)
create mode 100644 meta/conf/machine/include/tune-corei7.inc
delete mode 100644 meta/conf/machine/include/tune-x86_64.inc
rename meta/conf/machine/include/{ia32-base.inc = x86-base.inc} (75%)
rename meta/conf/machine/include/{ia32 = x86}/README (81%)
rename meta/conf/machine/include/{ia32/arch-ia32.inc = x86/arch-x86.inc} (97%)
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/15] tune: README: Document best practice
Describe the expected usage of base architecture tune files and arch-specific files, specifically the stacking of generations. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Richard Purdie richard.pur...@intel.com Cc: Paul Eggleton paul.eggle...@intel.com Cc: Tom Zanussi tom.zanu...@intel.com Cc: Nitin Kamble nitin.a.kam...@intel.com Cc: Mark Hatle mark.ha...@windriver.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/conf/machine/include/README | 19 +++ 1 file changed, 19 insertions(+) diff --git a/meta/conf/machine/include/README b/meta/conf/machine/include/README index 65d0942..6c390ad 100644 --- a/meta/conf/machine/include/README +++ b/meta/conf/machine/include/README @@ -1,6 +1,9 @@ 2012/03/30 - Mark Hatle mark.ha...@windriver.com - Initial Revision + +Introduction + The individual CPU, and ABI tunings are contained in this directory. A number of local and global variables are used to control the way the tunings are setup and how they work together to specify an optimized @@ -79,3 +82,19 @@ configured in the same way that TUNE_CCARGS is. BASE_LIB_tune-tune - The /lib location for a specific ABI. This is used in a multilib configuration to place the libraries in the correct, non-conflicting locations. + + +Best Practice += +The tune infrastructure is designed to be hierarchical. When writing a +new tune file for a fast-forward CPU architecture (one that supports +everything from a previous generation), it is recommended to require the +previous generation tune file and specify PACKAGE_EXTRA_ARCHS using the +previous generation's override and appending the new tune. Note that +only one previous tune file should be included to avoid mutiple includes +of the base arch which could lead to a broken configuration due to +multiple prepend and append assignments. + +For example, for x86, there is a common x86/arch-x86.inc which is +included in the base i586 tune file. The core2 tune builds +on that, and corei7 builds on core2. -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/15] tune: README: Typographical corrections
No new content, just correcting a few typographical errors.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/README |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/conf/machine/include/README b/meta/conf/machine/include/README
index 6c390ad..d66130a 100644
--- a/meta/conf/machine/include/README
+++ b/meta/conf/machine/include/README
@@ -53,10 +53,10 @@ list should be dynamic! i.e.
${@bb.utils.contains(TUNE_FEATURES, feature, cflag, !cflag, d)}
TUNE_ARCH - The GNU canonical arch for a specific architecture. i.e.
-arm, armeb, mips, mips64, etc. This value is by bitbake to setup
+arm, armeb, mips, mips64, etc. This value is used by bitbake to setup
configure. TUNE_ARCH definitions are specific to a given architecture.
-They may be a single static definitions, or may be dynamically adjusted.
-See each architectures README for details for that CPU family.
+They may be a single static definition, or may be dynamically adjusted.
+See each architecture's README for details for that CPU family.
TUNE_PKGARCH - The package architecture used by the packaging systems to
define the architecture, abi and tuning of a particular package.
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/15] i586: Only add the current tune to PACKAGE_EXTRA_ARCHS
The generic x86 build supports i586 by default, so this specific tune
file technically doesn't add any specific ARCHes to PACKAGE_EXTRA_ARCHS.
For consistency, append the current tune to PACKAGE_EXTRA_ARCHS.
Since we do not have specific tune files for i386 and i486, just drop
them.
These could be added to tune-x86 version if there is a need to
maintain them, but they really do not belong here.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/tune-i586.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-i586.inc
b/meta/conf/machine/include/tune-i586.inc
index a315b35..5fbb3c7 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -11,4 +11,4 @@ AVAILTUNES += i586
TUNE_FEATURES_tune-i586 = ${TUNE_FEATURES_tune-x86} i586
BASE_LIB_tune-i586 = lib
TUNE_PKGARCH_tune-i586 = i586
-PACKAGE_EXTRA_ARCHS_tune-i586 = ${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486
i586
+PACKAGE_EXTRA_ARCHS_tune-i586 = ${PACKAGE_EXTRA_ARCHS_tune-x86} i586
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/15] genericx86: Use new x86 tune files
Use the new names for the x86 tunes files (x86 instead of ia32). Signed-off-by: Darren Hart dvh...@linux.intel.com --- .../conf/machine/include/genericx86-common.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index c5ef358..8b24c18 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -1,4 +1,4 @@ -include conf/machine/include/ia32-base.inc +include conf/machine/include/x86-base.inc MACHINE_FEATURES += wifi efi pcbios PREFERRED_PROVIDER_virtual/kernel ?= linux-yocto -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/15] tune-core2: Replace -mtune=generic with -mtune=core2
-march specifies which ISA to use. -mtune specifies which cpu-type to
optimize instruction ordering for, but not which ISA to use. There are
times when it may make sense to specify mtune=generic and use a more
specific march, such as core2, but the opposite makes little sense at
all: use cpu-type specific ISA, but order the instructions
generically. While the -mtune is implied by -march, gcc does not verify
it is using -mtune=core2 with:
gcc -Q -march=core2 --help=target
Explicitly specify -mtune=core2 to be sure.
Add a comment header describing the CPUs targeted by this tune file.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/tune-core2.inc | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-core2.inc
b/meta/conf/machine/include/tune-core2.inc
index 85b6924..3b25197 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -1,10 +1,18 @@
+# Settings for the GCC(1) cpu-type core2:
+#
+# Intel Core2 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3 and SSSE3
+# instruction set support.
+#
+# This tune is recommended for the Intel Core 2 CPU family, including Conroe,
+# Merom and beyond, as well as the first Atom CPUs, Diamondville, and beyond.
+#
DEFAULTTUNE ?= core2
require conf/machine/include/tune-i586.inc
# Extra tune features
TUNEVALID[core2] = Enable core2 specific processor optimizations
-TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, core2, -march=core2
-msse3 -mtune=generic -mfpmath=sse, , d)}
+TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, core2, -march=core2
-mtune=core2 -msse3 -mfpmath=sse, , d)}
# Extra tune selections
AVAILTUNES += core2
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/15] generixx86: Use require instead of include
Use require instead of include to avoid silent errors when the required tune files change name or are moved. It's going to fail anyway, it might as well fail with an error message that is immediately helpful. Signed-off-by: Darren Hart dvh...@linux.intel.com --- meta-yocto-bsp/conf/machine/genericx86-64.conf |4 ++-- meta-yocto-bsp/conf/machine/genericx86.conf|4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index a6154cd..f76e35a 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -4,5 +4,5 @@ #@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. DEFAULTTUNE ?= core2-64 -include conf/machine/include/tune-core2.inc -include conf/machine/include/genericx86-common.inc +require conf/machine/include/tune-core2.inc +require conf/machine/include/genericx86-common.inc diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 549fc8e..2642cab 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf @@ -4,5 +4,5 @@ #@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. DEFAULTTUNE ?= core2-32 -include conf/machine/include/tune-core2.inc -include conf/machine/include/genericx86-common.inc +require conf/machine/include/tune-core2.inc +require conf/machine/include/genericx86-common.inc -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/15] tune: README: Whitespace cleanup
Before making content changes, cleanup the various whitespace errors in
this file. Mostly end-of-line whitepsace.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/README | 88 +++---
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/meta/conf/machine/include/README b/meta/conf/machine/include/README
index e4b59c9..65d0942 100644
--- a/meta/conf/machine/include/README
+++ b/meta/conf/machine/include/README
@@ -1,27 +1,27 @@
2012/03/30 - Mark Hatle mark.ha...@windriver.com
- Initial Revision
-The individual CPU, and ABI tunings are contained in this directory. A
-number of local and global variables are used to control the way the
-tunings are setup and how they work together to specify an optimized
+The individual CPU, and ABI tunings are contained in this directory. A
+number of local and global variables are used to control the way the
+tunings are setup and how they work together to specify an optimized
configuration.
-The following is brief summary of the generic components that are used
+The following is brief summary of the generic components that are used
in these tunings.
-AVAILTUNES - This is a list of all of the tuning definitions currently
-available in the system. Not all tunes in this list may be compatible
-with the machine configuration, or each other in a multilib
-configuration. Each tuning file can add to this list using +=, but
+AVAILTUNES - This is a list of all of the tuning definitions currently
+available in the system. Not all tunes in this list may be compatible
+with the machine configuration, or each other in a multilib
+configuration. Each tuning file can add to this list using +=, but
should never replace the list using =.
-DEFAULTTUNE - This specifies the tune to use for a particular build.
-Each tune should specify a reasonable default, which can be overriden by
-a machine or multilib configuration. The specified tune must be listed
+DEFAULTTUNE - This specifies the tune to use for a particular build.
+Each tune should specify a reasonable default, which can be overriden by
+a machine or multilib configuration. The specified tune must be listed
in the AVAILTUNES.
-TUNEVALID[feature] - The feature is defined with a human readable
-explanation for what it does. All architectural, cpu, abi, etc tuning
+TUNEVALID[feature] - The feature is defined with a human readable
+explanation for what it does. All architectural, cpu, abi, etc tuning
features must be defined using TUNEVALID.
TUNECONFLICTS[feature] - A list of features which conflict with feature.
@@ -31,51 +31,51 @@ tuning ends up with features which conflict with each other.
TUNE_FEATURES - This is automatically defined as TUNE_FEATURES_tune-tune.
See TUNE_FEATURES_tune-tune for more information.
-TUNE_FEATURES_tune-tune - Specify the features used to describe a
-specific tune. This is a list of features that a tune support, each
-feature must be in the TUNEVALID list. Note: the tune and a given
-feature name may be the same, but they have different purposes. Only
-features may be used to change behavior, while tunes are used to
+TUNE_FEATURES_tune-tune - Specify the features used to describe a
+specific tune. This is a list of features that a tune support, each
+feature must be in the TUNEVALID list. Note: the tune and a given
+feature name may be the same, but they have different purposes. Only
+features may be used to change behavior, while tunes are used to
describe an overall set of features.
-ABIEXTENSION - An ABI extension may be specified by a specific feature
-or other tuning setting, such as TARGET_FPU. Any ABI extensions either
-need to be defined in the architectures base arch file, i.e.
-ABIEXTENSION = eabi in the arm case, or appended to in specific tune
+ABIEXTENSION - An ABI extension may be specified by a specific feature
+or other tuning setting, such as TARGET_FPU. Any ABI extensions either
+need to be defined in the architectures base arch file, i.e.
+ABIEXTENSION = eabi in the arm case, or appended to in specific tune
files with a .=. Spaces are not allowed in this variable.
-TUNE_CCARGS - Setup the cflags based on the TUNE_FEATURES settings.
-These should be additive when defined using +=. All items in this
-list should be dynamic! i.e.
+TUNE_CCARGS - Setup the cflags based on the TUNE_FEATURES settings.
+These should be additive when defined using +=. All items in this
+list should be dynamic! i.e.
${@bb.utils.contains(TUNE_FEATURES, feature, cflag, !cflag, d)}
-TUNE_ARCH - The GNU canonical arch for a specific architecture. i.e.
-arm, armeb, mips, mips64, etc. This value is by bitbake to
[OE-core] [PATCH 13/15] genericx86-64: Use the core2-64 tune
As x86_64 has been demoted to an ABI definition rather than a concrete tune file, replace it with core2-64 for the genericx86-64 machine. Signed-off-by: Darren Hart dvh...@linux.intel.com --- meta-yocto-bsp/conf/machine/genericx86-64.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index 56e9bb6..a6154cd 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. -include conf/machine/include/tune-x86_64.inc +DEFAULTTUNE ?= core2-64 +include conf/machine/include/tune-core2.inc include conf/machine/include/genericx86-common.inc -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
On Tuesday 21 January 2014 22:12:13 Paul Eggleton wrote: Hi Saul, On Tuesday 21 January 2014 14:09:16 Saul Wold wrote: On 01/21/2014 04:17 AM, Paul Eggleton wrote: The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = This seems to have caused a couple of problems with shadow-securetty, updaterc and depmodwrapper. There may be more. Can you perhaps be more specific as to what the problem is? Oh, I see, rpmbuild blows up with URL blank. Great :/ Let's hold off on this one for now because fixing one or two recipes isn't going to cover it. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/15] genericx86: Use the core2 tune file
Aside from the movbe and specialized instruction scheduling for the lack of out-of-order scheduling in the older Atom CPUs, the core2 tune covers these CPUs adequately. Since the current atom tune just uses core2 anyway, go ahead and make this explicit here. Signed-off-by: Darren Hart dvh...@linux.intel.com --- meta-yocto-bsp/conf/machine/genericx86.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 9d29f62..549fc8e 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. -include conf/machine/include/tune-atom.inc +DEFAULTTUNE ?= core2-32 +include conf/machine/include/tune-core2.inc include conf/machine/include/genericx86-common.inc -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/15] tune: Make 32b or 64b explicit in tune name for core2
Core2 has both a 32b and a 64b variant. Currently, core2 implies 32b,
while core2_64 is the 64b version. This implicit 32b mode will become
confusing in later architectures, such as corei7, where it would be
natural for people to assume corei7 meant 64 bit.
Rather than carrying forward an implicit 32b mode and rather than
changing the naming scheme part way through the architecture hiearchy,
make the 32b and 64b variant explicit in the tune name by changing core2
to core2_32.
Signed-off-by: Darren Hart dvh...@linux.intel.com
---
meta/conf/machine/include/tune-core2.inc | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/conf/machine/include/tune-core2.inc
b/meta/conf/machine/include/tune-core2.inc
index 2500a74..11517dc 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -6,7 +6,7 @@
# This tune is recommended for the Intel Core 2 CPU family, including Conroe,
# Merom and beyond, as well as the first Atom CPUs, Diamondville, and beyond.
#
-DEFAULTTUNE ?= core2
+DEFAULTTUNE ?= core2-32
# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
require conf/machine/include/tune-i586.inc
@@ -16,11 +16,11 @@ TUNEVALID[core2] = Enable core2 specific processor
optimizations
TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, core2, -march=core2
-mtune=core2 -msse3 -mfpmath=sse, , d)}
# Extra tune selections
-AVAILTUNES += core2
-TUNE_FEATURES_tune-core2 = ${TUNE_FEATURES_tune-x86} core2
-BASE_LIB_tune-core2 = lib
-TUNE_PKGARCH_tune-core2 = core2
-PACKAGE_EXTRA_ARCHS_tune-core2 = ${PACKAGE_EXTRA_ARCHS_tune-i586} core2
+AVAILTUNES += core2-32
+TUNE_FEATURES_tune-core2-32 = ${TUNE_FEATURES_tune-x86} core2
+BASE_LIB_tune-core2-32 = lib
+TUNE_PKGARCH_tune-core2-32 = core2_32
+PACKAGE_EXTRA_ARCHS_tune-core2-32 = ${PACKAGE_EXTRA_ARCHS_tune-i586} core2_32
AVAILTUNES += core2-64
TUNE_FEATURES_tune-core2-64 = ${TUNE_FEATURES_tune-x86-64} core2
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/15] tune-core2: Only add the current ARCH to PACKAGE_EXTRA_ARCHS
Inherit the PACKAGE_EXTRA_ARCHS from i586 and only explicitly add core2
here.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/tune-core2.inc |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-core2.inc
b/meta/conf/machine/include/tune-core2.inc
index 3b25197..2500a74 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -8,6 +8,7 @@
#
DEFAULTTUNE ?= core2
+# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
require conf/machine/include/tune-i586.inc
# Extra tune features
@@ -19,7 +20,7 @@ AVAILTUNES += core2
TUNE_FEATURES_tune-core2 = ${TUNE_FEATURES_tune-x86} core2
BASE_LIB_tune-core2 = lib
TUNE_PKGARCH_tune-core2 = core2
-PACKAGE_EXTRA_ARCHS_tune-core2 = ${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486
i586 i686 core2
+PACKAGE_EXTRA_ARCHS_tune-core2 = ${PACKAGE_EXTRA_ARCHS_tune-i586} core2
AVAILTUNES += core2-64
TUNE_FEATURES_tune-core2-64 = ${TUNE_FEATURES_tune-x86-64} core2
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
On Tuesday 21 January 2014 22:23:18 Richard Purdie wrote: On Tue, 2014-01-21 at 12:17 +, Paul Eggleton wrote: The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = Perhaps we just shouldn't set it at all in bitbake.conf and let recipes elect to set it? Maybe, but I think that alone isn't necessarily enough because then converting the value to a string gives you None (and this is what happens with the rpm backend). Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
On Tue, 2014-01-21 at 22:22 +, Paul Eggleton wrote: On Tuesday 21 January 2014 22:12:13 Paul Eggleton wrote: Hi Saul, On Tuesday 21 January 2014 14:09:16 Saul Wold wrote: On 01/21/2014 04:17 AM, Paul Eggleton wrote: The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = This seems to have caused a couple of problems with shadow-securetty, updaterc and depmodwrapper. There may be more. Can you perhaps be more specific as to what the problem is? Oh, I see, rpmbuild blows up with URL blank. Great :/ Let's hold off on this one for now because fixing one or two recipes isn't going to cover it. I'm perfectly fine with the rpm backend injecting something to deal with this rather than cluttering bitbake.conf or the toaster code. I think cleaning out bitbake.conf is something we need to do more of. SRCREV ??= INVALID is on my hitlist (newer bitbake's shouldn't need that). Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] conf/bitbake.conf: default HOMEPAGE to blank instead of unknown
On Tue, 2014-01-21 at 22:39 +, Paul Eggleton wrote: On Tuesday 21 January 2014 22:23:18 Richard Purdie wrote: On Tue, 2014-01-21 at 12:17 +, Paul Eggleton wrote: The default value for HOMEPAGE of unknown has been in place since the early OE-Classic days, but it doesn't really make sense - unknown is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster. There is some code in the unmaintained oelint.bbclass to check for this value, presumably on the assumption that the recipe will explicitly set it to if there really isn't a homepage, but looking at recipes in OE-Core and meta-oe suggests that we haven't been using this convention for some time (with one exception in the latter) and it's rather uncommon these days to have no URL to associate with a recipe. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 57668e1..4fb6a1c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -241,7 +241,7 @@ This package contains documentation. LICENSE = INVALID MAINTAINER = OE-Core Developers openembedded-core@lists.openembedded.org -HOMEPAGE = unknown +HOMEPAGE = Perhaps we just shouldn't set it at all in bitbake.conf and let recipes elect to set it? Maybe, but I think that alone isn't necessarily enough because then converting the value to a string gives you None (and this is what happens with the rpm backend). Lets fix the rpm backend then ;-) Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/15] x86: Replace ia32 with x86 when referring to the generic architecture
On Tue, Jan 21, 2014 at 02:39:47PM -0800, Darren Hart wrote:
ia32 implies 32bit, while these files provide descriptions for IA32,
X86_64, and X32 architectures. The term x86 fits this used better
without resorting to using the term Intel which isn't quite right as
it excludes things like the tune-c3 file describing a Via CPU.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/tune-c3.inc |2 +-
meta/conf/machine/include/tune-i586.inc|2 +-
meta/conf/machine/include/tune-x86_64.inc |2 +-
.../include/{ia32-base.inc = x86-base.inc}| 16
meta/conf/machine/include/{ia32 = x86}/README |6 +++---
.../{ia32/arch-ia32.inc = x86/arch-x86.inc} |2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
rename meta/conf/machine/include/{ia32-base.inc = x86-base.inc} (75%)
rename meta/conf/machine/include/{ia32 = x86}/README (81%)
rename meta/conf/machine/include/{ia32/arch-ia32.inc = x86/arch-x86.inc}
(97%)
diff --git a/meta/conf/machine/include/tune-c3.inc
b/meta/conf/machine/include/tune-c3.inc
index 18865b7..fafc28a 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
TUNEVALID[c3] = VIA Cyrix III or VIA C3 specific optimizations
TUNECONFLICTS[c3] = m64 mx32
diff --git a/meta/conf/machine/include/tune-i586.inc
b/meta/conf/machine/include/tune-i586.inc
index 4542b9b..a315b35 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,6 +1,6 @@
DEFAULTTUNE ?= i586
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
# Extra tune features
TUNEVALID[i586] = Enable i586 specific processor optimizations
diff --git a/meta/conf/machine/include/tune-x86_64.inc
b/meta/conf/machine/include/tune-x86_64.inc
index 31e06da..ae48124 100644
--- a/meta/conf/machine/include/tune-x86_64.inc
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -1,4 +1,4 @@
DEFAULTTUNE ?= x86-64
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
diff --git a/meta/conf/machine/include/ia32-base.inc
b/meta/conf/machine/include/x86-base.inc
similarity index 75%
rename from meta/conf/machine/include/ia32-base.inc
rename to meta/conf/machine/include/x86-base.inc
index e15f927..421bdee 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -1,5 +1,5 @@
#
-# base machine settings for ia32-architecture BSPs
+# Base machine settings for Intel architecture BSPs
does it apply for AMD, Cyrix as well?
#
#
@@ -25,28 +25,28 @@ PREFERRED_VERSION_linux-yocto ??= 3.0%
#
# XSERVER subcomponents, used to build the XSERVER variable
#
-XSERVER_IA32_BASE = xserver-xorg \
+XSERVER_INTEL_BASE = xserver-xorg \
the same, why not us XSERVER_X86_BASE?
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-evdev \
xf86-input-synaptics \
-XSERVER_IA32_EXT = \
+XSERVER_INTEL_EXT = \
${@base_contains('DISTRO_FEATURES', 'opengl',
'xserver-xorg-extension-glx', '', d)} \
xserver-xorg-module-libint10 \
-XSERVER_IA32_I915 = xf86-video-intel \
+XSERVER_INTEL_I915 = xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915',
'', d)} \
-XSERVER_IA32_I965 = xf86-video-intel \
+XSERVER_INTEL_I965 = xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965',
'', d)} \
-XSERVER_IA32_VESA = xf86-video-vesa
+XSERVER_INTEL_VESA = xf86-video-vesa
-XSERVER_IA32_FBDEV = xf86-video-fbdev
+XSERVER_INTEL_FBDEV = xf86-video-fbdev
-XSERVER_IA32_MODESETTING = xf86-video-modesetting
+XSERVER_INTEL_MODESETTING = xf86-video-modesetting
diff --git a/meta/conf/machine/include/ia32/README
b/meta/conf/machine/include/x86/README
similarity index 81%
rename from meta/conf/machine/include/ia32/README
rename to meta/conf/machine/include/x86/README
index 8f80a5b..d8b6793 100644
--- a/meta/conf/machine/include/ia32/README
+++ b/meta/conf/machine/include/x86/README
@@ -1,12 +1,12 @@
2012/03/30 - Mark Hatle mark.ha...@windriver.com
- Initial version
-Most of the items for the IA architecture are defined in the single
-arch-ia32 file.
+Most of the items for the Intel architectures are defined in the single
+arch-x86 file.
Three ABIs are define,
Re: [OE-core] [PATCH 12/15] genericx86: Use the core2 tune file
On Tue, Jan 21, 2014 at 02:39:58PM -0800, Darren Hart wrote: Aside from the movbe and specialized instruction scheduling for the lack of out-of-order scheduling in the older Atom CPUs, the core2 tune covers these CPUs adequately. Since the current atom tune just uses core2 anyway, go ahead and make this explicit here. Signed-off-by: Darren Hart dvh...@linux.intel.com --- meta-yocto-bsp/conf/machine/genericx86.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 9d29f62..549fc8e 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf This isn't for oe-core, is it? @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. -include conf/machine/include/tune-atom.inc +DEFAULTTUNE ?= core2-32 +include conf/machine/include/tune-core2.inc include conf/machine/include/genericx86-common.inc -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 12/15] genericx86: Use the core2 tune file
On Tue, 2014-01-21 at 23:58 +0100, Martin Jansa wrote: On Tue, Jan 21, 2014 at 02:39:58PM -0800, Darren Hart wrote: Aside from the movbe and specialized instruction scheduling for the lack of out-of-order scheduling in the older Atom CPUs, the core2 tune covers these CPUs adequately. Since the current atom tune just uses core2 anyway, go ahead and make this explicit here. Signed-off-by: Darren Hart dvh...@linux.intel.com --- meta-yocto-bsp/conf/machine/genericx86.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 9d29f62..549fc8e 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf This isn't for oe-core, is it? Nope. I called this out in the cover letter. It spans oe-core and poky, but I felt they were best viewed as a whole, rather than splitting them apart and worrying about the order in which they were applied. I understand the desire to not cross post and generally agree and avoid it - on rare occasions such as this, it seems the least awful way to go about it... @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. -include conf/machine/include/tune-atom.inc +DEFAULTTUNE ?= core2-32 +include conf/machine/include/tune-core2.inc include conf/machine/include/genericx86-common.inc -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel signature.asc Description: This is a digitally signed message part ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/15] x86: Replace ia32 with x86 when referring to the generic architecture
On Tue, 2014-01-21 at 23:55 +0100, Martin Jansa wrote:
On Tue, Jan 21, 2014 at 02:39:47PM -0800, Darren Hart wrote:
ia32 implies 32bit, while these files provide descriptions for IA32,
X86_64, and X32 architectures. The term x86 fits this used better
without resorting to using the term Intel which isn't quite right as
it excludes things like the tune-c3 file describing a Via CPU.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@intel.com
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
---
meta/conf/machine/include/tune-c3.inc |2 +-
meta/conf/machine/include/tune-i586.inc|2 +-
meta/conf/machine/include/tune-x86_64.inc |2 +-
.../include/{ia32-base.inc = x86-base.inc}| 16
meta/conf/machine/include/{ia32 = x86}/README |6 +++---
.../{ia32/arch-ia32.inc = x86/arch-x86.inc} |2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
rename meta/conf/machine/include/{ia32-base.inc = x86-base.inc} (75%)
rename meta/conf/machine/include/{ia32 = x86}/README (81%)
rename meta/conf/machine/include/{ia32/arch-ia32.inc = x86/arch-x86.inc}
(97%)
diff --git a/meta/conf/machine/include/tune-c3.inc
b/meta/conf/machine/include/tune-c3.inc
index 18865b7..fafc28a 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
TUNEVALID[c3] = VIA Cyrix III or VIA C3 specific optimizations
TUNECONFLICTS[c3] = m64 mx32
diff --git a/meta/conf/machine/include/tune-i586.inc
b/meta/conf/machine/include/tune-i586.inc
index 4542b9b..a315b35 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,6 +1,6 @@
DEFAULTTUNE ?= i586
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
# Extra tune features
TUNEVALID[i586] = Enable i586 specific processor optimizations
diff --git a/meta/conf/machine/include/tune-x86_64.inc
b/meta/conf/machine/include/tune-x86_64.inc
index 31e06da..ae48124 100644
--- a/meta/conf/machine/include/tune-x86_64.inc
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -1,4 +1,4 @@
DEFAULTTUNE ?= x86-64
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
diff --git a/meta/conf/machine/include/ia32-base.inc
b/meta/conf/machine/include/x86-base.inc
similarity index 75%
rename from meta/conf/machine/include/ia32-base.inc
rename to meta/conf/machine/include/x86-base.inc
index e15f927..421bdee 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -1,5 +1,5 @@
#
-# base machine settings for ia32-architecture BSPs
+# Base machine settings for Intel architecture BSPs
does it apply for AMD, Cyrix as well?
Blarg, yes it does. Apologies. I had originally done some of this in
meta-intel and was persuaded it was better to do this in oe-core. I
missed removing some of the intel-isms. Thanks for catching this.
Replacing INTEL with X86 for everything that isn't a specific recipe
name (xf86-video-intel). Thanks Martin.
Will include in the inevitable v2.
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
signature.asc
Description: This is a digitally signed message part
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 12/15] genericx86: Use the core2 tune file
On Tue, Jan 21, 2014 at 03:12:15PM -0800, Darren Hart wrote: On Tue, 2014-01-21 at 23:58 +0100, Martin Jansa wrote: On Tue, Jan 21, 2014 at 02:39:58PM -0800, Darren Hart wrote: Aside from the movbe and specialized instruction scheduling for the lack of out-of-order scheduling in the older Atom CPUs, the core2 tune covers these CPUs adequately. Since the current atom tune just uses core2 anyway, go ahead and make this explicit here. Signed-off-by: Darren Hart dvh...@linux.intel.com --- meta-yocto-bsp/conf/machine/genericx86.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 9d29f62..549fc8e 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf This isn't for oe-core, is it? Nope. I called this out in the cover letter. It spans oe-core and poky, but I felt they were best viewed as a whole, rather than splitting them apart and worrying about the order in which they were applied. I understand the desire to not cross post and generally agree and avoid it - on rare occasions such as this, it seems the least awful way to go about it... OK, sorry I see it now, for some reason cover letter arrived to my maildir last. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] opkg-utils: Add RPROVIDES/RREPLACES/RCONFLICTS to fix upgrade-path
* now with update-alternatives-cworth completely gone should correctly
replace it on target as well
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 80efa8f..c2509c4 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -28,6 +28,8 @@ do_install() {
PACKAGES =+ update-alternatives-opkg
FILES_update-alternatives-opkg = ${bindir}/update-alternatives
-RPROVIDES_update-alternatives-opkg = update-alternatives
+RPROVIDES_update-alternatives-opkg = update-alternatives
update-alternatives-cworth
+RREPLACES_update-alternatives-opkg = update-alternatives-cworth
+RCONFLICTS_update-alternatives-opkg = update-alternatives-cworth
BBCLASSEXTEND = native nativesdk
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] feature-arm-thumb: Fix missing t2 suffix for armv7a MACHINEs
* unfortunatelly that note about armv7 matching also armv7a is no
longer valid since armv7 include in armv7 was replaced with
armv6+neon in this commit:
commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea
Author: Khem Raj raj.k...@gmail.com
Date: Tue Mar 27 18:37:45 2012 -0700
tune/armv7: Delete
since then thumb and arm feeds had the same architecture
* be aware that this will rename lots of feeds
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc
b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index bd754be..fa3a4e5 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = ${@['-marm',
'-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True)
TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, thumb,
${ARM_THUMB_M_OPT}, , d)}
OVERRIDES .= ${@bb.utils.contains(TUNE_FEATURES, thumb, :thumb, , d)}
-# Note armv7 will hit on armv7a as well
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv4, thumb
], t, , d)}
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv5, thumb
], t, , d)}
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv6, thumb
], t, , d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv7, thumb
], t2, , d)}
+ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv7a, thumb
], t2, , d)}
# Whether to compile with code to allow interworking between the two
# instruction sets. This allows thumb code to be executed on a primarily
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/15] Update x86 tune files
On Tue, 2014-01-21 at 14:40 -0800, Darren Hart wrote: All, The following lays the groundwork for some rethinking of support for x86 platforms. In particular, the meta-intel layer will undergo some major refactoring once this is merged. We believe it is of value to keep as much of the tune files available in oe-core as possible, rather than isolating them all in meta-intel. This series renames the x86-related tune files, documents best practices, updates the core2 tune file, adds a corei7 tune file, and updates the dependent machine configs. This spans oe-core and poky and I feel is best viewed as a whole. Please forgive the cross-post. The new corei7 tune file applies to Nehalem and Silvermont (Bay Trail) CPUs which support up to SSE4.2. This provides an appropriate demarcation line while maximizing compatibility as well as including optimal support for the current generation of the embedded CPUs (Bay Trail) by including it in the new tune. AVX (Sandy Bridge and beyond) is not included as that would not apply to Bay Trail, although it can easily be added in a corei7-avx tune file as an additional patch for users who care more about the last few percent of performance over compatibility and consolidation. An important note and likely a point of contention: The core2 update changes the core2 arch to core2-32, making the 32 bit explicit rather than implied in order to provide a consistent naming scheme going forward with newer tunes where 64 bit would be logical assumption if not explicitly stated. See patch 5/15 for details on this bit. Finally, update the machines dependent on these tune files to use the new names. As we remove x86_64, the 64b x86 machines now build as core2-64 for maximum compatibility. I missed a couple things I'm getting to now: * the yocto-bsp substrates * the inclusion of XSERVER_IA32_* in the genericx86 BSPs * the eglibc-ld.inc file I need some help here, but am updating the core2 references and adding corei7... do we really have to do this for every tune file!?!? * profile-manual core2 references Coming in v2 -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC][WIP 5/6] tune-cortexr4.inc: Add thumb and arm to TUNE_FEATURES
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-cortexr4.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-cortexr4.inc
b/meta/conf/machine/include/tune-cortexr4.inc
index 57b6717..bde649f 100644
--- a/meta/conf/machine/include/tune-cortexr4.inc
+++ b/meta/conf/machine/include/tune-cortexr4.inc
@@ -10,5 +10,5 @@ TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES,
armv7r, -march=armv7-r
AVAILTUNES += cortexr4
ARMPKGARCH_tune-cortexr4 = armv7r
-TUNE_FEATURES_tune-cortexr4 = armv7r vfp cortexr4
+TUNE_FEATURES_tune-cortexr4 = armv7r vfp cortexr4 arm thumb
PACKAGE_EXTRA_ARCHS_tune-cortexr4 = ${PACKAGE_EXTRA_ARCHS_tune-armv7at}
armv7r-vfp
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC][WIP 6/6] tune-cortexm3.inc: Cortex-M3 doesn't support ARM instructions
From: Andrei Gherzan and...@gherzan.ro
Use thumb instructions for Cortex-M3 to avoid this gcc error:
'error: target CPU does not support ARM mode'.
Extracted from Cortex-M3 Technical Reference Manual:
The processor implements the ARM v7-M architecture. This includes the entire
16-bit Thumb instruction set and the base Thumb-2 32-bit instruction set
architecture. The processor cannot execute ARM instructions.
Signed-off-by: Andrei Gherzan and...@gherzan.ro
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-cortexm3.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-cortexm3.inc
b/meta/conf/machine/include/tune-cortexm3.inc
index cbc4c0d..780baf4 100644
--- a/meta/conf/machine/include/tune-cortexm3.inc
+++ b/meta/conf/machine/include/tune-cortexm3.inc
@@ -10,5 +10,5 @@ TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES,
armv7m, -march=armv7-m
AVAILTUNES += cortexm3
ARMPKGARCH_tune-cortexm3 = armv7m
-TUNE_FEATURES_tune-cortexm3 = armv7m vfp cortexm3
+TUNE_FEATURES_tune-cortexm3 = armv7m vfp cortexm3 thumb
PACKAGE_EXTRA_ARCHS_tune-cortexm3 = ${PACKAGE_EXTRA_ARCHS_tune-armv7at}
armv7m-vfp
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC][WIP 3/6] feature-arm-thumb.inc: respect ARM_INSTRUCTION_SET when adding thumb suffix
* this means that recipes with ARM_INSTRUCTION_SET explicitly changed
to arm will be built in feed without thumb suffix
* I'm not sure if the rest of system correctly supports different
TUNE_PKGARCHs for different recipes, this is one of the reasons why
this is WIP/RFC
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/arm/feature-arm-thumb.inc | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc
b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index d58c4b4..09a127a 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -5,14 +5,19 @@
# but requires more instructions (140% for 70% smaller code) so may be
# slower.
TUNEVALID[thumb] = Use thumb instructions instead of ARM
-ARM_THUMB_M_OPT = ${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET',
True) == 'thumb']}
-TUNE_CCARGS .= ${@bb.utils.contains('TUNE_FEATURES', 'thumb', '
${ARM_THUMB_M_OPT}', '', d)}
+ARM_THUMB_OPT = ${@['arm', 'thumb'][d.getVar('ARM_INSTRUCTION_SET', True) ==
'thumb']}
+ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES', 'armv4', 't', '',
d)}
+ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES', 'armv5', 't', '',
d)}
+ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES', 'armv6', 't', '',
d)}
+ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 't2', '',
d)}
+ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES', 'armv7r', 't2', '',
d)}
+ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 't2', '',
d)}
+
+TUNE_CCARGS .= ${@bb.utils.contains('TUNE_FEATURES', 'thumb', '
-m${ARM_THUMB_OPT}', '', d)}
OVERRIDES .= ${@bb.utils.contains('TUNE_FEATURES', 'thumb', ':thumb', '', d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains('TUNE_FEATURES', [ 'armv4', 'thumb'
], 't', '', d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains('TUNE_FEATURES', [ 'armv5', 'thumb'
], 't', '', d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains('TUNE_FEATURES', [ 'armv6', 'thumb'
], 't', '', d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains('TUNE_FEATURES', [ 'armv7a', 'thumb'
], 't2', '', d)}
+# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set
ARM_THUMB_OPT to thumb
+ARMPKGSFX_THUMB .= ${@ d.getVar('ARM_THUMB_SUFFIX', True) if
d.getVar('ARM_THUMB_OPT', True) == 'thumb'] else ''}
# Whether to compile with code to allow interworking between the two
# instruction sets. This allows thumb code to be executed on a primarily
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC][WIP 0/6] thumb tune feature improvements
Only first patch was properly tested, the rest is just something I've noticed when looking at feature-arm-thumb.inc and there was similar request from Andrei last week http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088207.html The following changes since commit 4659d29b1040349116549644e45035a5b37d9311: sstate.bbclass: remove previous version's stamp (2014-01-21 10:36:23 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/tune http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/tune Andrei Gherzan (1): tune-cortexm3.inc: Cortex-M3 doesn't support ARM instructions Martin Jansa (5): feature-arm-thumb.inc: Fix missing t2 suffix for armv7a MACHINEs feature-arm-thumb.inc: Replace inner quotes with apostrophes feature-arm-thumb.inc: respect ARM_INSTRUCTION_SET when adding thumb suffix feature-arm-thumb.inc, arch-armv4.inc: Add arm to TUNE_FEATURES tune-cortexr4.inc: Add thumb and arm to TUNE_FEATURES meta/conf/machine/include/arm/arch-armv4.inc | 2 +- .../conf/machine/include/arm/feature-arm-thumb.inc | 30 ++ meta/conf/machine/include/tune-cortexm3.inc| 2 +- meta/conf/machine/include/tune-cortexr4.inc| 2 +- 4 files changed, 23 insertions(+), 13 deletions(-) -- 1.8.5.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC][WIP 1/6] feature-arm-thumb.inc: Fix missing t2 suffix for armv7a MACHINEs
* unfortunatelly that note about armv7 matching also armv7a is no
longer valid since armv7 include in armv7a was replaced with
armv6+neon in this commit:
commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea
Author: Khem Raj raj.k...@gmail.com
Date: Tue Mar 27 18:37:45 2012 -0700
tune/armv7: Delete
since then thumb and arm feeds had the same architecture
* be aware that this will rename lots of feeds
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc
b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index bd754be..fa3a4e5 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = ${@['-marm',
'-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True)
TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, thumb,
${ARM_THUMB_M_OPT}, , d)}
OVERRIDES .= ${@bb.utils.contains(TUNE_FEATURES, thumb, :thumb, , d)}
-# Note armv7 will hit on armv7a as well
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv4, thumb
], t, , d)}
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv5, thumb
], t, , d)}
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv6, thumb
], t, , d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv7, thumb
], t2, , d)}
+ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv7a, thumb
], t2, , d)}
# Whether to compile with code to allow interworking between the two
# instruction sets. This allows thumb code to be executed on a primarily
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC][WIP 2/6] feature-arm-thumb.inc: Replace inner quotes with apostrophes
* so that it's highlighted correctly
---
meta/conf/machine/include/arm/feature-arm-thumb.inc | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc
b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index fa3a4e5..d58c4b4 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -6,20 +6,20 @@
# slower.
TUNEVALID[thumb] = Use thumb instructions instead of ARM
ARM_THUMB_M_OPT = ${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET',
True) == 'thumb']}
-TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, thumb,
${ARM_THUMB_M_OPT}, , d)}
-OVERRIDES .= ${@bb.utils.contains(TUNE_FEATURES, thumb, :thumb, , d)}
+TUNE_CCARGS .= ${@bb.utils.contains('TUNE_FEATURES', 'thumb', '
${ARM_THUMB_M_OPT}', '', d)}
+OVERRIDES .= ${@bb.utils.contains('TUNE_FEATURES', 'thumb', ':thumb', '', d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv4, thumb
], t, , d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv5, thumb
], t, , d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv6, thumb
], t, , d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv7a, thumb
], t2, , d)}
+ARMPKGSFX_THUMB .= ${@bb.utils.contains('TUNE_FEATURES', [ 'armv4', 'thumb'
], 't', '', d)}
+ARMPKGSFX_THUMB .= ${@bb.utils.contains('TUNE_FEATURES', [ 'armv5', 'thumb'
], 't', '', d)}
+ARMPKGSFX_THUMB .= ${@bb.utils.contains('TUNE_FEATURES', [ 'armv6', 'thumb'
], 't', '', d)}
+ARMPKGSFX_THUMB .= ${@bb.utils.contains('TUNE_FEATURES', [ 'armv7a', 'thumb'
], 't2', '', d)}
# Whether to compile with code to allow interworking between the two
# instruction sets. This allows thumb code to be executed on a primarily
# arm system and vice versa. It is strongly recommended that DISTROs not
# turn this off - the actual cost is very small.
TUNEVALID[no-thumb-interwork] = Disable mixing of thumb and ARM functions
-TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, no-thumb-interwork,
-mno-thumb-interwork, -mthumb-interwork, d)}
-OVERRIDES .= ${@bb.utils.contains(TUNE_FEATURES, no-thumb-interwork,
:thumb-interwork, , d)}
+TUNE_CCARGS .= ${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', '
-mno-thumb-interwork', ' -mthumb-interwork', d)}
+OVERRIDES .= ${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork',
':thumb-interwork', '', d)}
TARGET_CC_KERNEL_ARCH += -mno-thumb-interwork -marm
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC][WIP 4/6] feature-arm-thumb.inc, arch-armv4.inc: Add arm to TUNE_FEATURES
* it will be inherited by all higher architectures, except few exceptions which
support only thumb and not arm
* respect missing arm in TUNE_FEATURES in feature-arm-thumb.inc
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/arm/arch-armv4.inc| 2 +-
meta/conf/machine/include/arm/feature-arm-thumb.inc | 12 +---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc
b/meta/conf/machine/include/arm/arch-armv4.inc
index c33c816..4b43e9f 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -18,7 +18,7 @@ require conf/machine/include/arm/feature-arm-thumb.inc
AVAILTUNES += armv4 armv4t
ARMPKGARCH_tune-armv4 ?= armv4
ARMPKGARCH_tune-armv4t ?= armv4
-TUNE_FEATURES_tune-armv4 ?= armv4
+TUNE_FEATURES_tune-armv4 ?= arm armv4
TUNE_FEATURES_tune-armv4t ?= ${TUNE_FEATURES_tune-armv4} thumb
PACKAGE_EXTRA_ARCHS_tune-armv4 = arm armv4
PACKAGE_EXTRA_ARCHS_tune-armv4t = ${PACKAGE_EXTRA_ARCHS_tune-armv4} armv4t
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc
b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index 09a127a..aaa39dc 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -13,11 +13,17 @@ ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES',
'armv7a', 't2', '', d
ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES', 'armv7r', 't2', '',
d)}
ARM_THUMB_SUFFIX .= ${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 't2', '',
d)}
-TUNE_CCARGS .= ${@bb.utils.contains('TUNE_FEATURES', 'thumb', '
-m${ARM_THUMB_OPT}', '', d)}
+# If the device supports ARM, then respect ARM_THUMB_OPT
+# If the defice doesn't support ARM, then always set thumb even when
+# some recipe explicitly sets ARM_INSTRUCTION_SET to arm
+# (maybe we should show warning in this case)
+ARM_M_OPT = ${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}',
'thumb', d)}
+
+TUNE_CCARGS .= ${@bb.utils.contains('TUNE_FEATURES', 'thumb', '
-m${ARM_M_OPT}', '', d)}
OVERRIDES .= ${@bb.utils.contains('TUNE_FEATURES', 'thumb', ':thumb', '', d)}
-# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set
ARM_THUMB_OPT to thumb
-ARMPKGSFX_THUMB .= ${@ d.getVar('ARM_THUMB_SUFFIX', True) if
d.getVar('ARM_THUMB_OPT', True) == 'thumb'] else ''}
+# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set
ARM_M_OPT to thumb
+ARMPKGSFX_THUMB .= ${@ d.getVar('ARM_THUMB_SUFFIX', True) if
d.getVar('ARM_M_OPT', True) == 'thumb'] else ''}
# Whether to compile with code to allow interworking between the two
# instruction sets. This allows thumb code to be executed on a primarily
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] feature-arm-thumb: Fix missing t2 suffix for armv7a MACHINEs
On Wed, Jan 22, 2014 at 12:43:12AM +0100, Martin Jansa wrote:
* unfortunatelly that note about armv7 matching also armv7a is no
longer valid since armv7 include in armv7 was replaced with
armv6+neon in this commit:
commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea
Author: Khem Raj raj.k...@gmail.com
Date: Tue Mar 27 18:37:45 2012 -0700
tune/armv7: Delete
since then thumb and arm feeds had the same architecture
* be aware that this will rename lots of feeds
Can someone confirm that t2 should be included for armv7m or armv7r?
It looks like armv7m definitely should include it, but it doesn't even have
thumb in TUNE_FEATURES for the only armv7m user we have in oe-core cortexm3:
tune-cortexm3.inc:TUNE_FEATURES_tune-cortexm3 = armv7m vfp cortexm3
tune-cortexm3.inc:PACKAGE_EXTRA_ARCHS_tune-cortexm3 =
${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp
tune-cortexr4.inc:TUNE_FEATURES_tune-cortexr4 = armv7r vfp cortexr4
tune-cortexr4.inc:PACKAGE_EXTRA_ARCHS_tune-cortexr4 =
${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7r-vfp
Anyway I'm sending a bit bigger RFC/WIP patchset to address this.
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc
b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index bd754be..fa3a4e5 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = ${@['-marm',
'-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True)
TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, thumb,
${ARM_THUMB_M_OPT}, , d)}
OVERRIDES .= ${@bb.utils.contains(TUNE_FEATURES, thumb, :thumb, ,
d)}
-# Note armv7 will hit on armv7a as well
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv4, thumb
], t, , d)}
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv5, thumb
], t, , d)}
ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv6, thumb
], t, , d)}
-ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv7, thumb
], t2, , d)}
+ARMPKGSFX_THUMB .= ${@bb.utils.contains(TUNE_FEATURES, [ armv7a,
thumb ], t2, , d)}
# Whether to compile with code to allow interworking between the two
# instruction sets. This allows thumb code to be executed on a primarily
--
1.8.5.3
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/19] x86: Replace ia32 with x86 when referring to the generic architecture
ia32 implies 32bit, while these files provide descriptions for IA32,
X86_64, and X32 architectures. The term x86 fits this used better
without resorting to using the term Intel which isn't quite right as
it excludes things like the tune-c3 file describing a Via CPU.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-c3.inc |2 +-
meta/conf/machine/include/tune-i586.inc|2 +-
meta/conf/machine/include/tune-x86_64.inc |2 +-
.../include/{ia32-base.inc = x86-base.inc}| 18 +-
meta/conf/machine/include/{ia32 = x86}/README |6 +++---
.../{ia32/arch-ia32.inc = x86/arch-x86.inc} |2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
rename meta/conf/machine/include/{ia32-base.inc = x86-base.inc} (72%)
rename meta/conf/machine/include/{ia32 = x86}/README (81%)
rename meta/conf/machine/include/{ia32/arch-ia32.inc = x86/arch-x86.inc} (97%)
diff --git a/meta/conf/machine/include/tune-c3.inc
b/meta/conf/machine/include/tune-c3.inc
index 18865b7..fafc28a 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
TUNEVALID[c3] = VIA Cyrix III or VIA C3 specific optimizations
TUNECONFLICTS[c3] = m64 mx32
diff --git a/meta/conf/machine/include/tune-i586.inc
b/meta/conf/machine/include/tune-i586.inc
index 4542b9b..a315b35 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,6 +1,6 @@
DEFAULTTUNE ?= i586
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
# Extra tune features
TUNEVALID[i586] = Enable i586 specific processor optimizations
diff --git a/meta/conf/machine/include/tune-x86_64.inc
b/meta/conf/machine/include/tune-x86_64.inc
index 31e06da..ae48124 100644
--- a/meta/conf/machine/include/tune-x86_64.inc
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -1,4 +1,4 @@
DEFAULTTUNE ?= x86-64
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
diff --git a/meta/conf/machine/include/ia32-base.inc
b/meta/conf/machine/include/x86-base.inc
similarity index 72%
rename from meta/conf/machine/include/ia32-base.inc
rename to meta/conf/machine/include/x86-base.inc
index e15f927..d6c4d60 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -1,9 +1,9 @@
#
-# base machine settings for ia32-architecture BSPs
+# Base machine settings for X86 architecture BSPs
#
#
-# common settings for Intel-based machines
+# common settings for X86 machines
#
MACHINE_FEATURES += screen keyboard pci usbhost ext2 ext3 x86 \
acpi serial usbgadget alsa
@@ -25,28 +25,28 @@ PREFERRED_VERSION_linux-yocto ??= 3.0%
#
# XSERVER subcomponents, used to build the XSERVER variable
#
-XSERVER_IA32_BASE = xserver-xorg \
+XSERVER_X86_BASE = xserver-xorg \
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-evdev \
xf86-input-synaptics \
-XSERVER_IA32_EXT = \
+XSERVER_X86_EXT = \
${@base_contains('DISTRO_FEATURES', 'opengl',
'xserver-xorg-extension-glx', '', d)} \
xserver-xorg-module-libint10 \
-XSERVER_IA32_I915 = xf86-video-intel \
+XSERVER_X86_I915 = xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915',
'', d)} \
-XSERVER_IA32_I965 = xf86-video-intel \
+XSERVER_X86_I965 = xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965',
'', d)} \
-XSERVER_IA32_VESA = xf86-video-vesa
+XSERVER_X86_VESA = xf86-video-vesa
-XSERVER_IA32_FBDEV = xf86-video-fbdev
+XSERVER_X86_FBDEV = xf86-video-fbdev
-XSERVER_IA32_MODESETTING = xf86-video-modesetting
+XSERVER_X86_MODESETTING = xf86-video-modesetting
diff --git a/meta/conf/machine/include/ia32/README
b/meta/conf/machine/include/x86/README
similarity index 81%
rename from meta/conf/machine/include/ia32/README
rename to meta/conf/machine/include/x86/README
index 8f80a5b..d8b6793 100644
--- a/meta/conf/machine/include/ia32/README
+++ b/meta/conf/machine/include/x86/README
@@ -1,12 +1,12 @@
2012/03/30 - Mark Hatle mark.ha...@windriver.com
- Initial version
-Most of the items for the IA architecture are defined in the single
-arch-ia32 file.
+Most of the items for the Intel architectures are defined in the single
+arch-x86 file.
Three ABIs are define, m32, mx32 and m64.
-The following is the
[OE-core] [PATCH 16/19] yocto-bsp: Update substrate to use the new x86 tune files
Update the substrates to use x86-base instead of ia32-base and core2-64
instead of x86-64. Update the core2 bit to include the DEFAULTTUNE to be
explicit.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
.../arch/i386/conf/machine/{{=machine}}.conf | 13 +++--
.../arch/x86_64/conf/machine/{{=machine}}.conf | 15 ---
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git
a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
index b06ba12..2fff9b7 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
@@ -23,9 +23,10 @@ require conf/machine/include/tune-i586.inc
{{ if tunefile == tune_atom: }}
require conf/machine/include/tune-atom.inc
{{ if tunefile == tune_core2: }}
+DEFAULTTUNE=core2-32
require conf/machine/include/tune-core2.inc
-require conf/machine/include/ia32-base.inc
+require conf/machine/include/x86-base.inc
MACHINE_FEATURES += wifi efi pcbios
@@ -46,14 +47,14 @@ MACHINE_FEATURES += wifi efi pcbios
{{ if xserver == y and kernel_choice != linux-yocto_3.4 and kernel_choice
!= linux-yocto_3.10 and kernel_choice != custom: xserver_choice =
xserver_i915 }}
{{ if xserver == y: }}
-XSERVER ?= ${XSERVER_IA32_BASE} \
- ${XSERVER_IA32_EXT} \
+XSERVER ?= ${XSERVER_X86_BASE} \
+ ${XSERVER_X86_EXT} \
{{ if xserver == y and xserver_choice == xserver_vesa: }}
- ${XSERVER_IA32_VESA} \
+ ${XSERVER_X86_VESA} \
{{ if xserver == y and xserver_choice == xserver_i915: }}
- ${XSERVER_IA32_I915} \
+ ${XSERVER_X86_I915} \
{{ if xserver == y and xserver_choice == xserver_i965: }}
- ${XSERVER_IA32_I965} \
+ ${XSERVER_X86_I965} \
{{ if xserver == y: }}
diff --git
a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
b/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
index 2bf2226..6685d07 100644
---
a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
+++
b/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
@@ -14,8 +14,9 @@ PREFERRED_PROVIDER_virtual/kernel ?= {{=preferred_kernel}}
PREFERRED_PROVIDER_virtual/kernel ?= {{=preferred_kernel}}
PREFERRED_VERSION_{{=preferred_kernel}} ?= {{=preferred_kernel_version}}%
-require conf/machine/include/tune-x86_64.inc
-require conf/machine/include/ia32-base.inc
+DEFAULTTUNE ?= core2-64
+require conf/machine/include/tune-core2.inc
+require conf/machine/include/x86-base.inc
MACHINE_FEATURES += wifi efi pcbios
@@ -28,14 +29,14 @@ MACHINE_FEATURES += wifi efi pcbios
{{ input type:choice val:xserver_i915 msg:i915 xserver support }}
{{ input type:choice val:xserver_i965 msg:i965 xserver support }}
{{ if xserver == y: }}
-XSERVER ?= ${XSERVER_IA32_BASE} \
- ${XSERVER_IA32_EXT} \
+XSERVER ?= ${XSERVER_X86_BASE} \
+ ${XSERVER_X86_EXT} \
{{ if xserver == y and xserver_choice == xserver_vesa: }}
- ${XSERVER_IA32_VESA} \
+ ${XSERVER_X86_VESA} \
{{ if xserver == y and xserver_choice == xserver_i915: }}
- ${XSERVER_IA32_I915} \
+ ${XSERVER_X86_I915} \
{{ if xserver == y and xserver_choice == xserver_i965: }}
- ${XSERVER_IA32_I965} \
+ ${XSERVER_X86_I965} \
{{ if xserver == y: }}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/19] i586: Only add the current tune to PACKAGE_EXTRA_ARCHS
The generic x86 build supports i586 by default, so this specific tune
file technically doesn't add any specific ARCHes to PACKAGE_EXTRA_ARCHS.
For consistency, append the current tune to PACKAGE_EXTRA_ARCHS.
Since we do not have specific tune files for i386 and i486, just drop
them.
These could be added to tune-x86 version if there is a need to
maintain them, but they really do not belong here.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-i586.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-i586.inc
b/meta/conf/machine/include/tune-i586.inc
index a315b35..5fbb3c7 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -11,4 +11,4 @@ AVAILTUNES += i586
TUNE_FEATURES_tune-i586 = ${TUNE_FEATURES_tune-x86} i586
BASE_LIB_tune-i586 = lib
TUNE_PKGARCH_tune-i586 = i586
-PACKAGE_EXTRA_ARCHS_tune-i586 = ${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486
i586
+PACKAGE_EXTRA_ARCHS_tune-i586 = ${PACKAGE_EXTRA_ARCHS_tune-x86} i586
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 00/19] Update x86 tune files
All,
The following lays the groundwork for some rethinking of support for x86
platforms. In particular, the meta-intel layer will undergo some major
refactoring once this is merged. We believe it is of value to keep as much
of the tune files available in oe-core as possible, rather than isolating
them all in meta-intel.
This series renames the x86-related tune files, documents best practices,
updates the core2 tune file, adds a corei7 tune file, and updates the dependent
machine configs. This spans oe-core and poky and I feel it is best viewed as a
whole. Please forgive the cross-post.
The new corei7 tune file applies to Nehalem and Silvermont (Bay Trail) CPUs
which support up to SSE4.2. This provides an appropriate demarcation line while
maximizing compatibility as well as including optimal support for the current
generation of the embedded CPUs (Bay Trail) by including it in the new tune. AVX
(Sandy Bridge and beyond) is not included as that would not apply to Bay Trail,
although it can easily be added in a corei7-avx tune file as an additional
patch for users who care more about the last few percent of performance over
compatibility and consolidation.
An important note and likely a point of contention: The core2 update changes the
core2 arch to core2-32, making the 32 bit explicit rather than implied in order
to provide a consistent naming scheme going forward with newer tunes where
64 bit would be logical assumption if not explicitly stated. See patch 5/15 for
details on this bit.
Update the machines dependent on these tune files to use the new names.
As we remove x86_64, the 64b x86 machines now build as core2-64 for maximum
compatibility.
For reference, the corei7-64 tune defines:
TARGET_CC_ARCH= -m64 -march=corei7 -mtune=corei7 -mfpmath=sse -msse4.2
While the corei2-32 tune defines:
TARGET_CC_ARCH= -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse
v2:
o Replace Intel with X86 in the x86-base.inc per Martin Jansa's review
o Update the yocto-bsp substrate templates for core2 and corei7 tunes
o Update the profile-manual documentation for core2-32 terminology
o Add eglibc-ld.inc patch this one needs review
The following changes since commit 6e7047434fc1570146ebc942V54412b99b1c4cab4:
poky.ent: Fixed broken OE_LISTS_URL. (2014-01-21 21:58:03 +)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib dvhart/x86-tune-ng-v2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dvhart/x86-tune-ng-v2
Darren Hart (19):
x86: Replace ia32 with x86 when referring to the generic architecture
i586: Only add the current tune to PACKAGE_EXTRA_ARCHS
tune-core2: Replace -mtune=generic with -mtune=core2
tune-core2: Only add the current ARCH to PACKAGE_EXTRA_ARCHS
tune: Make 32b or 64b explicit in tune name for core2
tune-corei7: Add support for cpu-type corei7
tune: Remove tune-x86_64.inc
tune: README: Whitespace cleanup
tune: README: Document best practice
tune: README: Typographical corrections
qemux86_64: Use the core2-64 tune
genericx86: Use the core2 tune file
genericx86-64: Use the core2-64 tune
genericx86: Use new x86 tune files
genericx86: Use require instead of include
yocto-bsp: Update substrate to use the new x86 tune files
eglibc-ld.inc: Update the inc file to match the new x86 tune
doc: Update profile-manual to use new core2_32 tune name
yocto-bsp: Add core2 and corei7 tune choice to x86_64
.../profile-manual/profile-manual-usage.xml|8 +-
meta-yocto-bsp/conf/machine/genericx86-64.conf |5 +-
meta-yocto-bsp/conf/machine/genericx86.conf|5 +-
.../conf/machine/include/genericx86-common.inc | 16 +--
meta/conf/machine/include/README | 109
meta/conf/machine/include/tune-c3.inc |2 +-
meta/conf/machine/include/tune-core2.inc | 23 +++--
meta/conf/machine/include/tune-corei7.inc | 35 +++
meta/conf/machine/include/tune-i586.inc|4 +-
meta/conf/machine/include/tune-x86_64.inc |4 -
.../include/{ia32-base.inc = x86-base.inc}| 18 ++--
meta/conf/machine/include/{ia32 = x86}/README |6 +-
.../{ia32/arch-ia32.inc = x86/arch-x86.inc} |2 +-
meta/conf/machine/qemux86-64.conf |3 +-
meta/recipes-core/eglibc/eglibc-ld.inc |4 +-
.../arch/i386/conf/machine/{{=machine}}.conf | 13 +--
.../arch/x86_64/conf/machine/{{=machine}}.conf | 23 +++--
17 files changed, 177 insertions(+), 103 deletions(-)
create mode 100644 meta/conf/machine/include/tune-corei7.inc
delete mode 100644 meta/conf/machine/include/tune-x86_64.inc
rename meta/conf/machine/include/{ia32-base.inc = x86-base.inc} (72%)
rename meta/conf/machine/include/{ia32 = x86}/README (81%)
rename meta/conf/machine/include/{ia32/arch-ia32.inc = x86/arch-x86.inc} (97%)
--
1.7.9.5
___
[OE-core] [PATCH 13/19] genericx86-64: Use the core2-64 tune
As x86_64 has been demoted to an ABI definition rather than a concrete tune file, replace it with core2-64 for the genericx86-64 machine. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Paul Eggleton paul.eggle...@intel.com Cc: Tom Zanussi tom.zanu...@intel.com Cc: Nitin Kamble nitin.a.kam...@intel.com Cc: Mark Hatle mark.ha...@windriver.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com Cc: Martin Jansa martin.ja...@gmail.com Cc: Ross Burton ross.bur...@intel.com --- meta-yocto-bsp/conf/machine/genericx86-64.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index 56e9bb6..a6154cd 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. -include conf/machine/include/tune-x86_64.inc +DEFAULTTUNE ?= core2-64 +include conf/machine/include/tune-core2.inc include conf/machine/include/genericx86-common.inc -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/19] genericx86: Use the core2 tune file
Aside from the movbe and specialized instruction scheduling for the lack of out-of-order scheduling in the older Atom CPUs, the core2 tune covers these CPUs adequately. Since the current atom tune just uses core2 anyway, go ahead and make this explicit here. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Paul Eggleton paul.eggle...@intel.com Cc: Tom Zanussi tom.zanu...@intel.com Cc: Nitin Kamble nitin.a.kam...@intel.com Cc: Mark Hatle mark.ha...@windriver.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com Cc: Martin Jansa martin.ja...@gmail.com Cc: Ross Burton ross.bur...@intel.com --- meta-yocto-bsp/conf/machine/genericx86.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 9d29f62..549fc8e 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. -include conf/machine/include/tune-atom.inc +DEFAULTTUNE ?= core2-32 +include conf/machine/include/tune-core2.inc include conf/machine/include/genericx86-common.inc -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/19] tune: README: Typographical corrections
No new content, just correcting a few typographical errors.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/README |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/conf/machine/include/README b/meta/conf/machine/include/README
index 6c390ad..d66130a 100644
--- a/meta/conf/machine/include/README
+++ b/meta/conf/machine/include/README
@@ -53,10 +53,10 @@ list should be dynamic! i.e.
${@bb.utils.contains(TUNE_FEATURES, feature, cflag, !cflag, d)}
TUNE_ARCH - The GNU canonical arch for a specific architecture. i.e.
-arm, armeb, mips, mips64, etc. This value is by bitbake to setup
+arm, armeb, mips, mips64, etc. This value is used by bitbake to setup
configure. TUNE_ARCH definitions are specific to a given architecture.
-They may be a single static definitions, or may be dynamically adjusted.
-See each architectures README for details for that CPU family.
+They may be a single static definition, or may be dynamically adjusted.
+See each architecture's README for details for that CPU family.
TUNE_PKGARCH - The package architecture used by the packaging systems to
define the architecture, abi and tuning of a particular package.
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/19] tune: README: Document best practice
Describe the expected usage of base architecture tune files and arch-specific files, specifically the stacking of generations. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Paul Eggleton paul.eggle...@intel.com Cc: Tom Zanussi tom.zanu...@intel.com Cc: Nitin Kamble nitin.a.kam...@intel.com Cc: Mark Hatle mark.ha...@windriver.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com Cc: Martin Jansa martin.ja...@gmail.com --- meta/conf/machine/include/README | 19 +++ 1 file changed, 19 insertions(+) diff --git a/meta/conf/machine/include/README b/meta/conf/machine/include/README index 65d0942..6c390ad 100644 --- a/meta/conf/machine/include/README +++ b/meta/conf/machine/include/README @@ -1,6 +1,9 @@ 2012/03/30 - Mark Hatle mark.ha...@windriver.com - Initial Revision + +Introduction + The individual CPU, and ABI tunings are contained in this directory. A number of local and global variables are used to control the way the tunings are setup and how they work together to specify an optimized @@ -79,3 +82,19 @@ configured in the same way that TUNE_CCARGS is. BASE_LIB_tune-tune - The /lib location for a specific ABI. This is used in a multilib configuration to place the libraries in the correct, non-conflicting locations. + + +Best Practice += +The tune infrastructure is designed to be hierarchical. When writing a +new tune file for a fast-forward CPU architecture (one that supports +everything from a previous generation), it is recommended to require the +previous generation tune file and specify PACKAGE_EXTRA_ARCHS using the +previous generation's override and appending the new tune. Note that +only one previous tune file should be included to avoid mutiple includes +of the base arch which could lead to a broken configuration due to +multiple prepend and append assignments. + +For example, for x86, there is a common x86/arch-x86.inc which is +included in the base i586 tune file. The core2 tune builds +on that, and corei7 builds on core2. -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/19] tune-core2: Replace -mtune=generic with -mtune=core2
-march specifies which ISA to use. -mtune specifies which cpu-type to
optimize instruction ordering for, but not which ISA to use. There are
times when it may make sense to specify mtune=generic and use a more
specific march, such as core2, but the opposite makes little sense at
all: use cpu-type specific ISA, but order the instructions
generically. While the -mtune is implied by -march, gcc does not verify
it is using -mtune=core2 with:
gcc -Q -march=core2 --help=target
Explicitly specify -mtune=core2 to be sure.
Add a comment header describing the CPUs targeted by this tune file.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-core2.inc | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-core2.inc
b/meta/conf/machine/include/tune-core2.inc
index 85b6924..3b25197 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -1,10 +1,18 @@
+# Settings for the GCC(1) cpu-type core2:
+#
+# Intel Core2 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3 and SSSE3
+# instruction set support.
+#
+# This tune is recommended for the Intel Core 2 CPU family, including Conroe,
+# Merom and beyond, as well as the first Atom CPUs, Diamondville, and beyond.
+#
DEFAULTTUNE ?= core2
require conf/machine/include/tune-i586.inc
# Extra tune features
TUNEVALID[core2] = Enable core2 specific processor optimizations
-TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, core2, -march=core2
-msse3 -mtune=generic -mfpmath=sse, , d)}
+TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, core2, -march=core2
-mtune=core2 -msse3 -mfpmath=sse, , d)}
# Extra tune selections
AVAILTUNES += core2
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/19] tune: Remove tune-x86_64.inc
The tune-x86_64.inc file is conceptually flawed. x86_64 is more akin to the x86 and x86-32 ABIs defined in arch-x86.inc than it is a concrete tune file, such as i586 or core2 - to the extent that everything but the default tune is defined in the arch-x86.inc file. This becomes very apparant when attempting to include tune-x86_64.inc in the x86 tune hierarchy. Remove the tune-x86_64.inc tune file in favor of it being an ABI definition in arch-x86.inc and relying on the linear hierarchy of concrete cpu-types in tune-i586, tune-core2, and tune-corei7. core2_64 should suffice in lieu of x86_64 for all but a couple esoteric corner cases involving older pre-core2 CPUs. In these cases, if they exist at all, the BSP can replace the include tune-x86_64.inc with arch-x86.inc and set the default tune to x86_64. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Paul Eggleton paul.eggle...@intel.com Cc: Tom Zanussi tom.zanu...@intel.com Cc: Nitin Kamble nitin.a.kam...@intel.com Cc: Mark Hatle mark.ha...@windriver.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com Cc: Martin Jansa martin.ja...@gmail.com --- meta/conf/machine/include/tune-x86_64.inc |4 1 file changed, 4 deletions(-) delete mode 100644 meta/conf/machine/include/tune-x86_64.inc diff --git a/meta/conf/machine/include/tune-x86_64.inc b/meta/conf/machine/include/tune-x86_64.inc deleted file mode 100644 index ae48124..000 --- a/meta/conf/machine/include/tune-x86_64.inc +++ /dev/null @@ -1,4 +0,0 @@ -DEFAULTTUNE ?= x86-64 - -require conf/machine/include/x86/arch-x86.inc - -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/19] genericx86: Use require instead of include
Use require instead of include to avoid silent errors when the required tune files change name or are moved. It's going to fail anyway, it might as well fail with an error message that is immediately helpful. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Paul Eggleton paul.eggle...@intel.com Cc: Tom Zanussi tom.zanu...@intel.com Cc: Nitin Kamble nitin.a.kam...@intel.com Cc: Mark Hatle mark.ha...@windriver.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com Cc: Martin Jansa martin.ja...@gmail.com Cc: Ross Burton ross.bur...@intel.com --- meta-yocto-bsp/conf/machine/genericx86-64.conf |4 ++-- meta-yocto-bsp/conf/machine/genericx86.conf|4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index a6154cd..f76e35a 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -4,5 +4,5 @@ #@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. DEFAULTTUNE ?= core2-64 -include conf/machine/include/tune-core2.inc -include conf/machine/include/genericx86-common.inc +require conf/machine/include/tune-core2.inc +require conf/machine/include/genericx86-common.inc diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 549fc8e..2642cab 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf @@ -4,5 +4,5 @@ #@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on typical hardware. DEFAULTTUNE ?= core2-32 -include conf/machine/include/tune-core2.inc -include conf/machine/include/genericx86-common.inc +require conf/machine/include/tune-core2.inc +require conf/machine/include/genericx86-common.inc -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/19] qemux86_64: Use the core2-64 tune
As x86_64 has been demoted to an ABI definition rather than a concrete tune file, replace it with core2-64 for the qemux86-64 machine. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Paul Eggleton paul.eggle...@intel.com Cc: Tom Zanussi tom.zanu...@intel.com Cc: Nitin Kamble nitin.a.kam...@intel.com Cc: Mark Hatle mark.ha...@windriver.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com Cc: Martin Jansa martin.ja...@gmail.com --- meta/conf/machine/qemux86-64.conf |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index c572225..6533e56 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -8,7 +8,8 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= mesa PREFERRED_PROVIDER_virtual/libgles2 ?= mesa require conf/machine/include/qemu.inc -require conf/machine/include/tune-x86_64.inc +DEFAULTTUNE ?= core2-64 +require conf/machine/include/tune-core2.inc KERNEL_IMAGETYPE = bzImage -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/19] genericx86: Use new x86 tune files
Use the new names for the x86 tunes files (x86 instead of ia32).
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
Cc: Ross Burton ross.bur...@intel.com
---
.../conf/machine/include/genericx86-common.inc | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index c5ef358..66bfd19 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -1,16 +1,16 @@
-include conf/machine/include/ia32-base.inc
+include conf/machine/include/x86-base.inc
MACHINE_FEATURES += wifi efi pcbios
PREFERRED_PROVIDER_virtual/kernel ?= linux-yocto
PREFERRED_VERSION_linux-yocto ?= 3.10%
PREFERRED_PROVIDER_virtual/xserver ?= xserver-xorg
-XSERVER ?= ${XSERVER_IA32_BASE} \
-${XSERVER_IA32_EXT} \
-${XSERVER_IA32_I915} \
-${XSERVER_IA32_I965} \
-${XSERVER_IA32_FBDEV} \
-${XSERVER_IA32_VESA} \
-${XSERVER_IA32_MODESETTING} \
+XSERVER ?= ${XSERVER_X86_BASE} \
+${XSERVER_X86_EXT} \
+${XSERVER_X86_I915} \
+${XSERVER_X86_I965} \
+${XSERVER_X86_FBDEV} \
+${XSERVER_X86_VESA} \
+${XSERVER_X86_MODESETTING} \
MACHINE_EXTRA_RRECOMMENDS += linux-firmware v86d eee-acpi-scripts
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/19] tune-corei7: Add support for cpu-type corei7
corei7 offers a significant advancement since the previous core2
cpu-type described in the tune-core2 file.
From the GCC(1):
Intel Core i7 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3,
SSSE3, SSE4.1 and SSE4.2 instruction set support.
This offers optimizations for Nehalem and Silvermont (e.g. Bay Trail)
CPUs (and beyond).
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-corei7.inc | 35 +
1 file changed, 35 insertions(+)
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 000..5464fed
--- /dev/null
+++ b/meta/conf/machine/include/tune-corei7.inc
@@ -0,0 +1,35 @@
+# Settings for the GCC(1) cpu-type corei7:
+#
+# Intel Core i7 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3,
SSE4.1
+# and SSE4.2 instruction set support.
+#
+# This tune is recommended for Intel Nehalem and Silvermont (e.g. Bay Trail)
CPUs
+# (and beyond).
+#
+DEFAULTTUNE ?= corei7-64
+
+# Pull in the previous tune in to pull in PACKAGE_EXTRA_ARCHS
+require conf/machine/include/tune-core2.inc
+
+# Extra tune features
+TUNEVALID[corei7] = Enable corei7 specific processor optimizations
+TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, corei7,
-march=corei7 -mtune=corei7 -mfpmath=sse -msse4.2, , d)}
+
+# Extra tune selections
+AVAILTUNES += corei7-32
+TUNE_FEATURES_tune-corei7-32 = ${TUNE_FEATURES_tune-x86} corei7
+BASE_LIB_tune-corei7-32 = lib
+TUNE_PKGARCH_tune-corei7-32 = corei7_32
+PACKAGE_EXTRA_ARCHS_tune-corei7-32 = ${PACKAGE_EXTRA_ARCHS_tune-core2}
corei7_32
+
+AVAILTUNES += corei7-64
+TUNE_FEATURES_tune-corei7-64 = ${TUNE_FEATURES_tune-x86-64} corei7
+BASE_LIB_tune-corei7-64 = lib64
+TUNE_PKGARCH_tune-corei7-64 = corei7_64
+PACKAGE_EXTRA_ARCHS_tune-corei7-64 = ${PACKAGE_EXTRA_ARCHS_tune-core2-64}
corei7_64
+
+AVAILTUNES += corei7-64-x32
+TUNE_FEATURES_tune-corei7-64-x32 = ${TUNE_FEATURES_tune-x86-64-x32} corei7
+BASE_LIB_tune-corei7-64-x32 = libx32
+TUNE_PKGARCH_tune-corei7-64-x32 = corei7_64_x32
+PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 =
${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7_64_x32
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/19] tune: README: Whitespace cleanup
Before making content changes, cleanup the various whitespace errors in
this file. Mostly end-of-line whitepsace.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/README | 88 +++---
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/meta/conf/machine/include/README b/meta/conf/machine/include/README
index e4b59c9..65d0942 100644
--- a/meta/conf/machine/include/README
+++ b/meta/conf/machine/include/README
@@ -1,27 +1,27 @@
2012/03/30 - Mark Hatle mark.ha...@windriver.com
- Initial Revision
-The individual CPU, and ABI tunings are contained in this directory. A
-number of local and global variables are used to control the way the
-tunings are setup and how they work together to specify an optimized
+The individual CPU, and ABI tunings are contained in this directory. A
+number of local and global variables are used to control the way the
+tunings are setup and how they work together to specify an optimized
configuration.
-The following is brief summary of the generic components that are used
+The following is brief summary of the generic components that are used
in these tunings.
-AVAILTUNES - This is a list of all of the tuning definitions currently
-available in the system. Not all tunes in this list may be compatible
-with the machine configuration, or each other in a multilib
-configuration. Each tuning file can add to this list using +=, but
+AVAILTUNES - This is a list of all of the tuning definitions currently
+available in the system. Not all tunes in this list may be compatible
+with the machine configuration, or each other in a multilib
+configuration. Each tuning file can add to this list using +=, but
should never replace the list using =.
-DEFAULTTUNE - This specifies the tune to use for a particular build.
-Each tune should specify a reasonable default, which can be overriden by
-a machine or multilib configuration. The specified tune must be listed
+DEFAULTTUNE - This specifies the tune to use for a particular build.
+Each tune should specify a reasonable default, which can be overriden by
+a machine or multilib configuration. The specified tune must be listed
in the AVAILTUNES.
-TUNEVALID[feature] - The feature is defined with a human readable
-explanation for what it does. All architectural, cpu, abi, etc tuning
+TUNEVALID[feature] - The feature is defined with a human readable
+explanation for what it does. All architectural, cpu, abi, etc tuning
features must be defined using TUNEVALID.
TUNECONFLICTS[feature] - A list of features which conflict with feature.
@@ -31,51 +31,51 @@ tuning ends up with features which conflict with each other.
TUNE_FEATURES - This is automatically defined as TUNE_FEATURES_tune-tune.
See TUNE_FEATURES_tune-tune for more information.
-TUNE_FEATURES_tune-tune - Specify the features used to describe a
-specific tune. This is a list of features that a tune support, each
-feature must be in the TUNEVALID list. Note: the tune and a given
-feature name may be the same, but they have different purposes. Only
-features may be used to change behavior, while tunes are used to
+TUNE_FEATURES_tune-tune - Specify the features used to describe a
+specific tune. This is a list of features that a tune support, each
+feature must be in the TUNEVALID list. Note: the tune and a given
+feature name may be the same, but they have different purposes. Only
+features may be used to change behavior, while tunes are used to
describe an overall set of features.
-ABIEXTENSION - An ABI extension may be specified by a specific feature
-or other tuning setting, such as TARGET_FPU. Any ABI extensions either
-need to be defined in the architectures base arch file, i.e.
-ABIEXTENSION = eabi in the arm case, or appended to in specific tune
+ABIEXTENSION - An ABI extension may be specified by a specific feature
+or other tuning setting, such as TARGET_FPU. Any ABI extensions either
+need to be defined in the architectures base arch file, i.e.
+ABIEXTENSION = eabi in the arm case, or appended to in specific tune
files with a .=. Spaces are not allowed in this variable.
-TUNE_CCARGS - Setup the cflags based on the TUNE_FEATURES settings.
-These should be additive when defined using +=. All items in this
-list should be dynamic! i.e.
+TUNE_CCARGS - Setup the cflags based on the TUNE_FEATURES settings.
+These should be additive when defined using +=. All items in this
+list should be dynamic! i.e.
${@bb.utils.contains(TUNE_FEATURES, feature, cflag, !cflag, d)}
-TUNE_ARCH - The GNU canonical arch for a specific architecture. i.e.
-arm,
[OE-core] [PATCH 19/19] yocto-bsp: Add core2 and corei7 tune choice to x86_64
Update the x86_64 architecture bsp creator to include choices for core2
and corei7 tune files.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
.../arch/x86_64/conf/machine/{{=machine}}.conf |8
1 file changed, 8 insertions(+)
diff --git
a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
b/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
index 6685d07..53e8e92 100644
---
a/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
+++
b/scripts/lib/bsp/substrate/target/arch/x86_64/conf/machine/{{=machine}}.conf
@@ -14,8 +14,16 @@ PREFERRED_PROVIDER_virtual/kernel ?= {{=preferred_kernel}}
PREFERRED_PROVIDER_virtual/kernel ?= {{=preferred_kernel}}
PREFERRED_VERSION_{{=preferred_kernel}} ?= {{=preferred_kernel_version}}%
+{{ input type:choicelist name:tunefile prio:40 msg:Which machine tuning
would you like to use? default:tune_core2 }}
+{{ input type:choice val:tune_core2 msg:Core2 tuning optimizations }}
+{{ input type:choice val:tune_corei7 msg:Corei7 tuning optimizations }}
+{{ if tunefile == tune_core2: }}
DEFAULTTUNE ?= core2-64
require conf/machine/include/tune-core2.inc
+{{ if tunefile == tune_corei7: }}
+DEFAULTTUNE ?= corei7-64
+require conf/machine/include/tune-corei7.inc
+
require conf/machine/include/x86-base.inc
MACHINE_FEATURES += wifi efi pcbios
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 18/19] doc: Update profile-manual to use new core2_32 tune name
Replace core2 with core2_32 where appropriate for the new x86 tune naming. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Scott Rifenbark scott.m.rifenb...@intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Paul Eggleton paul.eggle...@intel.com Cc: Tom Zanussi tom.zanu...@intel.com Cc: Nitin Kamble nitin.a.kam...@intel.com Cc: Mark Hatle mark.ha...@windriver.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com Cc: Martin Jansa martin.ja...@gmail.com --- .../profile-manual/profile-manual-usage.xml|8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/profile-manual/profile-manual-usage.xml b/documentation/profile-manual/profile-manual-usage.xml index faae645..5577b1b 100644 --- a/documentation/profile-manual/profile-manual-usage.xml +++ b/documentation/profile-manual/profile-manual-usage.xml @@ -381,13 +381,13 @@ build/tmp/deploy/rpm/* on the host system. Find the busybox-dbg-...rpm file and copy it to the target. For example: literallayout class='monospaced' - [trz@empanada core2]$ scp /home/trz/yocto/crownbay-tracing-dbg/build/tmp/deploy/rpm/core2/busybox-dbg-1.20.2-r2.core2.rpm root@192.168.1.31: + [trz@empanada core2]$ scp /home/trz/yocto/crownbay-tracing-dbg/build/tmp/deploy/rpm/core2_32/busybox-dbg-1.20.2-r2.core2_32.rpm root@192.168.1.31: root@192.168.1.31's password: - busybox-dbg-1.20.2-r2.core2.rpm 100% 1826KB 1.8MB/s 00:01 + busybox-dbg-1.20.2-r2.core2_32.rpm 100% 1826KB 1.8MB/s 00:01 /literallayout Now install the debug rpm on the target: literallayout class='monospaced' - root@crownbay:~# rpm -i busybox-dbg-1.20.2-r2.core2.rpm + root@crownbay:~# rpm -i busybox-dbg-1.20.2-r2.core2_32.rpm /literallayout Now that the debuginfo is installed, we see that the busybox entries now display their functions symbolically: @@ -3024,7 +3024,7 @@ First cd into the build directory that contains the hello executable: literallayout class='monospaced' - $ cd build/tmp/work/core2-poky-linux/lttng-ust/2.0.5-r0/git/tests/hello/.libs + $ cd build/tmp/work/core2_32-poky-linux/lttng-ust/2.0.5-r0/git/tests/hello/.libs /literallayout Copy that over to the target machine: literallayout class='monospaced' -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/19] tune: Make 32b or 64b explicit in tune name for core2
Core2 has both a 32b and a 64b variant. Currently, core2 implies 32b,
while core2_64 is the 64b version. This implicit 32b mode will become
confusing in later architectures, such as corei7, where it would be
natural for people to assume corei7 meant 64 bit.
Rather than carrying forward an implicit 32b mode and rather than
changing the naming scheme part way through the architecture hiearchy,
make the 32b and 64b variant explicit in the tune name by changing core2
to core2_32.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-core2.inc | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/conf/machine/include/tune-core2.inc
b/meta/conf/machine/include/tune-core2.inc
index 2500a74..11517dc 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -6,7 +6,7 @@
# This tune is recommended for the Intel Core 2 CPU family, including Conroe,
# Merom and beyond, as well as the first Atom CPUs, Diamondville, and beyond.
#
-DEFAULTTUNE ?= core2
+DEFAULTTUNE ?= core2-32
# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
require conf/machine/include/tune-i586.inc
@@ -16,11 +16,11 @@ TUNEVALID[core2] = Enable core2 specific processor
optimizations
TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, core2, -march=core2
-mtune=core2 -msse3 -mfpmath=sse, , d)}
# Extra tune selections
-AVAILTUNES += core2
-TUNE_FEATURES_tune-core2 = ${TUNE_FEATURES_tune-x86} core2
-BASE_LIB_tune-core2 = lib
-TUNE_PKGARCH_tune-core2 = core2
-PACKAGE_EXTRA_ARCHS_tune-core2 = ${PACKAGE_EXTRA_ARCHS_tune-i586} core2
+AVAILTUNES += core2-32
+TUNE_FEATURES_tune-core2-32 = ${TUNE_FEATURES_tune-x86} core2
+BASE_LIB_tune-core2-32 = lib
+TUNE_PKGARCH_tune-core2-32 = core2_32
+PACKAGE_EXTRA_ARCHS_tune-core2-32 = ${PACKAGE_EXTRA_ARCHS_tune-i586} core2_32
AVAILTUNES += core2-64
TUNE_FEATURES_tune-core2-64 = ${TUNE_FEATURES_tune-x86-64} core2
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/19] tune-core2: Only add the current ARCH to PACKAGE_EXTRA_ARCHS
Inherit the PACKAGE_EXTRA_ARCHS from i586 and only explicitly add core2
here.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-core2.inc |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-core2.inc
b/meta/conf/machine/include/tune-core2.inc
index 3b25197..2500a74 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -8,6 +8,7 @@
#
DEFAULTTUNE ?= core2
+# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
require conf/machine/include/tune-i586.inc
# Extra tune features
@@ -19,7 +20,7 @@ AVAILTUNES += core2
TUNE_FEATURES_tune-core2 = ${TUNE_FEATURES_tune-x86} core2
BASE_LIB_tune-core2 = lib
TUNE_PKGARCH_tune-core2 = core2
-PACKAGE_EXTRA_ARCHS_tune-core2 = ${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486
i586 i686 core2
+PACKAGE_EXTRA_ARCHS_tune-core2 = ${PACKAGE_EXTRA_ARCHS_tune-i586} core2
AVAILTUNES += core2-64
TUNE_FEATURES_tune-core2-64 = ${TUNE_FEATURES_tune-x86-64} core2
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 17/19] eglibc-ld.inc: Update the inc file to match the new x86 tune
I created this after a git grep to look for files impacted by the x86
tune changes. I need a careful review here to determine if this is in
fact the right thing to do.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-core/eglibc/eglibc-ld.inc |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/eglibc/eglibc-ld.inc
b/meta/recipes-core/eglibc/eglibc-ld.inc
index b1701f00..6261ae3 100644
--- a/meta/recipes-core/eglibc/eglibc-ld.inc
+++ b/meta/recipes-core/eglibc/eglibc-ld.inc
@@ -22,11 +22,13 @@ def eglibc_dl_info(d):
powerpc-nf: [ld.so.1, FLAG_ELF_LIBC6],
powerpc64: [ld64.so.1, FLAG_ELF_LIBC6],
powerpc64-nf: [ld64.so.1, FLAG_ELF_LIBC6],
-core2: [ld-linux.so.2, FLAG_ELF_LIBC6],
+core2-32: [ld-linux.so.2, FLAG_ELF_LIBC6],
core2-64: [ld-linux-x86-64.so.2, FLAG_ELF_LIBC6],
x86: [ld-linux.so.2, FLAG_ELF_LIBC6],
x86-64: [ld-linux-x86-64.so.2, FLAG_ELF_LIBC6],
i586: [ld-linux.so.2, FLAG_ELF_LIBC6],
+corei7-32: [ld-linux.so.2, FLAG_ELF_LIBC6],
+corei7-64: [ld-linux-x86-64.so.2, FLAG_ELF_LIBC6],
}
infos = {'ldconfig':set(), 'lddrewrite':set()}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/19] x86: Replace ia32 with x86 when referring to the generic architecture
On Tue, Jan 21, 2014 at 04:58:46PM -0800, Darren Hart wrote:
ia32 implies 32bit, while these files provide descriptions for IA32,
X86_64, and X32 architectures. The term x86 fits this used better
without resorting to using the term Intel which isn't quite right as
it excludes things like the tune-c3 file describing a Via CPU.
Signed-off-by: Darren Hart dvh...@linux.intel.com
Cc: Richard Purdie richard.pur...@linuxfoundation.org
Cc: Paul Eggleton paul.eggle...@intel.com
Cc: Tom Zanussi tom.zanu...@intel.com
Cc: Nitin Kamble nitin.a.kam...@intel.com
Cc: Mark Hatle mark.ha...@windriver.com
Cc: Bruce Ashfield bruce.ashfi...@windriver.com
Cc: Martin Jansa martin.ja...@gmail.com
---
meta/conf/machine/include/tune-c3.inc |2 +-
meta/conf/machine/include/tune-i586.inc|2 +-
meta/conf/machine/include/tune-x86_64.inc |2 +-
.../include/{ia32-base.inc = x86-base.inc}| 18 +-
meta/conf/machine/include/{ia32 = x86}/README |6 +++---
.../{ia32/arch-ia32.inc = x86/arch-x86.inc} |2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
rename meta/conf/machine/include/{ia32-base.inc = x86-base.inc} (72%)
rename meta/conf/machine/include/{ia32 = x86}/README (81%)
rename meta/conf/machine/include/{ia32/arch-ia32.inc = x86/arch-x86.inc}
(97%)
diff --git a/meta/conf/machine/include/tune-c3.inc
b/meta/conf/machine/include/tune-c3.inc
index 18865b7..fafc28a 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
TUNEVALID[c3] = VIA Cyrix III or VIA C3 specific optimizations
TUNECONFLICTS[c3] = m64 mx32
diff --git a/meta/conf/machine/include/tune-i586.inc
b/meta/conf/machine/include/tune-i586.inc
index 4542b9b..a315b35 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,6 +1,6 @@
DEFAULTTUNE ?= i586
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
# Extra tune features
TUNEVALID[i586] = Enable i586 specific processor optimizations
diff --git a/meta/conf/machine/include/tune-x86_64.inc
b/meta/conf/machine/include/tune-x86_64.inc
index 31e06da..ae48124 100644
--- a/meta/conf/machine/include/tune-x86_64.inc
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -1,4 +1,4 @@
DEFAULTTUNE ?= x86-64
-require conf/machine/include/ia32/arch-ia32.inc
+require conf/machine/include/x86/arch-x86.inc
diff --git a/meta/conf/machine/include/ia32-base.inc
b/meta/conf/machine/include/x86-base.inc
similarity index 72%
rename from meta/conf/machine/include/ia32-base.inc
rename to meta/conf/machine/include/x86-base.inc
index e15f927..d6c4d60 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -1,9 +1,9 @@
#
-# base machine settings for ia32-architecture BSPs
+# Base machine settings for X86 architecture BSPs
#
#
-# common settings for Intel-based machines
+# common settings for X86 machines
#
MACHINE_FEATURES += screen keyboard pci usbhost ext2 ext3 x86 \
acpi serial usbgadget alsa
@@ -25,28 +25,28 @@ PREFERRED_VERSION_linux-yocto ??= 3.0%
#
# XSERVER subcomponents, used to build the XSERVER variable
#
-XSERVER_IA32_BASE = xserver-xorg \
+XSERVER_X86_BASE = xserver-xorg \
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-evdev \
xf86-input-synaptics \
-XSERVER_IA32_EXT = \
+XSERVER_X86_EXT = \
${@base_contains('DISTRO_FEATURES', 'opengl',
'xserver-xorg-extension-glx', '', d)} \
xserver-xorg-module-libint10 \
-XSERVER_IA32_I915 = xf86-video-intel \
+XSERVER_X86_I915 = xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915',
'', d)} \
-XSERVER_IA32_I965 = xf86-video-intel \
+XSERVER_X86_I965 = xf86-video-intel \
${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965',
'', d)} \
-XSERVER_IA32_VESA = xf86-video-vesa
+XSERVER_X86_VESA = xf86-video-vesa
-XSERVER_IA32_FBDEV = xf86-video-fbdev
+XSERVER_X86_FBDEV = xf86-video-fbdev
-XSERVER_IA32_MODESETTING = xf86-video-modesetting
+XSERVER_X86_MODESETTING = xf86-video-modesetting
diff --git a/meta/conf/machine/include/ia32/README
b/meta/conf/machine/include/x86/README
similarity index 81%
rename from meta/conf/machine/include/ia32/README
rename to meta/conf/machine/include/x86/README
index 8f80a5b..d8b6793 100644
--- a/meta/conf/machine/include/ia32/README
+++ b/meta/conf/machine/include/x86/README
@@ -1,12 +1,12 @@
2012/03/30 - Mark Hatle mark.ha...@windriver.com
- Initial version
-Most of the items for the IA architecture are
[OE-core] [PATCH 0/4] Upgrade busybox to 1.22.1 stable release
The following changes since commit 4659d29b1040349116549644e45035a5b37d9311:
sstate.bbclass: remove previous version's stamp (2014-01-21 10:36:23 +)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/busybox-1.22.1
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/busybox-1.22.1
Chen Qi (4):
busybox: upgrade to stable 1.22.1
meta-skeleton: rename busybox's bbappend file
coreutils: move 'stat' to base_bindir_progs
procps: make the 'watch' command register to /bin/watch
...{busybox_1.21.1.bbappend = busybox_%.bbappend} |0
.../busybox-lineedit-initialize-delptr.patch | 23 --
...usybox-list-suid-and-non-suid-app-configs.patch | 179 -
...sybox-sed-fix-sed-clusternewline-testcase.patch | 262
.../busybox-sulogin-empty-root-password.patch | 58 -
.../busybox/find-get-rid-of-nested-functions.patch | 117 -
.../busybox/busybox/run-parts.in.usr-bin.patch | 29 ---
.../busybox/busybox/stat-usr-bin.patch | 21 --
...estsuite-du-du-k-works-fix-false-positive.patch | 35 ---
.../busybox/busybox/watch.in.usr-bin.patch | 29 ---
.../{busybox_1.21.1.bb = busybox_1.22.1.bb} | 13 +-
meta/recipes-core/busybox/busybox_git.bb | 11 +-
meta/recipes-core/coreutils/coreutils_6.9.bb |4 +-
meta/recipes-core/coreutils/coreutils_8.22.bb |4 +-
meta/recipes-extended/procps/procps.inc|6 +
15 files changed, 14 insertions(+), 777 deletions(-)
rename meta-skeleton/recipes-core/busybox/{busybox_1.21.1.bbappend =
busybox_%.bbappend} (100%)
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
delete mode 100644
meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch
delete mode 100644 meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
delete mode 100644 meta/recipes-core/busybox/busybox/stat-usr-bin.patch
delete mode 100644
meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
delete mode 100644 meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
rename meta/recipes-core/busybox/{busybox_1.21.1.bb = busybox_1.22.1.bb} (66%)
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] coreutils: move 'stat' to base_bindir_progs
To correctly integrate with busybox in our system, we should add 'stat' to base_bindir_progs so that the 'stat' commands from busybox and coreutils both register to /bin/stat. Previously there was a patch in busybox to move 'stat' to /usr/bin. But as we can easily solve this integration problem by modifying the coreutils recipe, this patch has been removed. After all, maintaining a patch that's not accepted by upsteam should not be our No.1 choice. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/recipes-core/coreutils/coreutils_6.9.bb |4 ++-- meta/recipes-core/coreutils/coreutils_8.22.bb |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb index 6375041..5a16872 100644 --- a/meta/recipes-core/coreutils/coreutils_6.9.bb +++ b/meta/recipes-core/coreutils/coreutils_6.9.bb @@ -49,12 +49,12 @@ bindir_progs = base64 basename cksum comm csplit cut dir dircolors dirname du \ env expand expr factor fmt fold groups head hostid id install \ join link logname md5sum mkfifo nice nl nohup od paste pathchk \ pinky pr printenv printf ptx readlink seq sha1sum sha224sum sha256sum \ -sha384sum sha512sum shred shuf sort split stat sum tac tail tee test \ +sha384sum sha512sum shred shuf sort split sum tac tail tee test \ tr tsort tty unexpand uniq unlink users vdir wc who whoami yes uptime # hostname gets a special treatment and is not included in this base_bindir_progs = cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \ - mknod mv pwd rm rmdir sleep stty sync touch true uname hostname + mknod mv pwd rm rmdir sleep stty sync touch true uname hostname stat sbindir_progs= chroot diff --git a/meta/recipes-core/coreutils/coreutils_8.22.bb b/meta/recipes-core/coreutils/coreutils_8.22.bb index 6b222b5..f88373f 100644 --- a/meta/recipes-core/coreutils/coreutils_8.22.bb +++ b/meta/recipes-core/coreutils/coreutils_8.22.bb @@ -38,12 +38,12 @@ bindir_progs = arch basename chcon cksum comm csplit cut dir dircolors dirname env expand expr factor fmt fold groups head hostid id install \ join link logname md5sum mkfifo nice nl nohup nproc od paste pathchk \ pinky pr printenv printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \ -sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\ +sha384sum sha512sum shred shuf sort split stdbuf sum tac tail tee test timeout\ tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes # hostname gets a special treatment and is not included in this base_bindir_progs = cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \ - mknod mv pwd rm rmdir sleep stty sync touch true uname + mknod mv pwd rm rmdir sleep stty sync touch true uname stat sbindir_progs= chroot -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] procps: make the 'watch' command register to /bin/watch
This solves the integration problem with busybox.
Previously, there was a patch in busybox to move 'watch' to /usr/bin.
Such patch is not accepted by upsteam and really not necessary as
our ALTERNATIVE system can easily solve such intergration problem.
Signed-off-by: Chen Qi qi.c...@windriver.com
---
meta/recipes-extended/procps/procps.inc |6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-extended/procps/procps.inc
b/meta/recipes-extended/procps/procps.inc
index 6ee4a04..20d5fc2 100644
--- a/meta/recipes-extended/procps/procps.inc
+++ b/meta/recipes-extended/procps/procps.inc
@@ -15,6 +15,10 @@ SRC_URI = http://procps.sourceforge.net/procps-${PV}.tar.gz
\
inherit autotools update-alternatives
+do_install_append() {
+ mv ${D}${bindir}/watch ${D}${bindir}/watch.${BPN}
+}
+
FILES_${PN} += ${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so
FILES_SOLIBSDEV =
@@ -22,4 +26,6 @@ ALTERNATIVE_${PN} = top uptime free pkill pmap kill sysctl
ps pgrep pwdx watch
ALTERNATIVE_LINK_NAME[kill] = ${base_bindir}/kill
ALTERNATIVE_LINK_NAME[sysctl] = ${base_sbindir}/sysctl
ALTERNATIVE_LINK_NAME[ps] = ${base_bindir}/ps
+ALTERNATIVE_LINK_NAME[watch] = ${base_bindir}/watch
+ALTERNATIVE_TARGET[watch] = ${bindir}/watch.${BPN}
ALTERNATIVE_PRIORITY = 110
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] meta-skeleton: rename busybox's bbappend file
As busybox has been upgraded, rename this bbappend file to make it
match the current version of busybox.
Signed-off-by: Chen Qi qi.c...@windriver.com
---
...{busybox_1.21.1.bbappend = busybox_%.bbappend} |0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-skeleton/recipes-core/busybox/{busybox_1.21.1.bbappend =
busybox_%.bbappend} (100%)
diff --git a/meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
b/meta-skeleton/recipes-core/busybox/busybox_%.bbappend
similarity index 100%
rename from meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
rename to meta-skeleton/recipes-core/busybox/busybox_%.bbappend
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] busybox: upgrade to stable 1.22.1
Upgrade busybox to the stable release 1.22.1.
During this upgrade, 9 patches are removed. Reasons are detailed below.
The following 6 patches are removed as they have been merged.
meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch
meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
The following three patches are removed because they are mainly about moving
binaries from /bin to /usr/bin to make the update-alternative work correctly
at rootfs time. We can easily solve this problem by changing recipes. There's
no compelling reason why such patches are needed.
meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
meta/recipes-core/busybox/busybox/stat-usr-bin.patch
meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
Signed-off-by: Chen Qi qi.c...@windriver.com
---
.../busybox-lineedit-initialize-delptr.patch | 23 --
...usybox-list-suid-and-non-suid-app-configs.patch | 179 -
...sybox-sed-fix-sed-clusternewline-testcase.patch | 262
.../busybox-sulogin-empty-root-password.patch | 58 -
.../busybox/find-get-rid-of-nested-functions.patch | 117 -
.../busybox/busybox/run-parts.in.usr-bin.patch | 29 ---
.../busybox/busybox/stat-usr-bin.patch | 21 --
...estsuite-du-du-k-works-fix-false-positive.patch | 35 ---
.../busybox/busybox/watch.in.usr-bin.patch | 29 ---
.../{busybox_1.21.1.bb = busybox_1.22.1.bb} | 13 +-
meta/recipes-core/busybox/busybox_git.bb | 11 +-
11 files changed, 4 insertions(+), 773 deletions(-)
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
delete mode 100644
meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch
delete mode 100644 meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
delete mode 100644 meta/recipes-core/busybox/busybox/stat-usr-bin.patch
delete mode 100644
meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
delete mode 100644 meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
rename meta/recipes-core/busybox/{busybox_1.21.1.bb = busybox_1.22.1.bb} (66%)
diff --git
a/meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
b/meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
deleted file mode 100644
index e59211b..000
--- a/meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Derived from:
-http://git.busybox.net/busybox/commit/?id=46031da862a60422f80050a905cea0b67026b021.
-
-In vi mode, the 'p' and 'P' commands caused a segfault when nothing had
-been put in the buffer yet because the delptr was not initialized.
-
-Upstream-Status: Backport
-
-Signed-off-by: Shawn J. Goff shawn7...@gmail.com
-Signed-off-by: Denys Vlasenko vda.li...@googlemail.com
-Signed-off-by: Ming Liu ming@windriver.com
-
-diff -urpN a/libbb/lineedit.c b/libbb/lineedit.c
a/libbb/lineedit.c
-+++ b/libbb/lineedit.c
-@@ -187,6 +187,7 @@ extern struct lineedit_statics *const li
- cmdedit_termw = 80; \
- IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
- IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
-+ IF_FEATURE_EDITING_VI(delptr = delbuf;) \
- } while (0)
-
- static void deinit_S(void)
diff --git
a/meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
b/meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
deleted file mode 100644
index 753a044..000
---
a/meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-Make busybox have the ability to list configuration items regarding suid
-apps and non-suid apps separately.
-
-From: Bernhard Reutner-Fischer rep.dot@gmail.com
-Date: Mon, 17 Jun 2013 11:06:05 +0800
-Subject: [PATCH] busybox: list suid and non-suid app configs
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi qi.c...@windriver.com
-
- Makefile.custom|4
- applets/busybox.mksuid | 53
- include/applets.src.h |9 +++-
- scripts/kconfig/confdata.c | 24
- 4 files
