* [PATCH 00/15] 14-May Consolidated Pull
@ 2011-05-15 1:32 Saul Wold
2011-05-15 1:32 ` [PATCH 01/15] libxml-sax-perl: added to create LSB olver test report Saul Wold
` (16 more replies)
0 siblings, 17 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Saul Wold <sgw@linux.intel.com>
Richard,
Some LSB Fixes from Kang, ARM and MACHINEOVERRIDES tweaks from
Khem, and some glib and defaultsetup changes from Martin.
Along with a QT4 Update from Paul.
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/stage
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Thanks,
Saul Wold <sgw@linux.intel.com>
---
Kang Kai (4):
libxml-sax-perl: added to create LSB olver test report
task-core-lsb: add packages into lsb image
lsbsetup: recreate locale fr_FR
foomatic-filters: add a link to pass LSB printing test
Khem Raj (4):
tune-cortexa8.inc: Define variable for controlling FP ABI
gcc-common.inc: Consider hardfp knob for configuring toolchain
conf/bitbake.conf: Add MACHINEOVERRIDES variable
util-linux: inherit pkgconfig
Martin Jansa (3):
lib/oe/process.py: import from OE
glib-2.0: use PN instead of glib-2.0 in PACKAGES and FILES
bitbake.conf: move VENDOR variables from bitbake.conf to
defaultsetup.conf
Nitin A Kamble (1):
task-core-nfs: fix a bitbake error
Paul Eggleton (3):
qt4: update from 4.7.2 to 4.7.3
distro_tracking_fields.inc: update for qt 4.7.3 upgrade
qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS
meta/conf/bitbake.conf | 7 +--
meta/conf/distro/defaultsetup.conf | 5 +-
.../conf/distro/include/distro_tracking_fields.inc | 32 ++++----
meta/conf/machine/include/tune-cortexa8.inc | 14 +++-
meta/lib/oe/process.py | 74 ++++++++++++++++++++
meta/recipes-core/glib-2.0/glib.inc | 4 +-
meta/recipes-core/tasks/task-core-nfs.bb | 2 +-
meta/recipes-core/util-linux/util-linux.inc | 2 +-
meta/recipes-devtools/gcc/gcc-common.inc | 13 +++-
.../foomatic/foomatic-filters_4.0.7.bb | 9 ++-
meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh | 1 +
meta/recipes-extended/lsb/lsbsetup_0.9.bb | 2 +-
.../perl/libxml-namespacesupport-perl_1.11.bb | 22 ++++++
meta/recipes-extended/perl/libxml-sax-perl_0.96.bb | 26 +++++++
meta/recipes-extended/tasks/task-core-lsb.bb | 5 +-
meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} | 5 +-
.../0001-Added-Openembedded-crossarch-option.patch | 0
.../recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf | 0
.../hack-out-pg2-4.7.0.patch | 0
.../qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf | 0
...qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} | 2 +-
...s-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} | 4 +-
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb | 6 --
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 6 ++
...qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} | 2 +-
meta/recipes-qt/qt4/qt4.inc | 4 +-
26 files changed, 197 insertions(+), 50 deletions(-)
create mode 100644 meta/lib/oe/process.py
create mode 100644 meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
create mode 100644 meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
rename meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} (89%)
rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/0001-Added-Openembedded-crossarch-option.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf (100%)
rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/hack-out-pg2-4.7.0.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf (100%)
rename meta/recipes-qt/qt4/{qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} (87%)
rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} (61%)
delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
rename meta/recipes-qt/qt4/{qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} (88%)
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 02/15] task-core-lsb: add packages into lsb image
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
2011-05-15 1:32 ` [PATCH 01/15] libxml-sax-perl: added to create LSB olver test report Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 03/15] lsbsetup: recreate locale fr_FR Saul Wold
` (14 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Kang Kai <kai.kang@windriver.com>
Add gettext-runtime, libxml-sax-perl and foomatic-filters to
task-core-image.bb
Bump PR to r4
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/recipes-extended/tasks/task-core-lsb.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index 6de24b4..70eb2d6 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/tasks/task-core-lsb.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Create Small Image Tasks"
-PR = "r3"
+PR = "r4"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -111,6 +111,7 @@ RDEPENDS_task-core-tcl = "\
RDEPENDS_task-core-misc = "\
elfutils \
gettext \
+ gettext-runtime \
groff \
lsb \
lsbsetup \
@@ -131,6 +132,7 @@ RDEPENDS_task-core-lsb-command-add = "\
msmtp \
chkconfig \
xdg-utils \
+ foomatic-filters \
"
# cups
@@ -188,6 +190,7 @@ RDEPENDS_task-core-lsb-runtime-add = "\
liburi-perl \
libxml-parser-perl \
libxml-perl \
+ libxml-sax-perl \
eglibc-localedatas \
eglibc-gconvs \
eglibc-charmaps \
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 01/15] libxml-sax-perl: added to create LSB olver test report
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 02/15] task-core-lsb: add packages into lsb image Saul Wold
` (15 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Kang Kai <kai.kang@windriver.com>
libxml-sax-perl is need to create LSB olver test report,
so import it and its dependecy libxml-namespacesupport-perl from oe.
Add LICENSE and reset PR.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../perl/libxml-namespacesupport-perl_1.11.bb | 22 ++++++++++++++++
meta/recipes-extended/perl/libxml-sax-perl_0.96.bb | 26 ++++++++++++++++++++
2 files changed, 48 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
create mode 100644 meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
diff --git a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb b/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
new file mode 100644
index 0000000..d96430e
--- /dev/null
+++ b/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Perl module for supporting simple generic namespaces"
+DESCRIPTION = "XML::NamespaceSupport offers a simple way to process namespace-based XML names. \
+ It also helps maintain a prefix-to-namespace URI map, and provides a number of \
+ basic checks. "
+
+SECTION = "libs"
+LICENSE = "Artistic|GPLv1+"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://META.yml;beginline=22;endline=22;md5=3b2b564dae8b9af9e8896e85c07dcbe5"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-${PV}.tar.gz"
+SRC_URI[md5sum] = "222cca76161cd956d724286d36b607da"
+SRC_URI[sha256sum] = "6d8151f0a3f102313d76b64bfd1c2d9ed46bfe63a16f038e7d860fda287b74ea"
+
+
+S = "${WORKDIR}/XML-NamespaceSupport-${PV}"
+
+inherit cpan
+
+BBCLASSEXTEND="native"
+
diff --git a/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb b/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
new file mode 100644
index 0000000..13956cb
--- /dev/null
+++ b/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Perl module for using and building Perl SAX2 XML processors"
+DESCRIPTION = "XML::SAX consists of several framework classes for using and \
+building Perl SAX2 XML parsers, filters, and drivers. It is designed \
+around the need to be able to "plug in" different SAX parsers to an \
+application without requiring programmer intervention. Those of you \
+familiar with the DBI will be right at home. Some of the designs \
+come from the Java JAXP specification (SAX part), only without the \
+javaness."
+
+SECTION = "libs"
+LICENSE = "Artistic|GPLv1+"
+DEPENDS += "libxml-namespacesupport-perl-native"
+RDEPENDS_${PN} += "libxml-namespacesupport-perl perl-module-file-temp"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=65c4cd8f39c24c7135ed70dacbcb09e3"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-${PV}.tar.gz"
+SRC_URI[md5sum] = "bdcd4119a62505184e211e9dfaef0ab1"
+SRC_URI[sha256sum] = "9bbef613afa42c46df008d537decc5a61df7e92d65463f3c900769f39e5c8e08"
+
+S = "${WORKDIR}/XML-SAX-${PV}"
+
+inherit cpan
+
+BBCLASSEXTEND = "native"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 03/15] lsbsetup: recreate locale fr_FR
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
2011-05-15 1:32 ` [PATCH 01/15] libxml-sax-perl: added to create LSB olver test report Saul Wold
2011-05-15 1:32 ` [PATCH 02/15] task-core-lsb: add packages into lsb image Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 04/15] qt4: update from 4.7.2 to 4.7.3 Saul Wold
` (13 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Kang Kai <kai.kang@windriver.com>
Update LSB_Setup.sh to recreate locale fr_FR, which helps to pass
LSB libstdc++ test.
Bump PR to r3.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh | 1 +
meta/recipes-extended/lsb/lsbsetup_0.9.bb | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
index aa3d5ee..10d8fb8 100644
--- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
+++ b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
@@ -208,6 +208,7 @@ localedef -i en_US -f UTF-8 en_US.UTF-8
localedef -i se_NO -f UTF-8 se_NO.UTF-8
localedef -i de_DE -f ISO-8859-1 de_DE
localedef -i en_US -f ISO-8859-1 en_US.ISO8859-1
+localedef -i fr_FR -f ISO-8859-1 fr_FR
#resolve localhost
LOCALHOST=`hostname`
diff --git a/meta/recipes-extended/lsb/lsbsetup_0.9.bb b/meta/recipes-extended/lsb/lsbsetup_0.9.bb
index b0d0a3f..21bd26e 100644
--- a/meta/recipes-extended/lsb/lsbsetup_0.9.bb
+++ b/meta/recipes-extended/lsb/lsbsetup_0.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "auto-setup environment for lsb test"
SECTION = "console/utils"
PRIORITY = "required"
LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 04/15] qt4: update from 4.7.2 to 4.7.3
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (2 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 03/15] lsbsetup: recreate locale fr_FR Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 05/15] distro_tracking_fields.inc: update for qt 4.7.3 upgrade Saul Wold
` (12 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Paul Eggleton <paul.eggleton@linux.intel.com>
The Comodo certificates patch has been merged upstream so it no longer
needs to be applied. Some PR values were reset and SRC_URI checksums
updated but other than this there are no recipe changes.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} | 5 ++---
.../0001-Added-Openembedded-crossarch-option.patch | 0
.../recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf | 0
.../hack-out-pg2-4.7.0.patch | 0
.../qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf | 0
...qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} | 2 +-
...s-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} | 4 ++--
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb | 6 ------
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 6 ++++++
...qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} | 2 +-
10 files changed, 12 insertions(+), 13 deletions(-)
rename meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} (89%)
rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/0001-Added-Openembedded-crossarch-option.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf (100%)
rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/hack-out-pg2-4.7.0.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf (100%)
rename meta/recipes-qt/qt4/{qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} (87%)
rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} (61%)
delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
rename meta/recipes-qt/qt4/{qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} (88%)
diff --git a/meta/recipes-qt/qt4/qt-4.7.2.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc
similarity index 89%
rename from meta/recipes-qt/qt4/qt-4.7.2.inc
rename to meta/recipes-qt/qt4/qt-4.7.3.inc
index 0f75a46..7f26b9b 100644
--- a/meta/recipes-qt/qt4/qt-4.7.2.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.3.inc
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://blacklist-fraudulent-comodo-certificates-patch.diff \
file://0004-no-qmake.patch \
file://hack-out-pg2-4.7.0.patch \
file://0006-freetype-host-includes.patch \
@@ -15,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://linux.conf \
"
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
diff --git a/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
rename to meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.2/g++.conf b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/g++.conf
rename to meta/recipes-qt/qt4/qt-4.7.3/g++.conf
diff --git a/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
rename to meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.2/linux.conf b/meta/recipes-qt/qt4/qt-4.7.3/linux.conf
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/linux.conf
rename to meta/recipes-qt/qt4/qt-4.7.3/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
similarity index 87%
rename from meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
index c3f6713..b88b1e9 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
@@ -1,7 +1,7 @@
require qt-${PV}.inc
require qt4-embedded.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb
similarity index 61%
rename from meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb
index d3c0eda..deb4231 100644
--- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb
@@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
deleted file mode 100644
index a917ac4..0000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
new file mode 100644
index 0000000..d61f312
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
@@ -0,0 +1,6 @@
+require qt4-tools-nativesdk.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
similarity index 88%
rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
index 75c6314..359a756 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
@@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt-${PV}.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 05/15] distro_tracking_fields.inc: update for qt 4.7.3 upgrade
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (3 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 04/15] qt4: update from 4.7.2 to 4.7.3 Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 06/15] qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS Saul Wold
` (11 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 32 ++++++++++----------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index d9fe02c..ad45b94 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3352,32 +3352,32 @@ RECIPE_LAST_UPDATE_pn-imake = "Nov 21, 2010"
RECIPE_MAINTAINER_pn-imake = "Yu Ke <ke.yu@intel.com>"
RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
-RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/03/01"
-RECIPE_LAST_UPDATE_pn-qt4-tools-native = "Apr 6, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.3"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/05/04"
+RECIPE_LAST_UPDATE_pn-qt4-tools-native = "May 12, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton <paul.eggleton@linux.intel.com>"
DISTRO_PN_ALIAS_pn-qt4-tools-native = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
-RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/03/01"
-RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "Apr 6, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.3"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
+RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <paul.eggleton@linux.intel.com>"
RECIPE_STATUS_pn-qt4-embedded = "green"
-RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/03/01"
-RECIPE_LAST_UPDATE_pn-qt4-embedded = "Apr 6, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
+RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <paul.eggleton@linux.intel.com>"
RECIPE_STATUS_pn-qt4-x11-free = "green"
-RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/03/01"
-RECIPE_LAST_UPDATE_pn-qt4-x11-free = "Apr 6, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/05/04"
+RECIPE_LAST_UPDATE_pn-qt4-x11-free = "May 12, 2011"
RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton <paul.eggleton@linux.intel.com"
DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 06/15] qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (4 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 05/15] distro_tracking_fields.inc: update for qt 4.7.3 upgrade Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 07/15] lib/oe/process.py: import from OE Saul Wold
` (10 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Paul Eggleton <paul.eggleton@linux.intel.com>
This allows meta-oe to override these options easily in order to enable more
SQL driver plugins.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/qt4.inc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index b86f89f..7e15b61 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -9,11 +9,13 @@ QT_ENDIAN = "${@qt_endian(d)}"
QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
QT_DISTRO_FLAGS_linuxstdbase = "-sm"
+QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite"
+
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
-shared -no-nas-sound -no-nis \
-qt-gif -system-libjpeg -system-libpng -system-zlib \
- -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \
-no-pch -qdbus -stl -glib -phonon -webkit \
+ ${QT_SQL_DRIVER_FLAGS} \
${QT_DISTRO_FLAGS} "
EXTRA_OEMAKE = "-e"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 07/15] lib/oe/process.py: import from OE
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (5 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 06/15] qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 08/15] glib-2.0: use PN instead of glib-2.0 in PACKAGES and FILES Saul Wold
` (9 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/lib/oe/process.py | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
create mode 100644 meta/lib/oe/process.py
diff --git a/meta/lib/oe/process.py b/meta/lib/oe/process.py
new file mode 100644
index 0000000..26c3e65
--- /dev/null
+++ b/meta/lib/oe/process.py
@@ -0,0 +1,74 @@
+import subprocess
+import signal
+
+def subprocess_setup():
+ # Python installs a SIGPIPE handler by default. This is usually not what
+ # non-Python subprocesses expect.
+ signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+class CmdError(RuntimeError):
+ def __init__(self, command):
+ self.command = command
+
+ def __str__(self):
+ if not isinstance(self.command, basestring):
+ cmd = subprocess.list2cmdline(self.command)
+ else:
+ cmd = self.command
+
+ return "Execution of '%s' failed" % cmd
+
+class NotFoundError(CmdError):
+ def __str__(self):
+ return CmdError.__str__(self) + ": command not found"
+
+class ExecutionError(CmdError):
+ def __init__(self, command, exitcode, stdout = None, stderr = None):
+ CmdError.__init__(self, command)
+ self.exitcode = exitcode
+ self.stdout = stdout
+ self.stderr = stderr
+
+ def __str__(self):
+ message = ""
+ if self.stderr:
+ message += self.stderr
+ if self.stdout:
+ message += self.stdout
+ if message:
+ message = ":\n" + message
+ return (CmdError.__str__(self) +
+ " with exit code %s" % self.exitcode + message)
+
+class Popen(subprocess.Popen):
+ defaults = {
+ "close_fds": True,
+ "preexec_fn": subprocess_setup,
+ "stdout": subprocess.PIPE,
+ "stderr": subprocess.STDOUT,
+ "stdin": subprocess.PIPE,
+ "shell": False,
+ }
+
+ def __init__(self, *args, **kwargs):
+ options = dict(self.defaults)
+ options.update(kwargs)
+ subprocess.Popen.__init__(self, *args, **options)
+
+def run(cmd, input=None, **options):
+ """Convenience function to run a command and return its output, raising an
+ exception when the command fails"""
+
+ if isinstance(cmd, basestring) and not "shell" in options:
+ options["shell"] = True
+ try:
+ pipe = Popen(cmd, **options)
+ except OSError, exc:
+ if exc.errno == 2:
+ raise NotFoundError(cmd)
+ else:
+ raise
+ stdout, stderr = pipe.communicate(input)
+ if pipe.returncode != 0:
+ raise ExecutionError(cmd, pipe.returncode, stdout, stderr)
+ return stdout
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 08/15] glib-2.0: use PN instead of glib-2.0 in PACKAGES and FILES
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (6 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 07/15] lib/oe/process.py: import from OE Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 10/15] tune-cortexa8.inc: Define variable for controlling FP ABI Saul Wold
` (8 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Martin Jansa <Martin.Jansa@gmail.com>
* otherwise notes like this are shown:
NOTE: multiple providers are available for runtime glib-2.0-utils (glib-2.0-nativesdk, glib-2.0)
NOTE: consider defining a PREFERRED_PROVIDER entry to match glib-2.0-utils
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/glib-2.0/glib.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 83f1990..f015fd3 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -18,10 +18,10 @@ require glib-2.0.inc
DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
-PACKAGES =+ "glib-2.0-utils "
+PACKAGES =+ "${PN}-utils "
LEAD_SONAME = "libglib-2.0.*"
-FILES_glib-2.0-utils = "${bindir}/*"
+FILES_${PN}-utils = "${bindir}/*"
inherit autotools pkgconfig gettext
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (8 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 10/15] tune-cortexa8.inc: Define variable for controlling FP ABI Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-16 14:24 ` Richard Purdie
2011-05-15 1:32 ` [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain Saul Wold
` (6 subsequent siblings)
16 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Martin Jansa <Martin.Jansa@gmail.com>
* empty TARGET_VENDOR was set before weak assignment in defaultsetup.conf
* -oecore was changed to -oe to be more consistent with SDK_VENDOR as we had -oesdk as SDK_VENDOR and not -oecoresdk
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/bitbake.conf | 4 ----
meta/conf/distro/defaultsetup.conf | 5 ++++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7c72de1..418a15d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -62,7 +62,6 @@ target_datadir := "${datadir}"
BUILD_ARCH = "${@os.uname()[4]}"
BUILD_OS = "${@os.uname()[0].lower()}"
-BUILD_VENDOR = ""
BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
BUILD_PREFIX = ""
BUILD_CC_ARCH = ""
@@ -70,7 +69,6 @@ BUILD_EXEEXT = ""
HOST_ARCH = "${TARGET_ARCH}"
HOST_OS = "${TARGET_OS}"
-HOST_VENDOR = "${TARGET_VENDOR}"
HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
HOST_PREFIX = "${TARGET_PREFIX}"
HOST_CC_ARCH = "${TARGET_CC_ARCH}"
@@ -78,14 +76,12 @@ HOST_EXEEXT = ""
TARGET_ARCH = "INVALID"
TARGET_OS = "INVALID"
-TARGET_VENDOR = "${BUILD_VENDOR}"
TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
TARGET_PREFIX = "${TARGET_SYS}-"
TARGET_CC_ARCH = ""
SDK_ARCH = "${BUILD_ARCH}"
SDK_OS = "${BUILD_OS}"
-SDK_VENDOR = "-oesdk"
SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
SDK_PREFIX = "${SDK_SYS}-"
SDK_CC_ARCH = "${BUILD_CC_ARCH}"
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 8da6c0a..dd9ffc3 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -3,7 +3,10 @@ include conf/distro/include/default-versions.inc
include conf/distro/include/default-distrovars.inc
include conf/distro/include/world-broken.inc
-TARGET_VENDOR ?= "-oecore"
+BUILD_VENDOR ?= ""
+TARGET_VENDOR ?= "-oe"
+HOST_VENDOR ?= "${TARGET_VENDOR}"
+SDK_VENDOR ?= "-oesdk"
TARGET_FPU_arm ?= "soft"
TARGET_FPU_armeb ?= "soft"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 10/15] tune-cortexa8.inc: Define variable for controlling FP ABI
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (7 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 08/15] glib-2.0: use PN instead of glib-2.0 in PACKAGES and FILES Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf Saul Wold
` (7 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Khem Raj <raj.khem@gmail.com>
ARM_FP_ABI also is poked from gcc configure to enable hardfp
for parameter
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/machine/include/tune-cortexa8.inc | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index a5b982a..d5e15c6 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -3,11 +3,17 @@
# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
# [3] https://support.codesourcery.com/GNUToolchain/kbentry29
-TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fno-tree-vectorize"
+# Can be one of ['softfp' 'hardfp']
+ARM_FP_ABI ?= "softfp"
+
+ARM_FP_OPT = "${@['-mfloat-abi=softfp', '-mfloat-abi=hard'][bb.data.getVar('ARM_FP_ABI', d, 1) == 'hardfp']}"
+ARM_FP_PACKAGESUFFIX = "${@['', '-hardfp'][bb.data.getVar('ARM_FP_ABI', d, 1) == 'hardfp']}"
+
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon ${ARM_FP_OPT} -fno-tree-vectorize"
# Other potentially useful options
#-ftree-vectorize -ffast-math -fno-omit-frame-pointer
-FEED_ARCH = "armv7a"
-BASE_PACKAGE_ARCH = "armv7a"
-PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6 armv7 armv7a"
+FEED_ARCH = "armv7a${ARM_FP_PACKAGESUFFIX}"
+BASE_PACKAGE_ARCH = "armv7a${ARM_FP_PACKAGESUFFIX}"
+PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6 armv7 armv7a${ARM_FP_PACKAGESUFFIX}"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (9 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-16 14:44 ` Richard Purdie
2011-05-15 1:32 ` [PATCH 12/15] conf/bitbake.conf: Add MACHINEOVERRIDES variable Saul Wold
` (5 subsequent siblings)
16 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Khem Raj <raj.khem@gmail.com>
pass --with-float=hard|soft depending upon ARM_FP_ABI settings
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-common.inc | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index a3fa234..8b7c3ad 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -8,10 +8,17 @@ NATIVEDEPS = ""
inherit autotools gettext
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
def get_gcc_fpu_setting(bb, d):
- if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
- return "--with-float=soft"
+ if bb.data.getVar('TARGET_FPU', d, True) in [ 'soft', 'hard'] and bb.data.getVar('TARGET_OS', d, True).find('linux') >= 0 :
+ # ARM_FP_ABI could be either 'hardfp' or 'softfp'
+ arm_fpabi = bb.data.getVar('ARM_FP_ABI', d, True) or ""
+ if arm_fpabi != "":
+ if arm_fpabi == "hardfp":
+ # reset it to whatever gcc --with-float configure expects which is either 'softfp' or 'hard'
+ arm_fpabi = "hard"
+ return "--with-float=" + arm_fpabi
+ else:
+ return "--with-float=" + bb.data.getVar('TARGET_FPU', d, True)
return ""
def get_gcc_mips_plt_setting(bb, d):
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 12/15] conf/bitbake.conf: Add MACHINEOVERRIDES variable
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (10 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 14/15] task-core-nfs: fix a bitbake error Saul Wold
` (4 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Khem Raj <raj.khem@gmail.com>
By defualt it points to $MACHINE but sometimes its desired
to have more than one overrides stemming out of a machine
then they can be added to MACHINEOVERRIDES.
e.g. MACHINEOVERRIDES = "${MACHINE}:nslu2"
Note that if you redefine MACHINEOVERRIDES then default
override for machine has to be added to it explicitly
otherwise it will get lost.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/bitbake.conf | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 418a15d..a3bf7c9 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -606,8 +606,9 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
#
# This works for functions as well, they are really just environment variables.
# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
-OVERRIDES = "local:${MACHINE}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable"
+OVERRIDES = "local:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable"
DISTROOVERRIDES ?= "${DISTRO}"
+MACHINEOVERRIDES ?= "${MACHINE}"
CPU_FEATURES ?= ""
CPU_FEATURES_arm ?= "vfp"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 13/15] util-linux: inherit pkgconfig
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (12 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 14/15] task-core-nfs: fix a bitbake error Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 1:32 ` [PATCH 15/15] foomatic-filters: add a link to pass LSB printing test Saul Wold
` (2 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Khem Raj <raj.khem@gmail.com>
Configure of util-linux used pkg-config to poke for gtk-doc versions
so we need this dependency on pkgconfig
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/util-linux/util-linux.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 447e5b7..489ec1a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9
file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-inherit autotools gettext
+inherit autotools gettext pkgconfig
DEPENDS = "zlib ncurses"
DEPENDS_virtclass-native_append = " lzo-native"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 14/15] task-core-nfs: fix a bitbake error
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (11 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 12/15] conf/bitbake.conf: Add MACHINEOVERRIDES variable Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-16 14:26 ` Richard Purdie
2011-05-15 1:32 ` [PATCH 13/15] util-linux: inherit pkgconfig Saul Wold
` (3 subsequent siblings)
16 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Nitin A Kamble <nitin.a.kamble@intel.com>
THis fixes following issue:
NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils']
NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils']
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-core/tasks/task-core-nfs.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb
index d5d8291..087f4f0 100644
--- a/meta/recipes-core/tasks/task-core-nfs.bb
+++ b/meta/recipes-core/tasks/task-core-nfs.bb
@@ -20,7 +20,7 @@ RDEPENDS_task-core-nfs-server = "\
nfs-utils"
# rpcinfo can be useful but only with glibc images
-GLIBC_DEPENDENCIES = "glibc-utils"
+GLIBC_DEPENDENCIES = " glibc-utils"
RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}"
RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 15/15] foomatic-filters: add a link to pass LSB printing test
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (13 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 13/15] util-linux: inherit pkgconfig Saul Wold
@ 2011-05-15 1:32 ` Saul Wold
2011-05-15 16:31 ` [PATCH 00/15] 14-May Consolidated Pull Otavio Salvador
2011-05-16 14:34 ` Richard Purdie
16 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2011-05-15 1:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton, Kang Kai
From: Kang Kai <kai.kang@windriver.com>
LSB printing test will test a foomatic-rip under cups' directory,
so add it as link when DISTRO is set to linuxstdbase.
Part fixes [Yocto 904]
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../foomatic/foomatic-filters_4.0.7.bb | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
index 8d70400..9627187 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
+++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
@@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD file. \
"
DEPENDS += "cups perl libxml2"
-PR = "r0"
+PR = "r1"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
@@ -20,4 +20,11 @@ SRC_URI = "http://www.openprinting.org/download/foomatic/foomatic-filters-${PV}.
SRC_URI[md5sum] = "20abd25c1c98b2dae68709062a132a7d"
SRC_URI[sha256sum] = "090313fae40b177f505d9c9b93d7a4d7188b6d5d18b6ae41ab24903ac983478d"
+do_install_append_linuxstdbase() {
+ install -d ${D}${libdir}/cups/filter
+ ln -sf ${bindir}/foomatic-rip ${D}${libdir}/cups/filter
+}
+
+FILES_${PN}_append_linuxstdbase += "${libdir}/cups/filter/foomatic-rip"
+
inherit autotools
--
1.7.1.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 00/15] 14-May Consolidated Pull
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (14 preceding siblings ...)
2011-05-15 1:32 ` [PATCH 15/15] foomatic-filters: add a link to pass LSB printing test Saul Wold
@ 2011-05-15 16:31 ` Otavio Salvador
2011-05-16 14:34 ` Richard Purdie
16 siblings, 0 replies; 24+ messages in thread
From: Otavio Salvador @ 2011-05-15 16:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton, Kang Kai
On Sat, May 14, 2011 at 22:32, Saul Wold <sgw@linux.intel.com> wrote:
> Some LSB Fixes from Kang, ARM and MACHINEOVERRIDES tweaks from
> Khem, and some glib and defaultsetup changes from Martin.
> Along with a QT4 Update from Paul.
You missed my last version of:
cmake: add support for oe qt4 tools names
Please add it.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf
2011-05-15 1:32 ` [PATCH 09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf Saul Wold
@ 2011-05-16 14:24 ` Richard Purdie
2011-05-16 16:57 ` Khem Raj
0 siblings, 1 reply; 24+ messages in thread
From: Richard Purdie @ 2011-05-16 14:24 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
> From: Martin Jansa <Martin.Jansa@gmail.com>
>
> * empty TARGET_VENDOR was set before weak assignment in defaultsetup.conf
> * -oecore was changed to -oe to be more consistent with SDK_VENDOR as we had -oesdk as SDK_VENDOR and not -oecoresdk
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
I know I probably indicated otherwise but looking at this patch, I think
moving all these entries into distrosetup.conf is not desirable. The
real issue here is the default:
TARGET_VENDOR = "${BUILD_VENDOR}"
which when you think about it doesn't actually make much sense. I'm
happy for the default just to become:
TARGET_VENDOR = "-oe"
in bitbake.conf.
Cheers,
Richard
> ---
> meta/conf/bitbake.conf | 4 ----
> meta/conf/distro/defaultsetup.conf | 5 ++++-
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 7c72de1..418a15d 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -62,7 +62,6 @@ target_datadir := "${datadir}"
>
> BUILD_ARCH = "${@os.uname()[4]}"
> BUILD_OS = "${@os.uname()[0].lower()}"
> -BUILD_VENDOR = ""
> BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
> BUILD_PREFIX = ""
> BUILD_CC_ARCH = ""
> @@ -70,7 +69,6 @@ BUILD_EXEEXT = ""
>
> HOST_ARCH = "${TARGET_ARCH}"
> HOST_OS = "${TARGET_OS}"
> -HOST_VENDOR = "${TARGET_VENDOR}"
> HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
> HOST_PREFIX = "${TARGET_PREFIX}"
> HOST_CC_ARCH = "${TARGET_CC_ARCH}"
> @@ -78,14 +76,12 @@ HOST_EXEEXT = ""
>
> TARGET_ARCH = "INVALID"
> TARGET_OS = "INVALID"
> -TARGET_VENDOR = "${BUILD_VENDOR}"
> TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
> TARGET_PREFIX = "${TARGET_SYS}-"
> TARGET_CC_ARCH = ""
>
> SDK_ARCH = "${BUILD_ARCH}"
> SDK_OS = "${BUILD_OS}"
> -SDK_VENDOR = "-oesdk"
> SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
> SDK_PREFIX = "${SDK_SYS}-"
> SDK_CC_ARCH = "${BUILD_CC_ARCH}"
> diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
> index 8da6c0a..dd9ffc3 100644
> --- a/meta/conf/distro/defaultsetup.conf
> +++ b/meta/conf/distro/defaultsetup.conf
> @@ -3,7 +3,10 @@ include conf/distro/include/default-versions.inc
> include conf/distro/include/default-distrovars.inc
> include conf/distro/include/world-broken.inc
>
> -TARGET_VENDOR ?= "-oecore"
> +BUILD_VENDOR ?= ""
> +TARGET_VENDOR ?= "-oe"
> +HOST_VENDOR ?= "${TARGET_VENDOR}"
> +SDK_VENDOR ?= "-oesdk"
>
> TARGET_FPU_arm ?= "soft"
> TARGET_FPU_armeb ?= "soft"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 14/15] task-core-nfs: fix a bitbake error
2011-05-15 1:32 ` [PATCH 14/15] task-core-nfs: fix a bitbake error Saul Wold
@ 2011-05-16 14:26 ` Richard Purdie
0 siblings, 0 replies; 24+ messages in thread
From: Richard Purdie @ 2011-05-16 14:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> THis fixes following issue:
>
> NOTE: Runtime target 'glibc-utilsglibc-utils' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['glibc-utilsglibc-utils']
> NOTE: Runtime target 'task-core-nfs-server' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['task-core-nfs-server', 'glibc-utilsglibc-utils']
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
> meta/recipes-core/tasks/task-core-nfs.bb | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb
> index d5d8291..087f4f0 100644
> --- a/meta/recipes-core/tasks/task-core-nfs.bb
> +++ b/meta/recipes-core/tasks/task-core-nfs.bb
> @@ -20,7 +20,7 @@ RDEPENDS_task-core-nfs-server = "\
> nfs-utils"
>
> # rpcinfo can be useful but only with glibc images
> -GLIBC_DEPENDENCIES = "glibc-utils"
> +GLIBC_DEPENDENCIES = " glibc-utils"
>
> RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}"
> RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
This is the wrong place to be adding the space. The space issue is
coming from the _append in the lines below and the space should
therefore be added there to make it clear why its there.
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/15] 14-May Consolidated Pull
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
` (15 preceding siblings ...)
2011-05-15 16:31 ` [PATCH 00/15] 14-May Consolidated Pull Otavio Salvador
@ 2011-05-16 14:34 ` Richard Purdie
16 siblings, 0 replies; 24+ messages in thread
From: Richard Purdie @ 2011-05-16 14:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
> From: Saul Wold <sgw@linux.intel.com>
>
> Richard,
>
> Some LSB Fixes from Kang, ARM and MACHINEOVERRIDES tweaks from
> Khem, and some glib and defaultsetup changes from Martin.
> Along with a QT4 Update from Paul.
>
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
> Branch: sgw/stage
> Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
I took these apart from:
> Khem Raj (4):
> tune-cortexa8.inc: Define variable for controlling FP ABI
> gcc-common.inc: Consider hardfp knob for configuring toolchain
>
> Martin Jansa (3):
> bitbake.conf: move VENDOR variables from bitbake.conf to
> defaultsetup.conf
>
> Nitin A Kamble (1):
> task-core-nfs: fix a bitbake error
Which I've sent replies about.
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain
2011-05-15 1:32 ` [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain Saul Wold
@ 2011-05-16 14:44 ` Richard Purdie
2011-05-16 15:21 ` Koen Kooi
2011-05-16 17:06 ` Khem Raj
0 siblings, 2 replies; 24+ messages in thread
From: Richard Purdie @ 2011-05-16 14:44 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Khem,
I've a concern about ending up with several different variables all
doing the same thing. Why do we need both TARGET_FPU and ARM_FP_ABI?
Couldn't we just have values or "hard, sort or empty" for TARGET_FPU?
Cheers,
Richard
On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
> From: Khem Raj <raj.khem@gmail.com>
>
> pass --with-float=hard|soft depending upon ARM_FP_ABI settings
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-devtools/gcc/gcc-common.inc | 13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
> index a3fa234..8b7c3ad 100644
> --- a/meta/recipes-devtools/gcc/gcc-common.inc
> +++ b/meta/recipes-devtools/gcc/gcc-common.inc
> @@ -8,10 +8,17 @@ NATIVEDEPS = ""
> inherit autotools gettext
>
> FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
> -
> def get_gcc_fpu_setting(bb, d):
> - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
> - return "--with-float=soft"
> + if bb.data.getVar('TARGET_FPU', d, True) in [ 'soft', 'hard'] and bb.data.getVar('TARGET_OS', d, True).find('linux') >= 0 :
> + # ARM_FP_ABI could be either 'hardfp' or 'softfp'
> + arm_fpabi = bb.data.getVar('ARM_FP_ABI', d, True) or ""
> + if arm_fpabi != "":
> + if arm_fpabi == "hardfp":
> + # reset it to whatever gcc --with-float configure expects which is either 'softfp' or 'hard'
> + arm_fpabi = "hard"
> + return "--with-float=" + arm_fpabi
> + else:
> + return "--with-float=" + bb.data.getVar('TARGET_FPU', d, True)
> return ""
>
> def get_gcc_mips_plt_setting(bb, d):
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain
2011-05-16 14:44 ` Richard Purdie
@ 2011-05-16 15:21 ` Koen Kooi
2011-05-16 17:06 ` Khem Raj
1 sibling, 0 replies; 24+ messages in thread
From: Koen Kooi @ 2011-05-16 15:21 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Cc: Patches and discussions about the oe-core layer
both softp and hardfp use the actual hardware fpu, but have different calling conventions and are incompatible. So you need vars.
Op 16 mei 2011 om 16:44 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:
> Hi Khem,
>
> I've a concern about ending up with several different variables all
> doing the same thing. Why do we need both TARGET_FPU and ARM_FP_ABI?
> Couldn't we just have values or "hard, sort or empty" for TARGET_FPU?
>
> Cheers,
>
> Richard
>
> On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
>> From: Khem Raj <raj.khem@gmail.com>
>>
>> pass --with-float=hard|soft depending upon ARM_FP_ABI settings
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> meta/recipes-devtools/gcc/gcc-common.inc | 13 ++++++++++---
>> 1 files changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
>> index a3fa234..8b7c3ad 100644
>> --- a/meta/recipes-devtools/gcc/gcc-common.inc
>> +++ b/meta/recipes-devtools/gcc/gcc-common.inc
>> @@ -8,10 +8,17 @@ NATIVEDEPS = ""
>> inherit autotools gettext
>>
>> FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
>> -
>> def get_gcc_fpu_setting(bb, d):
>> - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
>> - return "--with-float=soft"
>> + if bb.data.getVar('TARGET_FPU', d, True) in [ 'soft', 'hard'] and bb.data.getVar('TARGET_OS', d, True).find('linux') >= 0 :
>> + # ARM_FP_ABI could be either 'hardfp' or 'softfp'
>> + arm_fpabi = bb.data.getVar('ARM_FP_ABI', d, True) or ""
>> + if arm_fpabi != "":
>> + if arm_fpabi == "hardfp":
>> + # reset it to whatever gcc --with-float configure expects which is either 'softfp' or 'hard'
>> + arm_fpabi = "hard"
>> + return "--with-float=" + arm_fpabi
>> + else:
>> + return "--with-float=" + bb.data.getVar('TARGET_FPU', d, True)
>> return ""
>>
>> def get_gcc_mips_plt_setting(bb, d):
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf
2011-05-16 14:24 ` Richard Purdie
@ 2011-05-16 16:57 ` Khem Raj
0 siblings, 0 replies; 24+ messages in thread
From: Khem Raj @ 2011-05-16 16:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, May 16, 2011 at 7:24 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
>> From: Martin Jansa <Martin.Jansa@gmail.com>
>>
>> * empty TARGET_VENDOR was set before weak assignment in defaultsetup.conf
>> * -oecore was changed to -oe to be more consistent with SDK_VENDOR as we had -oesdk as SDK_VENDOR and not -oecoresdk
>>
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>
> I know I probably indicated otherwise but looking at this patch, I think
> moving all these entries into distrosetup.conf is not desirable. The
> real issue here is the default:
>
> TARGET_VENDOR = "${BUILD_VENDOR}"
>
> which when you think about it doesn't actually make much sense. I'm
> happy for the default just to become:
>
> TARGET_VENDOR = "-oe"
>
> in bitbake.conf.
that sounds a good solution.
>
> Cheers,
>
> Richard
>
>
>> ---
>> meta/conf/bitbake.conf | 4 ----
>> meta/conf/distro/defaultsetup.conf | 5 ++++-
>> 2 files changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>> index 7c72de1..418a15d 100644
>> --- a/meta/conf/bitbake.conf
>> +++ b/meta/conf/bitbake.conf
>> @@ -62,7 +62,6 @@ target_datadir := "${datadir}"
>>
>> BUILD_ARCH = "${@os.uname()[4]}"
>> BUILD_OS = "${@os.uname()[0].lower()}"
>> -BUILD_VENDOR = ""
>> BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
>> BUILD_PREFIX = ""
>> BUILD_CC_ARCH = ""
>> @@ -70,7 +69,6 @@ BUILD_EXEEXT = ""
>>
>> HOST_ARCH = "${TARGET_ARCH}"
>> HOST_OS = "${TARGET_OS}"
>> -HOST_VENDOR = "${TARGET_VENDOR}"
>> HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
>> HOST_PREFIX = "${TARGET_PREFIX}"
>> HOST_CC_ARCH = "${TARGET_CC_ARCH}"
>> @@ -78,14 +76,12 @@ HOST_EXEEXT = ""
>>
>> TARGET_ARCH = "INVALID"
>> TARGET_OS = "INVALID"
>> -TARGET_VENDOR = "${BUILD_VENDOR}"
>> TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
>> TARGET_PREFIX = "${TARGET_SYS}-"
>> TARGET_CC_ARCH = ""
>>
>> SDK_ARCH = "${BUILD_ARCH}"
>> SDK_OS = "${BUILD_OS}"
>> -SDK_VENDOR = "-oesdk"
>> SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
>> SDK_PREFIX = "${SDK_SYS}-"
>> SDK_CC_ARCH = "${BUILD_CC_ARCH}"
>> diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
>> index 8da6c0a..dd9ffc3 100644
>> --- a/meta/conf/distro/defaultsetup.conf
>> +++ b/meta/conf/distro/defaultsetup.conf
>> @@ -3,7 +3,10 @@ include conf/distro/include/default-versions.inc
>> include conf/distro/include/default-distrovars.inc
>> include conf/distro/include/world-broken.inc
>>
>> -TARGET_VENDOR ?= "-oecore"
>> +BUILD_VENDOR ?= ""
>> +TARGET_VENDOR ?= "-oe"
>> +HOST_VENDOR ?= "${TARGET_VENDOR}"
>> +SDK_VENDOR ?= "-oesdk"
>>
>> TARGET_FPU_arm ?= "soft"
>> TARGET_FPU_armeb ?= "soft"
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain
2011-05-16 14:44 ` Richard Purdie
2011-05-16 15:21 ` Koen Kooi
@ 2011-05-16 17:06 ` Khem Raj
1 sibling, 0 replies; 24+ messages in thread
From: Khem Raj @ 2011-05-16 17:06 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Mon, May 16, 2011 at 7:44 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Hi Khem,
>
> I've a concern about ending up with several different variables all
> doing the same thing. Why do we need both TARGET_FPU and ARM_FP_ABI?
> Couldn't we just have values or "hard, sort or empty" for TARGET_FPU?
>
As koen already said we have two things here. what type of fpu to use
and second case what type of function calling conventions to use
when we select a hard fpu. GCC can use FPU instructions even when
using non FPU calling convention thats what is conveyed with
TARGET_FPU. hardfp calling convention is only possible when you have a
real fpu available and is more efficient in many applications
so with this patch we can select FP reg argument passing in function
calling conventions per hardfp or softfp ABI.
> Cheers,
>
> Richard
>
> On Sat, 2011-05-14 at 18:32 -0700, Saul Wold wrote:
>> From: Khem Raj <raj.khem@gmail.com>
>>
>> pass --with-float=hard|soft depending upon ARM_FP_ABI settings
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> meta/recipes-devtools/gcc/gcc-common.inc | 13 ++++++++++---
>> 1 files changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
>> index a3fa234..8b7c3ad 100644
>> --- a/meta/recipes-devtools/gcc/gcc-common.inc
>> +++ b/meta/recipes-devtools/gcc/gcc-common.inc
>> @@ -8,10 +8,17 @@ NATIVEDEPS = ""
>> inherit autotools gettext
>>
>> FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
>> -
>> def get_gcc_fpu_setting(bb, d):
>> - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
>> - return "--with-float=soft"
>> + if bb.data.getVar('TARGET_FPU', d, True) in [ 'soft', 'hard'] and bb.data.getVar('TARGET_OS', d, True).find('linux') >= 0 :
>> + # ARM_FP_ABI could be either 'hardfp' or 'softfp'
>> + arm_fpabi = bb.data.getVar('ARM_FP_ABI', d, True) or ""
>> + if arm_fpabi != "":
>> + if arm_fpabi == "hardfp":
>> + # reset it to whatever gcc --with-float configure expects which is either 'softfp' or 'hard'
>> + arm_fpabi = "hard"
>> + return "--with-float=" + arm_fpabi
>> + else:
>> + return "--with-float=" + bb.data.getVar('TARGET_FPU', d, True)
>> return ""
>>
>> def get_gcc_mips_plt_setting(bb, d):
>
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2011-05-16 17:10 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-15 1:32 [PATCH 00/15] 14-May Consolidated Pull Saul Wold
2011-05-15 1:32 ` [PATCH 01/15] libxml-sax-perl: added to create LSB olver test report Saul Wold
2011-05-15 1:32 ` [PATCH 02/15] task-core-lsb: add packages into lsb image Saul Wold
2011-05-15 1:32 ` [PATCH 03/15] lsbsetup: recreate locale fr_FR Saul Wold
2011-05-15 1:32 ` [PATCH 04/15] qt4: update from 4.7.2 to 4.7.3 Saul Wold
2011-05-15 1:32 ` [PATCH 05/15] distro_tracking_fields.inc: update for qt 4.7.3 upgrade Saul Wold
2011-05-15 1:32 ` [PATCH 06/15] qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS Saul Wold
2011-05-15 1:32 ` [PATCH 07/15] lib/oe/process.py: import from OE Saul Wold
2011-05-15 1:32 ` [PATCH 08/15] glib-2.0: use PN instead of glib-2.0 in PACKAGES and FILES Saul Wold
2011-05-15 1:32 ` [PATCH 10/15] tune-cortexa8.inc: Define variable for controlling FP ABI Saul Wold
2011-05-15 1:32 ` [PATCH 09/15] bitbake.conf: move VENDOR variables from bitbake.conf to defaultsetup.conf Saul Wold
2011-05-16 14:24 ` Richard Purdie
2011-05-16 16:57 ` Khem Raj
2011-05-15 1:32 ` [PATCH 11/15] gcc-common.inc: Consider hardfp knob for configuring toolchain Saul Wold
2011-05-16 14:44 ` Richard Purdie
2011-05-16 15:21 ` Koen Kooi
2011-05-16 17:06 ` Khem Raj
2011-05-15 1:32 ` [PATCH 12/15] conf/bitbake.conf: Add MACHINEOVERRIDES variable Saul Wold
2011-05-15 1:32 ` [PATCH 14/15] task-core-nfs: fix a bitbake error Saul Wold
2011-05-16 14:26 ` Richard Purdie
2011-05-15 1:32 ` [PATCH 13/15] util-linux: inherit pkgconfig Saul Wold
2011-05-15 1:32 ` [PATCH 15/15] foomatic-filters: add a link to pass LSB printing test Saul Wold
2011-05-15 16:31 ` [PATCH 00/15] 14-May Consolidated Pull Otavio Salvador
2011-05-16 14:34 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.