Re: [OE-core] [PATCH] autotools.bbclass: Add functionality to force a clean of ${B} when reconfiguring (and ${S} != ${B})
On Wed, Sep 26, 2012 at 12:07 PM, Phil Blundell wrote: > On Tue, 2012-09-11 at 15:22 +0100, Richard Purdie wrote: >> Unfortunately whilst rerunning configure and make against a project will >> mostly >> work there are situations where it does not correctly do the right thing. >> >> In particular, eglibc and gcc will fail out with errors where settings >> do not match a previously built configuration. It could be argued they are >> broken but the situation is what it is. There is the possibility of more >> subtle >> errors too. > > FWIW, I just encountered another instance of what appears to be a > similar problem (with this patch applied). I had changed my CFLAGS to > work around a compiler problem and then just reran the build, which led > eventually to: > > ERROR: Function failed: do_siteconfig_gencache > (see /tmp-eglibc/work/mips32el-oe-linux/eglibc/2.16-r11.micro1 > +svnr20393/temp/log.do_populate_sysroot.6005 for further information) > ERROR: Logfile of failure stored > in: /tmp-eglibc/work/mips32el-oe-linux/eglibc/2.16-r11.micro1 > +svnr20393/temp/log.do_populate_sysroot.6005 > Log data follows: > | DEBUG: Executing python function sstate_task_prefunc > [...] > | DEBUG: Executing shell function do_siteconfig_gencache > | configure: WARNING: unrecognized options: --disable-silent-rules, > --disable-dependency-tracking, --with-libtool-sysroot > | configure: loading cache eglibc_cache > | configure: error: `CFLAGS' has changed since the previous run: > | configure: former value: `...' > | configure: current value: `...' > | configure: error: in > `/.../tmp-eglibc/work/mips32el-oe-linux/eglibc/2.16-r11.micro1 > +svnr20393/site_config_cheetah': > | configure: error: changes in the environment can compromise the build > | configure: error: run `make distclean' and/or `rm eglibc_cache' and > start over > | DEBUG: Python function siteconfig_do_siteconfig finished > | DEBUG: Python function autotools_do_siteconfig finished > | DEBUG: Python function do_siteconfig finished > | DEBUG: Python function sstate_task_postfunc finished > ERROR: Task 30 (.../oe-core/meta/recipes-core/eglibc/eglibc_2.16.bb, > do_populate_sysroot) failed with exit code '1' I'll add another. I've seen this: | DEBUG: Executing python function do_siteconfig | DEBUG: Executing python function autotools_do_siteconfig | DEBUG: Executing python function siteconfig_do_siteconfig | DEBUG: Executing shell function do_siteconfig_gencache | configure: WARNING: unrecognized options: --disable-silent-rules, --disable-dependency-tracking, --with-libtool-sysroot | configure: loading cache ncurses_cache | configure: error: `CC' has changed since the previous run: | configure: former value: `arm-poky-linux-gnueabi-gcc -march=armv7-a -fno-tree-vectorize -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 --sysroot=/local/yocto/upstream/label/fedora17-64b/machine/beagleboard/poky/master/tmp/sysroots/beagleboard' | configure: current value: `arm-poky-linux-gnueabi-gcc -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 --sysroot=/local/yocto/upstream/label/fedora17-64b/machine/beagleboard/poky/master/tmp/sysroots/beagleboard' | configure: error: `CPP' has changed since the previous run: | configure: former value: `arm-poky-linux-gnueabi-gcc -E --sysroot=/local/yocto/upstream/label/fedora17-64b/machine/beagleboard/poky/master/tmp/sysroots/beagleboard -march=armv7-a -fno-tree-vectorize -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8' | configure: current value: `arm-poky-linux-gnueabi-gcc -E --sysroot=/local/yocto/upstream/label/fedora17-64b/machine/beagleboard/poky/master/tmp/sysroots/beagleboard -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8' | configure: error: in `/local/yocto/upstream/label/fedora17-64b/machine/beagleboard/poky/master/tmp/work/armv7a-vfp-neon-poky-linux-gnueabi/ncurses-5.9-r10.1/site_config_beagleboard': | configure: error: changes in the environment can compromise the build | configure: error: run `make distclean' and/or `rm ncurses_cache' and start over | DEBUG: Python function siteconfig_do_siteconfig finished | DEBUG: Python function autotools_do_siteconfig finished | DEBUG: Python function do_siteconfig finished | DEBUG: Python function sstate_task_postfunc finished | ERROR: Function failed: do_siteconfig_gencache (see /local/yocto/upstream/label/fedora17-64b/machine/beagleboard/poky/master/tmp/work/armv7a-vfp-neon-poky-linux-gnueabi/ncurses-5.9-r10.1/temp/log.do_populate_sysroot.30243 for further information) NOTE: recipe ncurses-5.9-r10.1: task do_populate_sysroot: Failed -M > > p. > > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembe
[OE-core] RFC - multilib SDK patches
I created a patch set to enable multilib userspace in an SDK. I've pushed the
patches to:
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=mhatle/multilib
(they are based on oe-core)
I'd like some comments on them and see if they are reasonable or not. With the
patches I was able to configure my local.conf with:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
IMAGE_INSTALL_append = ' lib32-eglibc'
TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-sdk-host"
TOOLCHAIN_HOST_TASK += "packagegroup-cross-canadian-${@'
packagegroup-cross-canadian-'.join(all_multilib_tune_values(d,
'TRANSLATED_TARGET_ARCH').split())}"
---
Then built an SDK using:
bitbake core-image-minimal -c populate_sdk
---
Note, the top patch is a nasty hack to perl. I don't have any idea as to what
is going wrong, but nativesdk-perl has decided to install into the wrong place
on my machine. I was wondering if other people are seeing the same problem or not.
Any comments would be appreciated.
--Mark
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 10/10] qt4: upgrade to 4.8.3
* rebased patches, 3 patches are resolved upstream:
0016-configure-eval-QMAKE_CXX.patch
resolved in upstream commit 68c7f80a672e1d6d2710e49548a7c83b105d8d5f
0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b
0022-webkit-fix-conflicting-types.patch
resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1
Signed-off-by: Martin Jansa
---
...tools_4.8.1.bb => nativesdk-qt4-tools_4.8.3.bb} | 6 +--
.../qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch | 34
...ore-Fix-compile-error-when-using-toolchai.patch | 46 --
.../0022-webkit-fix-conflicting-types.patch| 39 --
.../qt4/{qt4-4.8.1.inc => qt4-4.8.3.inc} | 15 +++
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 6 +--
...tty_qws-fix-build-with-old-kernel-headers.patch | 6 +--
...003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | 4 +-
...make-is-already-built-in-qt4-tools-native.patch | 8 ++--
...e-set-LFLAGS-to-pick-up-zlib-from-staging.patch | 8 ++--
...se-OE_QMAKE_-values-to-specify-Qt-utility.patch | 8 ++--
...-const-usage-that-causes-compile-failure-.patch | 6 +--
...llow-building-a-separate-qmake-for-the-ta.patch | 4 +-
...e-fix-source-file-references-in-qmake.pri.patch | 6 +--
...ack-to-not-use-the-pg_config-of-the-host-.patch | 8 ++--
.../0011-freetype-host-includes.patch | 4 +-
.../0012-Add-2bpp-support.patch| 14 +++
.../0013-configure-add-crossarch-option.patch | 20 +-
...tions-fix-phony-translation-linking-error.patch | 4 +-
...-configure-add-nostrip-for-debug-packages.patch | 8 ++--
...sure-we-identify-the-compiler-as-g-in-co.patch} | 8 ++--
...re-make-pulseaudio-a-configurable-option.patch} | 10 ++---
...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 4 +-
...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 4 +-
.../qt4/{qt4-4.8.1 => qt4-4.8.3}/g++.conf | 0
.../qt4/{qt4-4.8.1 => qt4-4.8.3}/linux.conf| 0
.../recipes-qt/qt4/{qt4-4.8.1 => qt4-4.8.3}/qte.sh | 0
...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} | 2 +-
meta/recipes-qt/qt4/qt4-native_4.8.1.bb| 12 --
meta/recipes-qt/qt4/qt4-native_4.8.3.bb| 8
...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} | 2 +-
31 files changed, 89 insertions(+), 215 deletions(-)
rename meta/recipes-qt/qt4/{nativesdk-qt4-tools_4.8.1.bb =>
nativesdk-qt4-tools_4.8.3.bb} (41%)
delete mode 100644
meta/recipes-qt/qt4/qt4-4.8.1/0016-configure-eval-QMAKE_CXX.patch
delete mode 100644
meta/recipes-qt/qt4/qt4-4.8.1/0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
delete mode 100644
meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch
rename meta/recipes-qt/qt4/{qt4-4.8.1.inc => qt4-4.8.3.inc} (79%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (88%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (89%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (90%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch (73%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch (80%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (83%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (87%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (83%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0009-qmake-fix-source-file-references-in-qmake.pri.patch (91%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (87%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0011-freetype-host-includes.patch (89%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0012-Add-2bpp-support.patch (97%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0013-configure-add-crossarch-option.patch (63%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0014-translations-fix-phony-translation-linking-error.patch (90%)
rename meta/recipes-qt/qt4/{qt4-4.8.1 =>
qt4-4.8.3}/0015-configure-add-nostrip-for-debug-packages.patch (78%)
rename
meta/recipes-qt/qt4/{qt4-4.8.1/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
=> qt4-4.8.3/0016-configure-ensure-we-identify-the-compiler-as-g-in-co.patch}
(84%)
rename
meta/recipes-qt/qt4/{qt4-4.8.1/0018-configure-make-pulseaudio-a-configurable-option.patch
=> qt4-4.8.3/0017-configure-make-pulseaudio-a-configurable-option.patch} (90%)
[OE-core] [oe-core][PATCH 09/10] qt4: PR bumps
* sofar only formal changes, but to test that everything still builds the same
Signed-off-by: Martin Jansa
---
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 +-
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 2 +-
meta/recipes-qt/qt4/qt4-embedded.inc| 2 +-
meta/recipes-qt/qt4/qt4-native.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc| 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 2330853..1199a8a 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com";
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r11"
+INC_PR = "r12"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index 3dc12af..7778630 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -17,7 +17,7 @@ SRC_URI =
"http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t
SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
-PR = "r6"
+PR = "r7"
S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc
b/meta/recipes-qt/qt4/qt4-embedded.inc
index 53eb652..c060634 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application
framework -- this is
SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com";
DEPENDS += "directfb tslib"
-INC_PR = "r48"
+INC_PR = "r49"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc
b/meta/recipes-qt/qt4/qt4-native.inc
index 9500d4b..5f0fce1 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-INC_PR = "r16"
+INC_PR = "r17"
inherit native
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 0ae74f7..68b3078 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender
libxrandr libxcursor"
PROVIDES += "qt4-x11"
-INC_PR = "r46"
+INC_PR = "r47"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl',
'-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
--
1.7.12
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 07/10] qt4: drop patches not used in any recipe
Signed-off-by: Martin Jansa
---
.../qt4/qt4-4.8.1/0008-qt-lib-infix.patch | 41 --
.../qt4/qt4-4.8.1/blacklist-diginotar-certs.diff | 95 --
.../qt4/qt4-4.8.1/compile.test-lflags.patch| 17
.../qt4/qt4-4.8.1/fix-config-tests.patch | 38 -
4 files changed, 191 deletions(-)
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.1/fix-config-tests.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
deleted file mode 100644
index d308a15..000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Add lib infix for QtUiTools to distinguish different Qt edition: e.g. "E" for
embedded, "" for X11
-
-Patch has been accepted upstream and should be included in the next major
version (4.8.0), see:
-http://bugreports.qt.nokia.com/browse/QTBUG-7169
-
-Original Author: Jeremy Lainé
-Ported from OE by: Yu Ke
-Upstream-Status: Accepted
-
/tmp/uitools.prf 2009-12-01 18:38:22.0 +0100
-+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf
2009-12-01 18:58:16.0 +0100
-@@ -3,11 +3,11 @@
-
- # Include the correct version of the UiLoader library
- symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
--else: QTUITOOLS_LINKAGE = -lQtUiTools
-+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
-
- CONFIG(debug, debug|release) {
--mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
--win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
-+mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
-+win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
- }
- LIBS += $$QTUITOOLS_LINKAGE
-
/tmp/uitools.pro 2009-12-01 18:40:28.0 +0100
-+++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro
2009-12-01 18:59:18.0 +0100
-@@ -1,5 +1,5 @@
- TEMPLATE = lib
--TARGET = $$qtLibraryTarget(QtUiTools)
-+TARGET = QtUiTools
- QT += xml
- CONFIG += qt staticlib
- DESTDIR = ../../../../lib
-@@ -43,3 +43,5 @@
-QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-QMAKE_PKGCONFIG_REQUIRES += QtXml
- }
-+
-+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
b/meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
deleted file mode 100644
index 4d88ae2..000
--- a/meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-http://labs.qt.nokia.com/2011/09/02/what-the-diginotar-security-breach-means-for-qt-users/
-http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
-
-Original Author:Nokia
-Upstream-Status: Integrated in upcoming versions
-
-diff --git a/src/network/ssl/qsslcertificate.cpp
b/src/network/ssl/qsslcertificate.cpp
-index 328c5c2..1ae98f4 100644
a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@ QList
QSslCertificatePrivate::certificatesFromDer(const QByteAr
- // These certificates are known to be fraudulent and were created during the
comodo
- // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
- static const char *certificate_blacklist[] = {
--"04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
--"f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
--"d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
--"39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
--"3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
--"e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
--"92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
--"b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
--"d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+"04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", //
Comodo
-+"f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", //
Comodo
-+"d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", //
Comodo
-+"39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", //
Comodo
-+"3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", //
Comodo
-+"e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", //
Comodo
-+"92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org",
// Comodo
-+"b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", //
Comodo
-+"d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", //
Comodo
-+
-+"05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", //
leaf certificate issued by DigiNotar
-+"0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNo
[OE-core] [oe-core][PATCH 06/10] qt4: move patches from files to qt4-4.8.1
* faster lookup in FILESPATH as small bonus
Signed-off-by: Martin Jansa
---
meta/recipes-qt/qt4/{files => qt4-4.8.1}/0004-no-qmake.patch | 0
.../recipes-qt/qt4/{files => qt4-4.8.1}/0006-freetype-host-includes.patch | 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/0008-qt-lib-infix.patch | 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/0009-support-2bpp.patch | 0
.../qt4/{files => qt4-4.8.1}/add_nostrip_for_debug_packages.diff | 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/blacklist-diginotar-certs.diff | 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/compile.test-lflags.patch| 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/configure-paths.patch| 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/fix-config-tests.patch | 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/fix_qkbdtty_qws.patch| 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/qt-config.patch | 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/qt-dbus-const.patch | 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/qte.sh | 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/set-OUTPUT_DIR-if-empty.patch| 0
meta/recipes-qt/qt4/{files => qt4-4.8.1}/target_qmake.patch | 0
15 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/0004-no-qmake.patch (100%)
rename meta/recipes-qt/qt4/{files =>
qt4-4.8.1}/0006-freetype-host-includes.patch (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/0008-qt-lib-infix.patch (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/0009-support-2bpp.patch (100%)
rename meta/recipes-qt/qt4/{files =>
qt4-4.8.1}/add_nostrip_for_debug_packages.diff (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/blacklist-diginotar-certs.diff
(100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/compile.test-lflags.patch
(100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/configure-paths.patch (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/fix-config-tests.patch (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/fix_qkbdtty_qws.patch (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/qt-config.patch (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/qt-dbus-const.patch (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/qte.sh (100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/set-OUTPUT_DIR-if-empty.patch
(100%)
rename meta/recipes-qt/qt4/{files => qt4-4.8.1}/target_qmake.patch (100%)
diff --git a/meta/recipes-qt/qt4/files/0004-no-qmake.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0004-no-qmake.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0004-no-qmake.patch
diff --git a/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0006-freetype-host-includes.patch
diff --git a/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0008-qt-lib-infix.patch
diff --git a/meta/recipes-qt/qt4/files/0009-support-2bpp.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/0009-support-2bpp.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/0009-support-2bpp.patch
diff --git a/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
b/meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff
similarity index 100%
rename from meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
rename to meta/recipes-qt/qt4/qt4-4.8.1/add_nostrip_for_debug_packages.diff
diff --git a/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
b/meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
similarity index 100%
rename from meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
rename to meta/recipes-qt/qt4/qt4-4.8.1/blacklist-diginotar-certs.diff
diff --git a/meta/recipes-qt/qt4/files/compile.test-lflags.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/compile.test-lflags.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/compile.test-lflags.patch
diff --git a/meta/recipes-qt/qt4/files/configure-paths.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/configure-paths.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
diff --git a/meta/recipes-qt/qt4/files/fix-config-tests.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/fix-config-tests.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/fix-config-tests.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/
[OE-core] [oe-core][PATCH 05/10] qt-mobility: move qt-mobility patches to separate dir
Signed-off-by: Martin Jansa
---
.../0001-gstvideoconnector-fixed-buffers-allocation.patch| 0
.../0002-Remove-unnecessary-rpaths-from-qml_device-example.patch | 0
meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch | 0
.../qt4/{files => qt-mobility-1.2.0}/qt-mobility-configure.patch | 0
.../qt4/{files => qt-mobility-1.2.0}/qt-mobility-no-opengl.patch | 0
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc| 1 +
6 files changed, 1 insertion(+)
rename meta/recipes-qt/qt4/{files =>
qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
rename meta/recipes-qt/qt4/{files =>
qt-mobility-1.2.0}/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
(100%)
rename meta/recipes-qt/qt4/{files => qt-mobility-1.2.0}/gcc-scope.patch (100%)
rename meta/recipes-qt/qt4/{files =>
qt-mobility-1.2.0}/qt-mobility-configure.patch (100%)
rename meta/recipes-qt/qt4/{files =>
qt-mobility-1.2.0}/qt-mobility-no-opengl.patch (100%)
diff --git
a/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch
b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch
similarity index 100%
rename from
meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch
rename to
meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch
diff --git
a/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
similarity index 100%
rename from
meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
rename to
meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
diff --git a/meta/recipes-qt/qt4/files/gcc-scope.patch
b/meta/recipes-qt/qt4/qt-mobility-1.2.0/gcc-scope.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/gcc-scope.patch
rename to meta/recipes-qt/qt4/qt-mobility-1.2.0/gcc-scope.patch
diff --git a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-configure.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/qt-mobility-configure.patch
rename to meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-configure.patch
diff --git a/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
rename to meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index 7f0af9f..3dc12af 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -5,6 +5,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-mobility-${PV}:"
SRC_URI =
"http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
file://qt-mobility-configure.patch \
file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
--
1.7.12
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 04/10] qt4.inc: move more options to separate variables
* make it easier to override them in bbappend
* convert pulseaudio to more common -pulseaudio/-no-pulseaudio form
Signed-off-by: Martin Jansa
---
meta/recipes-qt/qt4/qt4.inc | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index ba231ba..35748f8 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -12,12 +12,25 @@ QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql
-no-sql-psql -no-sql-odbc -p
QT_GLFLAGS ?= ""
+
+QT_QT3SUPPORT ?= "-qt3support"
+QT_XML ?= "-xmlpatterns"
+QT_WEBKIT ?= "-webkit"
+QT_PHONON ?= "-phonon"
+QT_DBUS ?= "-qdbus"
+QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio',
'-pulseaudio', '-no-pulseaudio', d)}"
+
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
-shared -no-nas-sound -no-nis \
-system-libjpeg -system-libpng -system-libtiff
-system-zlib \
--no-pch -qdbus -stl -glib -phonon -webkit \
--xmlpatterns -no-rpath -qt3support -silent \
-${@base_contains('DISTRO_FEATURES', 'pulseaudio',
'--enable-pulseaudio', '--disable-pulseaudio', d)} \
+-no-pch -stl -glib \
+-no-rpath -silent \
+${QT_DBUS} \
+${QT_QT3SUPPORT} \
+${QT_WEBKIT} \
+${QT_PHONON} \
+${QT_XML} \
+${QT_MULTIMEDIA} \
${QT_SQL_DRIVER_FLAGS} \
${QT_DISTRO_FLAGS} \
${QT_GLFLAGS}"
--
1.7.12
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 03/10] qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
Signed-off-by: Martin Jansa
---
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 +-
meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.1.inc} | 2 +-
.../0001-Added-Openembedded-crossarch-option.patch | 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/configure-lflags.patch | 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/configure_oe_compiler.patch | 0
.../recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/disable-fuse-gold-flag.patch | 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/fix-translations.patch | 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/fix_conflicting_types.patch | 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/g++.conf| 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/gcc47-fix.patch | 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/gcc47-fix2.patch| 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/hack-out-pg2-4.7.0.patch| 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/linux.conf | 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/pulseaudio-config.patch | 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/qmake_cxx_eval.patch| 0
meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/qmake_pri_fixes.patch | 0
meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb | 2 +-
meta/recipes-qt/qt4/qt4-native_4.8.1.bb | 2 +-
meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb | 2 +-
19 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.1.inc} (98%)
rename meta/recipes-qt/qt4/{qt-4.8.1 =>
qt4-4.8.1}/0001-Added-Openembedded-crossarch-option.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/configure-lflags.patch
(100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/configure_oe_compiler.patch
(100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 =>
qt4-4.8.1}/disable-fuse-gold-flag.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/fix-translations.patch
(100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/fix_conflicting_types.patch
(100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/g++.conf (100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/gcc47-fix.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/gcc47-fix2.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/hack-out-pg2-4.7.0.patch
(100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/linux.conf (100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/pulseaudio-config.patch
(100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/qmake_cxx_eval.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.8.1 => qt4-4.8.1}/qmake_pri_fixes.patch (100%)
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 0228b56..542f395 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 | GPLv3"
INC_PR = "r11"
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
inherit nativesdk qmake2
diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc
b/meta/recipes-qt/qt4/qt4-4.8.1.inc
similarity index 98%
rename from meta/recipes-qt/qt4/qt-4.8.1.inc
rename to meta/recipes-qt/qt4/qt4-4.8.1.inc
index aa18301..ace665f 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.1.inc
@@ -3,7 +3,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
SRC_URI =
"http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz
\
file://0004-no-qmake.patch \
diff --git
a/meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
similarity index 100%
rename from
meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch
rename to
meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch
b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch
rename to meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/disable-fuse-gol
[OE-core] [oe-core][PATCH 02/10] qt4: use releases.qt-project.org instead of get.qt.nokia.com
* releases.qt-project.org has 4.8.1 as well as 4.8.3
Signed-off-by: Martin Jansa
---
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 +-
meta/recipes-qt/qt4/qt-4.8.1.inc| 2 +-
meta/recipes-qt/qt4/qt4-native.inc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index a1dd8df..0228b56 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -10,7 +10,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
inherit nativesdk qmake2
-SRC_URI =
"http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+SRC_URI =
"http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz
\
file://0004-no-qmake.patch \
file://configure-lflags.patch \
file://qt-config.patch \
diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc
index b923e60..aa18301 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.1.inc
@@ -5,7 +5,7 @@ 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 \
+SRC_URI =
"http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz
\
file://0004-no-qmake.patch \
file://hack-out-pg2-4.7.0.patch \
file://0006-freetype-host-includes.patch \
diff --git a/meta/recipes-qt/qt4/qt4-native.inc
b/meta/recipes-qt/qt4/qt4-native.inc
index e00a1f3..492a700 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -13,7 +13,7 @@ INC_PR = "r16"
inherit native
-SRC_URI =
"http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+SRC_URI =
"http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz
\
file://qt-config.patch \
file://g++.conf \
file://linux.conf \
--
1.7.12
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 01/10] qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
Signed-off-by: Martin Jansa
---
.../recipes-qt/qt4/{qt4-tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 0
meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb| 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc =>
nativesdk-qt4-tools.inc} (100%)
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
similarity index 100%
rename from meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
rename to meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
index e17a8ad..42d2873 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
@@ -1,4 +1,4 @@
-require qt4-tools-nativesdk.inc
+require nativesdk-qt4-tools.inc
PR = "${INC_PR}.1"
--
1.7.12
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 00/10] qt4: upgrade to 4.8.3 and cleanup
Please test on more architectures.
I've tested complete qt4-native + qt4-free-x11 on armv4t.
And only do_patch for nativesdk-qt4-tools, qt-mobility-*, qt4-embedded.
The following changes since commit 938d07871bedd91f0d95ed6fe338ecbfafa5ebfe:
busybox: Fix misplaced quote (2012-09-26 18:28:17 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/qt4-4.8.3
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/qt4-4.8.3
Martin Jansa (10):
qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc
qt4: use releases.qt-project.org instead of get.qt.nokia.com
qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
qt4.inc: move more options to separate variables
qt-mobility: move qt-mobility patches to separate dir
qt4: move patches from files to qt4-4.8.1
qt4: drop patches not used in any recipe
qt4: replace all local patches with git patches with headers
qt4: PR bumps
qt4: upgrade to 4.8.3
meta/recipes-qt/qt4/files/0004-no-qmake.patch | 27 --
meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch | 41 --
.../qt4/files/blacklist-diginotar-certs.diff | 95 --
.../recipes-qt/qt4/files/compile.test-lflags.patch | 17
meta/recipes-qt/qt4/files/fix-config-tests.patch | 38 -
...tools-nativesdk.inc => nativesdk-qt4-tools.inc} | 18 ++--
meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb | 8 --
meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb | 8 ++
.../qt4/qt-4.8.1/fix_conflicting_types.patch | 29 ---
meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch | 35
meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch | 22 -
...stvideoconnector-fixed-buffers-allocation.patch | 0
...nnecessary-rpaths-from-qml_device-example.patch | 0
.../{files => qt-mobility-1.2.0}/gcc-scope.patch | 0
.../qt-mobility-configure.patch| 0
.../qt-mobility-no-opengl.patch| 0
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 +-
.../recipes-qt/qt4/{qt-4.8.1.inc => qt4-4.8.3.inc} | 41 +-
...-allow-to-set-qt.conf-from-the-outside-u.patch} | 28 +--
...ty_qws-fix-build-with-old-kernel-headers.patch} | 21 -
...03-webkit2-set-OUTPUT_DIR-value-if-empty.patch} | 21 -
...make-is-already-built-in-qt4-tools-native.patch | 29 +++
...-set-LFLAGS-to-pick-up-zlib-from-staging.patch} | 24 --
...e-OE_QMAKE_-values-to-specify-Qt-utility.patch} | 26 --
...const-usage-that-causes-compile-failure-.patch} | 26 --
...low-building-a-separate-qmake-for-the-ta.patch} | 20 +++--
...-fix-source-file-references-in-qmake.pri.patch} | 15 ++--
...ck-to-not-use-the-pg_config-of-the-host-.patch} | 25 --
.../0011-freetype-host-includes.patch} | 20 +++--
.../0012-Add-2bpp-support.patch} | 76 ++---
.../0013-configure-add-crossarch-option.patch} | 36
...ions-fix-phony-translation-linking-error.patch} | 19 +++--
...configure-add-nostrip-for-debug-packages.patch} | 15 +++-
...sure-we-identify-the-compiler-as-g-in-co.patch} | 27 --
...re-make-pulseaudio-a-configurable-option.patch} | 17 ++--
...es-for-gcc-4.7.0-particularly-on-qemux86.patch} | 45 ++
...019-webkit-disable-the-fuse-ld-gold-flag.patch} | 23 --
.../qt4/{qt-4.8.1 => qt4-4.8.3}/g++.conf | 0
.../qt4/{qt-4.8.1 => qt4-4.8.3}/linux.conf | 0
meta/recipes-qt/qt4/{files => qt4-4.8.3}/qte.sh| 0
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
...qt4-embedded_4.8.1.bb => qt4-embedded_4.8.3.bb} | 4 +-
meta/recipes-qt/qt4/qt4-native.inc | 10 +--
meta/recipes-qt/qt4/qt4-native_4.8.1.bb| 12 ---
meta/recipes-qt/qt4/qt4-native_4.8.3.bb| 8 ++
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
...qt4-x11-free_4.8.1.bb => qt4-x11-free_4.8.3.bb} | 4 +-
meta/recipes-qt/qt4/qt4.inc| 19 -
48 files changed, 427 insertions(+), 529 deletions(-)
delete mode 100644 meta/recipes-qt/qt4/files/0004-no-qmake.patch
delete mode 100644 meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
delete mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
delete mode 100644 meta/recipes-qt/qt4/files/compile.test-lflags.patch
delete mode 100644 meta/recipes-qt/qt4/files/fix-config-tests.patch
rename meta/recipes-qt/qt4/{qt4-tools-nativesdk.inc =>
nativesdk-qt4-tools.inc} (83%)
delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/gcc47-fix.patch
delete mode 100644 meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
rename meta/recipes-qt/qt4/{files =>
qt-mobility-1.2.0}/0001-gstvideoconnector-fixed-buffers-allocation.patch (100%)
rename met
[OE-core] [PATCH 3/3] license.conf/bbclass: Move globals to license.conf
This requires the changes to bitbake.conf that allow parsing of
license.conf.
As we should now be parsing license.conf, we can move some globals
out of license.bblcass and into the conf file.
Signed-off-by: Elizabeth Flanagan
---
meta/classes/license.bbclass | 65 --
meta/conf/licenses.conf | 64 +
2 files changed, 64 insertions(+), 65 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index ad543f6..a66933f 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -10,71 +10,6 @@ addtask populate_lic after do_patch before do_package
do_populate_lic[dirs] = "${LICSSTATEDIR}/${PN}"
do_populate_lic[cleandirs] = "${LICSSTATEDIR}"
-# Standards are great! Everyone has their own. In an effort to standardize
licensing
-# names, common-licenses will use the SPDX standard license names. In order to
not
-# break the non-standardized license names that we find in LICENSE, we'll set
-# up a bunch of VarFlags to accomodate non-SPDX license names.
-#
-# We should really discuss standardizing this field, but that's a longer term
goal.
-# For now, we can do this and it should grab the most common LICENSE naming
variations.
-#
-# We should NEVER have a GPL/LGPL without a version
-# Any mapping to MPL/LGPL/GPL should be fixed
-# see: https://wiki.yoctoproject.org/wiki/License_Audit
-
-# GPL variations
-SPDXLICENSEMAP[GPL-1] = "GPL-1.0"
-SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
-SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
-SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
-SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
-SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
-SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
-SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
-SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
-
-#LGPL variations
-SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
-SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
-SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
-SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
-SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
-
-#MPL variations
-SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
-SPDXLICENSEMAP[MPLv1] = "MPL-1.0"
-SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1"
-SPDXLICENSEMAP[MPLv2] = "MPL-2.0"
-
-#MIT variations
-SPDXLICENSEMAP[MIT-X] = "MIT"
-SPDXLICENSEMAP[MIT-style] = "MIT"
-
-#Openssl variations
-SPDXLICENSEMAP[openssl] = "OpenSSL"
-
-#Python variations
-SPDXLICENSEMAP[PSF] = "Python-2.0"
-SPDXLICENSEMAP[PSFv2] = "Python-2.0"
-SPDXLICENSEMAP[Python-2] = "Python-2.0"
-
-#Apache variations
-SPDXLICENSEMAP[Apachev2] = "Apache-2.0"
-SPDXLICENSEMAP[Apache-2] = "Apache-2.0"
-
-#Artistic variations
-SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0"
-SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0"
-
-#Academic variations
-SPDXLICENSEMAP[AFL-2] = "AFL-2.0"
-SPDXLICENSEMAP[AFL-1] = "AFL-1.2"
-SPDXLICENSEMAP[AFLv2] = "AFL-2.0"
-SPDXLICENSEMAP[AFLv1] = "AFL-1.2"
-
-#Other variations
-SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"
-
license_create_manifest() {
mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME}
# Get list of installed packages
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 6ed4dfe..3cb143c 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -39,6 +39,70 @@ SRC_DISTRIBUTE_LICENSES += "SPL-1.0 SugarCRM-1
SugarCRM-1.1.3 UCB VSL-1.0 W3C"
SRC_DISTRIBUTE_LICENSES += "Watcom-1.0 WXwindows XFree86-1.1 Xnet YPL-1.1"
SRC_DISTRIBUTE_LICENSES += "Zimbra-1.3 Zlib ZPL-1.1 ZPL-2.0 ZPL-2.1"
+# Standards are great! Everyone has their own. In an effort to standardize
licensing
+# names, common-licenses will use the SPDX standard license names. In order to
not
+# break the non-standardized license names that we find in LICENSE, we'll set
+# up a bunch of VarFlags to accomodate non-SPDX license names.
+#
+# We should really discuss standardizing this field, but that's a longer term
goal.
+# For now, we can do this and it should grab the most common LICENSE naming
variations.
+#
+# We should NEVER have a GPL/LGPL without a version
+# Any mapping to MPL/LGPL/GPL should be fixed
+# see: https://wiki.yoctoproject.org/wiki/License_Audit
+
+# GPL variations
+SPDXLICENSEMAP[GPL-1] = "GPL-1.0"
+SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
+SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
+SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
+SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
+SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
+SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
+SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
+SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
+
+#LGPL variations
+SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
+SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
+SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
+SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
+SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
+
+#MPL variations
+SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
+SPDXLICENSEMAP[MPLv1] = "MPL-1.0"
+SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1"
+SPDXLICENSEMAP[MPLv2] = "MPL-2.0"
+
+#MIT variations
+SPDXLICENSEMAP[MIT-X] = "MIT"
+SPDXLICENSEMAP[MIT-style] = "MIT"
+
+#Openssl variations
+SPDXLICENSEMAP[openssl] = "OpenSSL"
+
+#Python variations
+SPDXLICENSEMAP[PSF] = "Python-2.0"
+SPDXLICENSEMAP[PSFv
[OE-core] [PATCH 0/3] license.bbclass fixes
[YOCTO #3118] license.conf hasn't been being parsed. This commit series ensures that license.conf is parsed, that it contains useful variables that should be in a global conf file and that those variables are not kept within license.bbclass. This also fixes an discreprancy between the documentation of LICENSE_PATH (which is what we tell people to use) and what we were using "LICENSE_DIR". This ensures that when the end user needs to add additional licenses, that they use LICENSE_PATH += "path/to/additional/licenses" and that it works. The following changes since commit 0b09e50810162a07ef0aecee91ee32b4a36334a3: busybox: Fix misplaced quote (2012-09-26 18:28:36 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib eflanagan/LICENSE_PATH http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/LICENSE_PATH Elizabeth Flanagan (3): license.bbclass: Variable standardization bitbake.conf: parse license config license.conf/bbclass: Move globals to license.conf meta/classes/license.bbclass | 67 +- meta/conf/bitbake.conf |1 + meta/conf/licenses.conf | 64 3 files changed, 66 insertions(+), 66 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] license.bbclass: Variable standardization
The variable mentioned in license.conf is LICENSE_PATH. The variable
used in license.bbclass is LICENSE_DIR. Conforming to what is in
license.conf
Signed-off-by: Elizabeth Flanagan
---
meta/classes/license.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index ffcaf93..ad543f6 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -186,7 +186,7 @@ python do_populate_lic() {
license_source_dirs = []
license_source_dirs.append(generic_directory)
try:
-additional_lic_dirs = d.getVar('LICENSE_DIR', True).split()
+additional_lic_dirs = d.getVar('LICENSE_PATH', True).split()
for lic_dir in additional_lic_dirs:
license_source_dirs.append(lic_dir)
except:
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] bitbake.conf: parse license config
license.conf hasn't been being parsed. It probably should be.
Signed-off-by: Elizabeth Flanagan
---
meta/conf/bitbake.conf |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3496d2b..e168ef1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -683,6 +683,7 @@ include conf/machine-sdk/${SDKMACHINE}.conf
include conf/distro/${DISTRO}.conf
include conf/distro/defaultsetup.conf
include conf/documentation.conf
+include conf/licenses.conf
require conf/sanity.conf
##
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa
On 24 September 2012 11:52, Martin Jansa wrote: > Why not RCONFLICT with every older version then current? > > It's true that e.g. 1.11.2-r8 does not really conflict with 1.11.2-r7 > (but r4 in most cases), but that should work. As much as I don't like this solution as it's overenthusiastic about the conflicts, it isn't demonstrably broken (whereas a bbappend with PRINC breaks my proposal). So, ignore my patch, I ack this one instead. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dbus: disable all X11 when native
Without --without-x the X11 detection would still go ahead and find the host X11
headers, which seems to cause problems at link time.
Signed-off-by: Ross Burton
---
meta/recipes-core/dbus/dbus.inc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 5c99e11..550eb0a 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl
${@base_contains('DISTRO_FEATURES', 'x11', '${X
DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl
virtual/libx11"
-INC_PR = "r4"
+INC_PR = "r5"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch; \
@@ -64,7 +64,7 @@ pkg_postinst_dbus() {
}
EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x',
'--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
+EXTRA_OECONF_X_virtclass-native = "--without-x --disable-x11-autolaunch"
EXTRA_OECONF = "--disable-tests \
--disable-checks \
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] runqemu-internal: don't append an empty element to PATH
Bitbake fails to run when an empty element exists in $PATH. Avoid creating this situation when $CROSSPATH is not set. This fixes bug [YOCTO #3101] Signed-off-by: Scott Garman --- scripts/runqemu-internal |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 6b8bb65..0f07bad 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -472,7 +472,11 @@ if [ "x$QEMUOPTIONS" = "x" ]; then return fi -PATH=$CROSSPATH:$OECORE_NATIVE_SYSROOT/usr/bin:$PATH +if [ "x$CROSSPATH" = "x" ]; then +PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$PATH +else +PATH=$CROSSPATH:$OECORE_NATIVE_SYSROOT/usr/bin:$PATH +fi QEMUBIN=`which $QEMU 2> /dev/null` if [ ! -x "$QEMUBIN" ]; then -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] oe-find-native-sysroot: show bitbake errors to user
Ran into another bug that was masked by hiding a bitbake error message. This catches this situation and displays the error to the user. Also includes whitespace fixes. Signed-off-by: Scott Garman --- scripts/oe-find-native-sysroot | 29 +++-- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot index b2c22aa..9df9b44 100755 --- a/scripts/oe-find-native-sysroot +++ b/scripts/oe-find-native-sysroot @@ -30,31 +30,40 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -if [ -z "$OECORE_NATIVE_SYSROOT" ]; then +if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then BITBAKE=`which bitbake 2> /dev/null` if [ "x$BITBAKE" != "x" ]; then - if [ "$UID" = "0" ]; then +if [ "$UID" = "0" ]; then # Root cannot run bitbake unless sanity checking is disabled if [ ! -d "./conf" ]; then - echo "Error: root cannot run bitbake by default, and I cannot find a ./conf directory to be able to disable sanity checking" - exit 1 +echo "Error: root cannot run bitbake by default, and I cannot find a ./conf directory to be able to disable sanity checking" +exit 1 fi touch conf/sanity.conf OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` rm -f conf/sanity.conf - else +else OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` - fi +fi else - echo "Error: Unable to locate your native sysroot." - echo "Did you forget to source the build environment setup script?" +echo "Error: Unable to locate bitbake command." +echo "Did you forget to source the build environment setup script?" - if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then +if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then exit 1 - fi +fi fi fi +if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then +# This indicates that there was an error running bitbake -e that +# the user needs to be informed of +echo "There was an error running bitbake to determine STAGING_DIR_NATIVE" +echo "Here is the output from bitbake -e" +bitbake -e +exit 1 +fi + # Set up pseudo command if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then echo "Error: Unable to find pseudo binary in $OECORE_NATIVE_SYSROOT/usr/bin/" -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] runqemu path fix
Hello, This is a bugfix for YOCTO #3101. Since bitbake doesn't like empty PATH elements, prevent the runqemu-internal script from creating this situation when CROSSPATH is not set, and reveal bitbake errors to users to make it easier to troubleshoot future errors along these lines. Scott The following changes since commit a8edf79fce381d0433f18bd38df6cd74008e5179: bitbake: fetch2/git: Don't use deprecated API (2012-09-25 15:55:57 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib sgarman/runqemu-path-fix http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/runqemu-path-fix Scott Garman (2): oe-find-native-sysroot: show bitbake errors to user runqemu-internal: don't append an empty element to PATH scripts/oe-find-native-sysroot | 29 +++-- scripts/runqemu-internal |6 +- 2 files changed, 24 insertions(+), 11 deletions(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] libx11: fix nativesdk build on older distros
On Wed, Sep 26, 2012 at 4:30 AM, Burton, Ross wrote:
> On 26 September 2012 00:11, Daniel Stone wrote:
>>> The best fix is to just #define _GNU_SOURCE at the top of makekeys
>>> then, and push that upstream (mail patch to xorg-de...@lists.x.org).
>>
>> Actually, it isn't, as that breaks non-glibc badly. glibc takes
>> _GNU_SOURCE to mean 'please add useful GNU extensions to this POSIX
>> wasteland', whereas BSD and/or Solaris take it to mean 'please make
>> this only GNU and don't use any other extensions at all'. So we have
>> to do whatever AC_USE_SYSTEM_EXTENSIONS does, because that really is
>> the only thing that actually works.
>
> What do you mean non-glibc? :)
>
> Ignoring Minix as a build host (I think that's reasonable),
> AC_USE_SYSTEM_EXTENSIONS defines _ALL_SOURCE _GNU_SOURCE
> _POSIX_PTHREAD_SEMANTICS _TANDEM_SOURCE, and does a compile-time
> sanity test of __EXTENSIONS__ (because it's possible that some
> combination of these defines make the system headers unusable on
> Solaris).
>
> This is annoying. How about for oe-core we patch in -D_GNU_SOURCE to
> src/util/Makefile.am's CPPFLAGS definition and I'll discuss with
> xorg-dev for a proper fix?
Would this be OK for now in libx11.inc?
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -D_GNU_SOURCE"
-M
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xserver-xorg: fix -exa conflicts
On Wed, Sep 26, 2012 at 05:08:27PM +0100, Ross Burton wrote:
> Hopefully for good this time!
>
> The previous conflict of < ${PV} declares a conflict with all versions older
> than the version being built, which isn't right.
>
> This conflict was being declared in a .inc file which is being included by
> multiple recipes (xserver-psb in meta-intel, for example) so knowledge of the
> exact version in which this change occured is only known by the .bb file
> itself.
> Recognise this and put the conflict in the .bb file itself.
>
> Signed-off-by: Ross Burton
> ---
> meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |4
> meta/recipes-graphics/xorg-xserver/xserver-xorg.inc|1 -
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> index 35cb33a..a2d1bec 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> @@ -9,3 +9,7 @@ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
> SRC_URI[sha256sum] =
> "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> PR = "r8"
> +
> +# This conflict needs to be here and not in the .inc so we know the exact
> +# version where the break was
> +RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r5)"
This doesn't work if there is layer with PRINC or even more layers which
doesn't know about each other, see:
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/030014.html
Cheers,
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 643ca70..3ec38b7 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -66,7 +66,6 @@ PACKAGES =+ "${PN}-security-policy \
>
> RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb
> xserver-xf86-config"
> RDEPENDS_${PN}-xvfb += "xkeyboard-config"
> -RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"
>
> FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
> ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
> ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt
> ${datadir}/X11/xorg.conf.d"
> FILES_${PN}-dev += "${libdir}/xorg/modules/*.la
> ${libdir}/xorg/modules/*/*.la"
> --
> 1.7.10
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/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.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cmake.bbclass: modify construction of compiler flags
> -Original Message-
> From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
> Sent: Wednesday, September 26, 2012 1:48 AM
> To: Slater, Joseph
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] cmake.bbclass: modify construction of compiler
> flags
>
> On Tue, 2012-09-25 at 14:37 -0700, Joe Slater wrote:
> > Use CFLAGS instead of CPPFLAGS for C_FLAGS variants.
> > Also remove duplicate flags from _RELEASE variants.
> >
> > Signed-off-by: Joe Slater
> >
> > *** Note - this can break things that have never really
> > ***been compiled with -O2 optimization
>
> This change says what you're doing but not really why. How are things
> broken and why is this an improvement?
The specific problem is that, since CFLAGS are ignored, there is no difference
between debug (-O0) and production (-O2) builds. It also seems
counter-intuitive
that CXX_FLAGS are based on CXXFLAGS, but C_FLAGS are not based on CFLAGS.
Joe
>
> Cheers,
>
> Richard
>
> > ---
> > meta/classes/cmake.bbclass |6 +++---
> > 1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> > index dcd974a..ac5c048 100644
> > --- a/meta/classes/cmake.bbclass
> > +++ b/meta/classes/cmake.bbclass
> > @@ -19,10 +19,10 @@ OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^
> > ]*\).*/\1/'`"
> > OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"
> >
> > # Compiler flags
> > -OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CPPFLAGS}"
> > +OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CFLAGS}"
> > OECMAKE_CXX_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CXXFLAGS}
> > -fpermissive"
> > -OECMAKE_C_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CPPFLAGS} -DNDEBUG"
> > -OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS}
> > -DNDEBUG"
> > +OECMAKE_C_FLAGS_RELEASE ?= "${CFLAGS} -DNDEBUG"
> > +OECMAKE_CXX_FLAGS_RELEASE ?= "${CXXFLAGS} -DNDEBUG"
> >
> > OECMAKE_RPATH ?= ""
> > OECMAKE_PERLNATIVE_DIR ??= ""
>
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa
On Mon, Sep 24, 2012 at 12:43 PM, Richard Purdie
wrote:
> On Mon, 2012-09-24 at 12:26 +0200, Martin Jansa wrote:
>> On Mon, Sep 24, 2012 at 12:20 PM, Richard Purdie
>> wrote:
>> > On Sat, 2012-09-22 at 19:13 +0200, Martin Jansa wrote:
>> >> * it doesn't make much sense with PV, because xserver-xorg-module-exa
>> >> was introduced in
>> >>
>> >> http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
>> >> so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<=
>> >> 1.11.2-r4)
>> >> and (< 1.11.2) is not good enough
>> >>
>> >> * because we don't know how many PRINC are in BSP/DISTRO layers,
>> >> then it's safer to RCONFLICTS with every older version then current
>> >> EXTENDPKGV
>> >>
>> >> Signed-off-by: Martin Jansa
>> >>
>> >> --
>> >>
>> >> * I haven't really tested this with IPK, since it was changed from
>> >> RREPLACES to RCONFLICTS (because of RPM) and all my installed devices
>> >> are already upgraded
>> >> ---
>> >> meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
>> >> 1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
>> >> b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
>> >> index 33f59fe..7513399 100644
>> >> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
>> >> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
>> >> @@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \
>> >>
>> >> RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb
>> >> xserver-xf86-config"
>> >> RDEPENDS_${PN}-xvfb += "xkeyboard-config"
>> >> -RCONFLICTS_${PN}-module-exa = "${PN} (< ${PV})"
>> >> +RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})"
>> >>
>> >> FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
>> >> ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
>> >> ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt
>> >> ${datadir}/X11/xorg.conf.d"
>> >> FILES_${PN}-dev += "${libdir}/xorg/modules/*.la
>> >> ${libdir}/xorg/modules/*/*.la"
>> >
>> > The original patch and this patch are wrong, this value should not be
>> > "floating". It should be spelt out explicitly so it doesn't change with
>> > the recipe version in future.:
>> >
>> > RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r4)"
>>
>> So every layer with PRINC in xserver-xorg needs to add
>> RCONFLICTS_${PN}-module-exa = "${PN} (<
>> 1.11.2-rTHEIR_PR_AT_THE_TIME_OF_CHANGE) ?
>> What if there is more layers then one with PRINC and they don't know
>> about each other?
>
> There is a problem there, yes and we're on uncharted territory here. If
> people were using the PR service rather that trying to force package
> management problems into the core we wouldn't have this kind of problem.
>
> As a solution, how about appending something to PV? I don't like it but
> an artificial PV step should "resolve" this.
Why not RCONFLICT with every older version then current?
It's true that e.g. 1.11.2-r8 does not really conflict with 1.11.2-r7
(but r4 in most cases), but that should work.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] autotools.bbclass: Add functionality to force a clean of ${B} when reconfiguring (and ${S} != ${B})
On Tue, 2012-09-11 at 15:22 +0100, Richard Purdie wrote: > Unfortunately whilst rerunning configure and make against a project will > mostly > work there are situations where it does not correctly do the right thing. > > In particular, eglibc and gcc will fail out with errors where settings > do not match a previously built configuration. It could be argued they are > broken but the situation is what it is. There is the possibility of more > subtle > errors too. FWIW, I just encountered another instance of what appears to be a similar problem (with this patch applied). I had changed my CFLAGS to work around a compiler problem and then just reran the build, which led eventually to: ERROR: Function failed: do_siteconfig_gencache (see /tmp-eglibc/work/mips32el-oe-linux/eglibc/2.16-r11.micro1 +svnr20393/temp/log.do_populate_sysroot.6005 for further information) ERROR: Logfile of failure stored in: /tmp-eglibc/work/mips32el-oe-linux/eglibc/2.16-r11.micro1 +svnr20393/temp/log.do_populate_sysroot.6005 Log data follows: | DEBUG: Executing python function sstate_task_prefunc [...] | DEBUG: Executing shell function do_siteconfig_gencache | configure: WARNING: unrecognized options: --disable-silent-rules, --disable-dependency-tracking, --with-libtool-sysroot | configure: loading cache eglibc_cache | configure: error: `CFLAGS' has changed since the previous run: | configure: former value: `...' | configure: current value: `...' | configure: error: in `/.../tmp-eglibc/work/mips32el-oe-linux/eglibc/2.16-r11.micro1 +svnr20393/site_config_cheetah': | configure: error: changes in the environment can compromise the build | configure: error: run `make distclean' and/or `rm eglibc_cache' and start over | DEBUG: Python function siteconfig_do_siteconfig finished | DEBUG: Python function autotools_do_siteconfig finished | DEBUG: Python function do_siteconfig finished | DEBUG: Python function sstate_task_postfunc finished ERROR: Task 30 (.../oe-core/meta/recipes-core/eglibc/eglibc_2.16.bb, do_populate_sysroot) failed with exit code '1' p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xserver-xorg: fix -exa conflicts
Hopefully for good this time!
The previous conflict of < ${PV} declares a conflict with all versions older
than the version being built, which isn't right.
This conflict was being declared in a .inc file which is being included by
multiple recipes (xserver-psb in meta-intel, for example) so knowledge of the
exact version in which this change occured is only known by the .bb file itself.
Recognise this and put the conflict in the .bb file itself.
Signed-off-by: Ross Burton
---
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |4
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc|1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index 35cb33a..a2d1bec 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -9,3 +9,7 @@ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] =
"fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
PR = "r8"
+
+# This conflict needs to be here and not in the .inc so we know the exact
+# version where the break was
+RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r5)"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 643ca70..3ec38b7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -66,7 +66,6 @@ PACKAGES =+ "${PN}-security-policy \
RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb
xserver-xf86-config"
RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"
FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt
${datadir}/X11/xorg.conf.d"
FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] udev patch v4
Hi all, I sent patch v4 with a small change modifying the udev's default runtime directory from /run/ to the more traditional /var/run/. I've opened two bugs https://bugzilla.yoctoproject.org/show_bug.cgi?id=3179and https://bugzilla.yoctoproject.org/show_bug.cgi?id=3181 to track the issue and to remove the patch when we fix the runtime directory in Yocto. Cheers, Alex ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4] udev: upgrade to 182
From: Alexandru DAMIAN
This is the final upgrade of udev. Futher upgrades will only
come in conjunction with systemd.
The v4l1 removal patch is deprecated as the bug is fixed inside udev.
There is a new patch fixing the path for default sh interpreter.
New debug binaries are generated, and udev.inc is modified to package
those correctly.
The install locations changed for udevd and udevadm, so the scripts
are updated accordingly.
Signed-off-by: Alexandru DAMIAN
---
.../initscripts/initscripts-1.0/volatiles |2 +-
meta/recipes-core/udev/udev.inc| 13 +++--
...yboard_force_release.sh-shell-script-path.patch | 35 ++
...001-Modify-default-path-for-run-directory.patch | 35 ++
meta/recipes-core/udev/udev/include_resource.patch | 31
meta/recipes-core/udev/udev/init | 14 +++---
meta/recipes-core/udev/udev/udev-166-v4l1-1.patch | 50
meta/recipes-core/udev/udev/udev-cache |2 +-
meta/recipes-core/udev/udev_164.bb |9
meta/recipes-core/udev/udev_182.bb |9
10 files changed, 97 insertions(+), 103 deletions(-)
create mode 100644
meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
create mode 100644
meta/recipes-core/udev/udev/0001-Modify-default-path-for-run-directory.patch
delete mode 100644 meta/recipes-core/udev/udev/include_resource.patch
delete mode 100644 meta/recipes-core/udev/udev/udev-166-v4l1-1.patch
delete mode 100644 meta/recipes-core/udev/udev_164.bb
create mode 100644 meta/recipes-core/udev/udev_182.bb
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index b2ae279..e0741aa 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -36,4 +36,4 @@ f root root 0664 /var/log/wtmp none
f root root 0664 /var/run/utmp none
l root root 0644 /etc/resolv.conf /var/run/resolv.conf
f root root 0644 /var/run/resolv.conf none
-
+l root root 0755 /run /var/run
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 329f727..3ce7ce9 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -6,9 +6,10 @@ LICENSE = "GPLv2.0+ & LGPLv2.1+"
LICENSE_${PN} = "GPLv2.0+"
LICENSE_libudev = "LGPLv2.1+"
LICENSE_libgudev = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-
file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-
file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://src/COPYING;md5=17c4e5fb495e6707ac92a3864926f979 \
+
file://src/gudev/COPYING;md5=fb494485a7d0505308cb68e4997cc266"
+
DEPENDS = "acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native"
RPROVIDES_${PN} = "hotplug"
@@ -16,6 +17,8 @@ RRECOMMENDS_${PN} += "udev-extraconf usbutils-ids
pciutils-ids"
RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+
file://0001-Fixing-keyboard_force_release.sh-shell-script-path.patch \
+ file://0001-Modify-default-path-for-run-directory.patch \
file://run.rules \
file://udev.rules \
file://devfs-udev.rules \
@@ -30,7 +33,7 @@ inherit autotools pkgconfig update-rc.d
# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/
sbindir = "${base_sbindir}"
-libexecdir = "${base_libdir}/udev"
+libexecdir = "${base_libdir}"
EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \
--with-pci-ids-path=${datadir}/pci.ids"
@@ -48,6 +51,8 @@ FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
RRECOMMENDS_${PN} += "udev-utils"
FILES_${PN}-dbg += "${libexecdir}/.debug"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"
FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
FILES_libudev = "${base_libdir}/libudev.so.*"
FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
diff --git
a/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
b/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
new file mode 100644
index 000..41deafa
--- /dev/null
+++
b/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
@@ -0,0 +1,35 @@
+From 0f8290c943da298abd269ca60fd8375dfb219971 Mon Sep 17 00:00:00 2001
+From: Alexandru DAMIAN
+Date: Thu, 12 Jul 2012 12:54:48 +0300
+Subject: [PATCH] Fixing keyboard_force_release.sh shell script path
+
+With the introduction of rootprefix, the keyboard-force-release.sh.in
+was modified t
Re: [OE-core] [PATCH v2] glib-2.0: Update to 2.34.0
On Wed, Sep 26, 2012 at 03:44:28PM +0100, Phil Blundell wrote: > On Wed, 2012-09-26 at 15:39 +0100, Burton, Ross wrote: > > On 26 September 2012 15:28, Phil Blundell wrote: > > > Which patches were you thinking of specifically? I don't think there > > > are many that we apply which are actually related to cross-compiling. > > > > no-libelf and no-dbus. > > > > Looking at the patches we are carrying, it's quite comic. Two patches > > which are carried with no understanding of why... > > no-dbus isn't anything to do with cross-compiling as such, it's to avoid > an extra build dependency on dbus. I've no idea what exactly no-libelf > is trying to accomplish though it does also look like it's intended to > prevent an extra library dependency. yes, see 2929e7d590862d9649458c90804e79a1dce40423 where it was introduced > > p. > > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/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.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: Remove static libraries from -dev packages
On 9/25/12 5:11 PM, Colin Walters wrote: On Tue, 2012-09-25 at 23:00 +0100, Phil Blundell wrote: That'd be inconsistent with other packages, since we do generally build and ship the static libraries. Having a big switch to turn off static libraries globally seems like a fine plan, but I can't see any obvious reason why the util-linux ones are any more useless than the rest. Makes sense. I wonder if there are actually any users of the static libraries. Users are primarily small systems, where static linking may result in a slightly smaller system. (When I say small systems, I'm talking about single application embedded systems..) For what it's worth in gnome-ostree I do just globally pass --disable-static by default. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] glib-2.0: Update to 2.34.0
On Wed, 2012-09-26 at 15:39 +0100, Burton, Ross wrote: > On 26 September 2012 15:28, Phil Blundell wrote: > > Which patches were you thinking of specifically? I don't think there > > are many that we apply which are actually related to cross-compiling. > > no-libelf and no-dbus. > > Looking at the patches we are carrying, it's quite comic. Two patches > which are carried with no understanding of why... no-dbus isn't anything to do with cross-compiling as such, it's to avoid an extra build dependency on dbus. I've no idea what exactly no-libelf is trying to accomplish though it does also look like it's intended to prevent an extra library dependency. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] glib-2.0: Update to 2.34.0
On 26 September 2012 15:28, Phil Blundell wrote: > Which patches were you thinking of specifically? I don't think there > are many that we apply which are actually related to cross-compiling. no-libelf and no-dbus. Looking at the patches we are carrying, it's quite comic. Two patches which are carried with no understanding of why... Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glib-2.0: Update to 2.34.0
On 26 September 2012 15:28, Phil Blundell wrote: > That disables all the tests, right? I wasn't entirely clear whether we > wanted to do that or not. If we do then yes, I agree, that would be a > way to avoid the nodbus.patch. Well, we can't run them, so not much point in building them. (yet. this is a prime candidate for a better test for the ptest proposal!) Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] glib-2.0: Update to 2.34.0
On Wed, 2012-09-26 at 15:12 +0100, Burton, Ross wrote: > It's a bit late for this oe-core cycle I suspect, if we'd been > tracking the 2.33. releases that would be a different story, so maybe > we'll do that next time... > > Also from glancing at the NEWS, we should be able to drop some of the > cross-compile patches. Did you investigate this or just refresh the > patches? Which patches were you thinking of specifically? I don't think there are many that we apply which are actually related to cross-compiling. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glib-2.0: Update to 2.34.0
On Wed, 2012-09-26 at 10:14 -0400, Colin Walters wrote: > On Wed, 2012-09-26 at 10:13 -0400, Colin Walters wrote: > > On Wed, 2012-09-26 at 13:17 +0100, Phil Blundell wrote: > > > > > meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34 > > > > > > > This should not be necessary anymore; see: > > http://git.gnome.org/browse/glib/commit/?id=f084b603771f78126bc0b07229a1574b76e776bb That disables all the tests, right? I wasn't entirely clear whether we wanted to do that or not. If we do then yes, I agree, that would be a way to avoid the nodbus.patch. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] linux-yocto: drop machine from SRCREV_FORMAT
On Wed, Sep 26, 2012 at 03:10:28PM +0100, Richard Purdie wrote:
> On Wed, 2012-09-26 at 15:55 +0200, Martin Jansa wrote:
> > On Tue, Sep 25, 2012 at 01:46:28PM +0100, Richard Purdie wrote:
> > > On Tue, 2012-09-25 at 14:36 +0200, Martin Jansa wrote:
> > > > On Tue, Sep 25, 2012 at 01:25:33PM +0100, Richard Purdie wrote:
> > > > > On Tue, 2012-09-25 at 12:51 +0200, Martin Jansa wrote:
> > > > > > * otherwise LOCALCOUNT is incremented after each MACHINE switch
> > > > > > when
> > > > > > machine usually has different SRCREV (e.g. because of different
> > > > > > KBRANCH)
> > > > > > * see
> > > > > > http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/029392.html
> > > > > >
> > > > > > Signed-off-by: Martin Jansa
> > > > > > ---
> > > > > > meta/recipes-kernel/linux/linux-yocto.inc | 2 +-
> > > > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > > >
> > > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto.inc
> > > > > > b/meta/recipes-kernel/linux/linux-yocto.inc
> > > > > > index 973970d..6efb578 100644
> > > > > > --- a/meta/recipes-kernel/linux/linux-yocto.inc
> > > > > > +++ b/meta/recipes-kernel/linux/linux-yocto.inc
> > > > > > @@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE ?= "standard"
> > > > > > # KMETA ?= ""
> > > > > > KBRANCH ?= "master"
> > > > > > KMACHINE ?= "${MACHINE}"
> > > > > > -SRCREV_FORMAT ?= "meta_machine"
> > > > > > +SRCREV_FORMAT ?= "meta"
> > > > > >
> > > > > > LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
> > > > >
> > > > > No, absolutely not. I have discussed this with Bruce before and there
> > > > > are no guarantees that the meta branch gets updated whenever machine
> > > > > changes. This is necessary to have deterministic builds and
> > > > > correctness
> > > > > of sstate for example.
> > > >
> > > > Isn't SRCREV_FORMAT used only to construct PV? So builds are still
> > > > deterministic because SRCREV is still locked to same value?
> > >
> > > PV is what triggers the system to rebuild. So if its not included,
> > > rebuilds won't happen when the revisions change.
> >
> > PR bump too and also sstate checksum change when OEBasicHash is enabled,
> > right?
>
> PR changes will trigger a rebuild, yes. A SRCREV change will not trigger
> a sstate change unless some dependency is added from fetch -> SRCREV
> though, regardless of which hash system is used.
So is PR bump enough or not? Well I gave up, I cannot build qemuarm
anyway because of arm tune issue..
Cheers,
>
> > > > Also PV which keeps changing without any change in source or metadata
> > > > doesn't look deterministic to me.
> > >
> > > I agree there is a problem, this is just not the right way to fix it,
> > > the problem is elsewhere, likely in the git fetcher. Making the
> > > revisions in the sqlite database respect components of STAMP/WORKDIR is
> > > probably the way we'll end up having to fix this (so some database
> > > entries are machine specific, some arch specific, some allarch).
> >
> > I still don't get your point in this case, see bellow:
> >
> > Build core-image-minimal
> > bitbake -k core-image-minimal
> > ...
> > NOTE: Tasks Summary: Attempted 1489 tasks of which 1242 didn't need to be
> > rerun and all succeeded.
> >
> > Apply:
> > diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> > b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> > index 2f8f957..3380688 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> > @@ -7,7 +7,7 @@ SRCREV_machine_qemuarm ?=
> > "8f05f1d8adbf1551a80225049dd381ffbb64a6c5"
> > SRCREV_machine_qemumips ?= "fb23a2ed7b94548b1736fdb55efb26f88bc5c171"
> > SRCREV_machine_qemuppc ?= "cdecf5940d81330680ce1517a7bc101556792e71"
> > SRCREV_machine_qemux86 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
> > -SRCREV_machine_qemux86-64 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
> > +SRCREV_machine_qemux86-64 ?= "00709f7f01c3a10252f030f0bdacecbb349d7be4"
> > SRCREV_machine ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
> > SRCREV_meta ?= "8bdc655034a58a7147176a8a882d81e2fd51e4b9"
> >
> > and indeed linux-yocto is rebuilt:
> > bitbake -k core-image-minimal
> > ...
> > NOTE: recipe
> > linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3: task
> > do_fetch: Started
> > NOTE: recipe
> > linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3: task
> > do_fetch: Succeeded
> > ...
> > NOTE: Tasks Summary: Attempted 1489 tasks of which 1456 didn't need to be
> > rerun and all succeeded.
> >
> > Because do_validate_branches checksum is different:
> > $ bitbake-diffsigs \
> >
> > stamps.1348666953/qemux86-64/qemux86_64-oe-linux/linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3.do_validate_branches.sigdata.8de0c7968171d72ceef34c16693adcdc
> >
> >
> > stamps.1348667138/qemux86-64/qemux86_64-oe-linux/linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3.do_validate_br
Re: [OE-core] [PATCH] glib-2.0: Update to 2.34.0
On Wed, 2012-09-26 at 10:13 -0400, Colin Walters wrote: > On Wed, 2012-09-26 at 13:17 +0100, Phil Blundell wrote: > > > meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34 > > This should not be necessary anymore; see: http://git.gnome.org/browse/glib/commit/?id=f084b603771f78126bc0b07229a1574b76e776bb ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glib-2.0: Update to 2.34.0
On Wed, 2012-09-26 at 13:17 +0100, Phil Blundell wrote: > meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34 This should not be necessary anymore; see: ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] glib-2.0: Update to 2.34.0
It's a bit late for this oe-core cycle I suspect, if we'd been tracking the 2.33. releases that would be a different story, so maybe we'll do that next time... Also from glancing at the NEWS, we should be able to drop some of the cross-compile patches. Did you investigate this or just refresh the patches? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] linux-yocto: drop machine from SRCREV_FORMAT
On Wed, 2012-09-26 at 15:55 +0200, Martin Jansa wrote:
> On Tue, Sep 25, 2012 at 01:46:28PM +0100, Richard Purdie wrote:
> > On Tue, 2012-09-25 at 14:36 +0200, Martin Jansa wrote:
> > > On Tue, Sep 25, 2012 at 01:25:33PM +0100, Richard Purdie wrote:
> > > > On Tue, 2012-09-25 at 12:51 +0200, Martin Jansa wrote:
> > > > > * otherwise LOCALCOUNT is incremented after each MACHINE switch when
> > > > > machine usually has different SRCREV (e.g. because of different
> > > > > KBRANCH)
> > > > > * see
> > > > > http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/029392.html
> > > > >
> > > > > Signed-off-by: Martin Jansa
> > > > > ---
> > > > > meta/recipes-kernel/linux/linux-yocto.inc | 2 +-
> > > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/meta/recipes-kernel/linux/linux-yocto.inc
> > > > > b/meta/recipes-kernel/linux/linux-yocto.inc
> > > > > index 973970d..6efb578 100644
> > > > > --- a/meta/recipes-kernel/linux/linux-yocto.inc
> > > > > +++ b/meta/recipes-kernel/linux/linux-yocto.inc
> > > > > @@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE ?= "standard"
> > > > > # KMETA ?= ""
> > > > > KBRANCH ?= "master"
> > > > > KMACHINE ?= "${MACHINE}"
> > > > > -SRCREV_FORMAT ?= "meta_machine"
> > > > > +SRCREV_FORMAT ?= "meta"
> > > > >
> > > > > LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
> > > >
> > > > No, absolutely not. I have discussed this with Bruce before and there
> > > > are no guarantees that the meta branch gets updated whenever machine
> > > > changes. This is necessary to have deterministic builds and correctness
> > > > of sstate for example.
> > >
> > > Isn't SRCREV_FORMAT used only to construct PV? So builds are still
> > > deterministic because SRCREV is still locked to same value?
> >
> > PV is what triggers the system to rebuild. So if its not included,
> > rebuilds won't happen when the revisions change.
>
> PR bump too and also sstate checksum change when OEBasicHash is enabled,
> right?
PR changes will trigger a rebuild, yes. A SRCREV change will not trigger
a sstate change unless some dependency is added from fetch -> SRCREV
though, regardless of which hash system is used.
> > > Also PV which keeps changing without any change in source or metadata
> > > doesn't look deterministic to me.
> >
> > I agree there is a problem, this is just not the right way to fix it,
> > the problem is elsewhere, likely in the git fetcher. Making the
> > revisions in the sqlite database respect components of STAMP/WORKDIR is
> > probably the way we'll end up having to fix this (so some database
> > entries are machine specific, some arch specific, some allarch).
>
> I still don't get your point in this case, see bellow:
>
> Build core-image-minimal
> bitbake -k core-image-minimal
> ...
> NOTE: Tasks Summary: Attempted 1489 tasks of which 1242 didn't need to be
> rerun and all succeeded.
>
> Apply:
> diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> index 2f8f957..3380688 100644
> --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
> @@ -7,7 +7,7 @@ SRCREV_machine_qemuarm ?=
> "8f05f1d8adbf1551a80225049dd381ffbb64a6c5"
> SRCREV_machine_qemumips ?= "fb23a2ed7b94548b1736fdb55efb26f88bc5c171"
> SRCREV_machine_qemuppc ?= "cdecf5940d81330680ce1517a7bc101556792e71"
> SRCREV_machine_qemux86 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
> -SRCREV_machine_qemux86-64 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
> +SRCREV_machine_qemux86-64 ?= "00709f7f01c3a10252f030f0bdacecbb349d7be4"
> SRCREV_machine ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
> SRCREV_meta ?= "8bdc655034a58a7147176a8a882d81e2fd51e4b9"
>
> and indeed linux-yocto is rebuilt:
> bitbake -k core-image-minimal
> ...
> NOTE: recipe
> linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3: task
> do_fetch: Started
> NOTE: recipe
> linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3: task
> do_fetch: Succeeded
> ...
> NOTE: Tasks Summary: Attempted 1489 tasks of which 1456 didn't need to be
> rerun and all succeeded.
>
> Because do_validate_branches checksum is different:
> $ bitbake-diffsigs \
>
> stamps.1348666953/qemux86-64/qemux86_64-oe-linux/linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3.do_validate_branches.sigdata.8de0c7968171d72ceef34c16693adcdc
>
>
> stamps.1348667138/qemux86-64/qemux86_64-oe-linux/linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3.do_validate_branches.sigdata.91568475cd863438643fffa047e66e3e
> basehash changed from 7cbacf9af68c92988dbf5e23fc57dafc to
> aa3c320a8a79614aadf94084c06fe9ba
> Variable SRCREV_machine value changed from
> 00709f7f01c3a10252f030f0bdacecbb349d7be4 to
> 3fa06aa29078fdb2af431de2d3fdae7d281ba85f
>
> So it _does_ trigger rebuild when SRCREV_machine is changed (even without it
> in SRCREV_FORMAT).
>
> And if every SR
Re: [OE-core] [PATCH] util-linux: Remove static libraries from -dev packages
On Wed, 2012-09-26 at 10:28 +0100, Phil Blundell wrote: > On Wed, 2012-09-26 at 09:49 +0100, Richard Purdie wrote: > > On Tue, 2012-09-25 at 18:11 -0400, Colin Walters wrote: > > > On Tue, 2012-09-25 at 23:00 +0100, Phil Blundell wrote: > > > > > > > That'd be inconsistent with other packages, since we do generally build > > > > and ship the static libraries. Having a big switch to turn off static > > > > libraries globally seems like a fine plan, but I can't see any obvious > > > > reason why the util-linux ones are any more useless than the rest. > > > > > > Makes sense. I wonder if there are actually any users of the static > > > libraries. > > > > > > For what it's worth in gnome-ostree I do just globally pass > > > --disable-static by default. > > > > I tested this a while back to see what performance difference it made. > > The answer was "nothing too significant", I don't have the exact timings > > handy. I do remember having to exclude sqlite-native from the list since > > pseudo static links against it. > > It's slightly surprising that it doesn't make that much of a difference, > given that building static libraries does essentially double the number > of compilations for library code. Though, of course, glibc doesn't > support --disable-static nowadays and there might be a few other big > packages that have the same issue. > > I guess that if you have enough cores, compilation count becomes > something of a non-issue since it's one of the few things that does > parallelize very well. It might be interesting to repeat the > measurements of --disable-static on a machine with only a few CPUs and > see whether it makes more of a difference there. Yes, admittedly I probably did test that in a highly parallel environment and was focusing on the critical path timings as a result. > Out of interest, why does pseudo static-link against sqlite anyway? Given the crazy things that pseudo does and the way it works as an ld preload that keeps itself preloaded, I'm guessing it stops itself having to worry about finding its own libraries correctly. I just added a package override for sqlite3-native which wasn't a big deal. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] gst-plugins-good: make pulseaudio support dependent on DISTRO_FEATURES
This should be no change to the previous situation unless you
explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED
(currently).
Signed-off-by: Paul Eggleton
---
.../gstreamer/gst-plugins-good_0.10.31.bb |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
index 641de7c..b845371 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -5,9 +5,13 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f
\
file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
+PR = "r6"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio',
'pulseaudio', '', d)}"
+PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
+
DEPENDS += "gst-plugins-base gconf cairo jpeg libpng zlib libid3tag flac \
- speex libsoup-2.4 pulseaudio"
-PR = "r5"
+speex libsoup-2.4"
inherit gettext gconf
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] jpeg-native: Do not use libtool-cross for native recipe
On Tue, 2012-09-25 at 06:27 -0700, Khem Raj wrote: > On Tue, Sep 25, 2012 at 1:14 AM, Richard Purdie > wrote: > > This wallpapers over cracks. Why is libtool-native/libtool-cross broken? > > Shouldn't we fix whatever is breaking libtool? > > > > it is not broken. But we were ending up using cross-libtool for native > recipe that does not seem right. Looking at your original error message, it says: /work/yocto/poky/build/tmp/sysroots/x86_64-linux/usr/bin/x86_64-linux-libtool which is libtool-native. I appreciate that the OEMAKE line to use the cross version is wrong but it looks like it still manages to find the native libtool and that it isn't working. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Added explicit network error status in SanityCheckFailed event
If we fail a network test, a special flag is set in the SanityChekFailed
event. This helps Hob identify the network error properly and display
a special message to the user.
[YOCTO #3025]
Signed-off-by: Bogdan Marinescu
---
meta/classes/sanity.bbclass | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 385d733..86b8003 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -4,9 +4,12 @@
SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar gzip gawk
chrpath wget cpio"
-def raise_sanity_error(msg, d):
+def raise_sanity_error(msg, d, network_error=False):
if d.getVar("SANITY_USE_EVENTS", True) == "1":
-bb.event.fire(bb.event.SanityCheckFailed(msg), d)
+try:
+bb.event.fire(bb.event.SanityCheckFailed(msg, network_error), d)
+except TypeError:
+bb.event.fire(bb.event.SanityCheckFailed(msg), d)
return
bb.fatal(""" OE-core's config sanity checker detected a potential
misconfiguration.
@@ -119,8 +122,9 @@ def check_sanity_tmpdir_change(tmpdir, data):
# Check that TMPDIR isn't on a filesystem with limited filename length
(eg. eCryptFS)
testmsg = check_create_long_filename(tmpdir, "TMPDIR")
# Check that we can fetch from various network transports
+errmsg = check_connectivity(data)
testmsg = testmsg + check_connectivity(data)
-return testmsg
+return testmsg, errmsg == ""
def check_sanity_version_change(data):
# Sanity checks to be done when SANITY_VERSION changes
@@ -475,16 +479,18 @@ def check_sanity(sanity_data):
last_sstate_dir = line.split()[1]
sanity_version = int(sanity_data.getVar('SANITY_VERSION', True) or 1)
+network_error = False
if last_sanity_version < sanity_version:
messages = messages + check_sanity_version_change(sanity_data)
-messages = messages + check_sanity_tmpdir_change(tmpdir, sanity_data)
+err, network_error = check_sanity_tmpdir_change(tmpdir, sanity_data)
+messages = messages + err
messages = messages + check_sanity_sstate_dir_change(sstate_dir,
sanity_data)
else:
if last_tmpdir != tmpdir:
-messages = messages + check_sanity_tmpdir_change(tmpdir,
sanity_data)
+err, network_error = check_sanity_tmpdir_change(tmpdir,
sanity_data)
+messages = messages + err
if last_sstate_dir != sstate_dir:
messages = messages + check_sanity_sstate_dir_change(sstate_dir,
sanity_data)
-
if os.path.exists("conf") and not messages:
f = file(sanityverfile, 'w')
f.write("SANITY_VERSION %s\n" % sanity_version)
@@ -555,7 +561,7 @@ def check_sanity(sanity_data):
messages = messages + "Error, you have a space in your COREBASE
directory path. Please move the installation to a directory which doesn't
include a space."
if messages != "":
-raise_sanity_error(sanity_data.expand(messages), sanity_data)
+raise_sanity_error(sanity_data.expand(messages), sanity_data,
network_error)
# Create a copy of the datastore and finalise it to ensure appends and
# overrides are set - the datastore has yet to be finalised at ConfigParsed
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] linux-yocto: drop machine from SRCREV_FORMAT
On Tue, Sep 25, 2012 at 01:46:28PM +0100, Richard Purdie wrote:
> On Tue, 2012-09-25 at 14:36 +0200, Martin Jansa wrote:
> > On Tue, Sep 25, 2012 at 01:25:33PM +0100, Richard Purdie wrote:
> > > On Tue, 2012-09-25 at 12:51 +0200, Martin Jansa wrote:
> > > > * otherwise LOCALCOUNT is incremented after each MACHINE switch when
> > > > machine usually has different SRCREV (e.g. because of different
> > > > KBRANCH)
> > > > * see
> > > > http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/029392.html
> > > >
> > > > Signed-off-by: Martin Jansa
> > > > ---
> > > > meta/recipes-kernel/linux/linux-yocto.inc | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/meta/recipes-kernel/linux/linux-yocto.inc
> > > > b/meta/recipes-kernel/linux/linux-yocto.inc
> > > > index 973970d..6efb578 100644
> > > > --- a/meta/recipes-kernel/linux/linux-yocto.inc
> > > > +++ b/meta/recipes-kernel/linux/linux-yocto.inc
> > > > @@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE ?= "standard"
> > > > # KMETA ?= ""
> > > > KBRANCH ?= "master"
> > > > KMACHINE ?= "${MACHINE}"
> > > > -SRCREV_FORMAT ?= "meta_machine"
> > > > +SRCREV_FORMAT ?= "meta"
> > > >
> > > > LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
> > >
> > > No, absolutely not. I have discussed this with Bruce before and there
> > > are no guarantees that the meta branch gets updated whenever machine
> > > changes. This is necessary to have deterministic builds and correctness
> > > of sstate for example.
> >
> > Isn't SRCREV_FORMAT used only to construct PV? So builds are still
> > deterministic because SRCREV is still locked to same value?
>
> PV is what triggers the system to rebuild. So if its not included,
> rebuilds won't happen when the revisions change.
PR bump too and also sstate checksum change when OEBasicHash is enabled, right?
> > Also PV which keeps changing without any change in source or metadata
> > doesn't look deterministic to me.
>
> I agree there is a problem, this is just not the right way to fix it,
> the problem is elsewhere, likely in the git fetcher. Making the
> revisions in the sqlite database respect components of STAMP/WORKDIR is
> probably the way we'll end up having to fix this (so some database
> entries are machine specific, some arch specific, some allarch).
I still don't get your point in this case, see bellow:
Build core-image-minimal
bitbake -k core-image-minimal
...
NOTE: Tasks Summary: Attempted 1489 tasks of which 1242 didn't need to be rerun
and all succeeded.
Apply:
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 2f8f957..3380688 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -7,7 +7,7 @@ SRCREV_machine_qemuarm ?=
"8f05f1d8adbf1551a80225049dd381ffbb64a6c5"
SRCREV_machine_qemumips ?= "fb23a2ed7b94548b1736fdb55efb26f88bc5c171"
SRCREV_machine_qemuppc ?= "cdecf5940d81330680ce1517a7bc101556792e71"
SRCREV_machine_qemux86 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
-SRCREV_machine_qemux86-64 ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
+SRCREV_machine_qemux86-64 ?= "00709f7f01c3a10252f030f0bdacecbb349d7be4"
SRCREV_machine ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
SRCREV_meta ?= "8bdc655034a58a7147176a8a882d81e2fd51e4b9"
and indeed linux-yocto is rebuilt:
bitbake -k core-image-minimal
...
NOTE: recipe
linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3: task
do_fetch: Started
NOTE: recipe
linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3: task
do_fetch: Succeeded
...
NOTE: Tasks Summary: Attempted 1489 tasks of which 1456 didn't need to be rerun
and all succeeded.
Because do_validate_branches checksum is different:
$ bitbake-diffsigs \
stamps.1348666953/qemux86-64/qemux86_64-oe-linux/linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3.do_validate_branches.sigdata.8de0c7968171d72ceef34c16693adcdc
stamps.1348667138/qemux86-64/qemux86_64-oe-linux/linux-yocto-3.4.11+git3+5bdc655034a58a7147176a8a882d81e2fd51e4b9-r4.3.do_validate_branches.sigdata.91568475cd863438643fffa047e66e3e
basehash changed from 7cbacf9af68c92988dbf5e23fc57dafc to
aa3c320a8a79614aadf94084c06fe9ba
Variable SRCREV_machine value changed from
00709f7f01c3a10252f030f0bdacecbb349d7be4 to
3fa06aa29078fdb2af431de2d3fdae7d281ba85f
So it _does_ trigger rebuild when SRCREV_machine is changed (even without it in
SRCREV_FORMAT).
And if every SRCREV_machine change is accompanied with PR bump or with PR
service it will
also increment pkg version for target to upgrade it.
Cheers,
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-configure-cross: factor out --enable-threads argument into ${GCCTHREADS}
On Wed, 2012-09-26 at 11:28 +0100, Phil Blundell wrote: > On Wed, 2012-09-26 at 12:01 +0200, Martin Jansa wrote: > > Sorry I haven't noticed that it's the same value as before. > > > > But if it causes different sstate checksum than PR bump would be nice to > > get new > > builddir (well maybe not needed after > > f15f61af77cc4e52a037f509f8e49e1ea530cf35). > > OK. In that case I'll leave the patch alone for now and see if Richard > will swallow it as it stands. I've merged it, lets see how that previous commit stands up to this test. I did change it to ?=, not that it matters a great deal. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gstreamer: make pulseaudio support dependent on DISTRO_FEATURES
On Wednesday 26 September 2012 15:30:13 Martin Jansa wrote: > On Wed, Sep 26, 2012 at 02:24:07PM +0100, Paul Eggleton wrote: > > On Wednesday 26 September 2012 14:32:57 Martin Jansa wrote: > > > On Wed, Sep 26, 2012 at 01:31:10PM +0100, Paul Eggleton wrote: > > > > On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote: > > > > > On Wed, Sep 26, 2012 at 12:34:05PM +0100, Paul Eggleton wrote: > > > > > > This should be no change to the previous situation unless you > > > > > > explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED > > > > > > (currently). > > > > > > > > > > Why not use PACKAGECONFIG for this? > > > > > > > > Only because I didn't see the need complicate it just to be able to > > > > configure it on a per-recipe basis - you almost certainly want > > > > pulseaudio > > > > either on or off everywhere. If you want it for stylistic reasons, > > > > sure, > > > > I guess... it is a bit ugly though. > > > > > > Well it looked to me like ideal use-case for PACKAGECONFIG. > > > > It does encapsulate the DEPENDS and EXTRA_OECONF into one piece, yes, but > > then when you make the PACKAGECONFIG option set from DISTRO_FEATURES > > anyway it gets ugly, and here I'm not convinced it adds anything useful. > > Yes, but that's the case for almost every other PACKAGECONFIG use in > oe-core too AFAIK and I was asked to convert similar commit to use > PACKAGECONFIG before so I was expecting that the ultimate goal is to > replace all such DISTRO_FEATURE tests with PACKAGECONFIG where possible, > not to add more of them. Perhaps. Well, I just noticed I need to correct the commit message anyway (it's a change to gst-plugins-good, not gstreamer) so given that I'll send a v2 using PACKAGECONFIG. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gdk-pixbuf: Use qemu to run postinsts in offline root mode
On Wed, Sep 26, 2012 at 2:28 PM, Phil Blundell wrote: > On Wed, 2012-09-26 at 14:23 +0200, Martin Jansa wrote: >> On Wed, Sep 26, 2012 at 01:11:44PM +0100, Phil Blundell wrote: >> > This makes it possible to use gdk-pixbuf on a read-only rootfs. >> >> Isn't this issue resolved in "[RFC 0/7] Postinstall improvements" too? Investigations are still pending since I saw unexplainable effects on my standard image. Andreas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sstate: Remove master manifest usage
This was added to allow detection of duplicate files being installed by sstate.
There is a much simpler way, just check if the file already exists. This
effectively uses the kernel VFS as the cache which is much more efficient.
This resolves a significant performance bottleneck (lock contention on a
single file) when running builds that are just being generated from sstate
cache files.
Signed-off-by: Richard Purdie
---
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 0037ce5..6878e1a 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -3,7 +3,6 @@ SSTATE_VERSION = "2"
SSTATE_MANIFESTS ?= "${TMPDIR}/sstate-control"
SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-"
SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}"
-SSTATE_MASTERMANIFEST = "${SSTATE_MANIFESTS}/master.list"
def generate_sstatefn(spec, hash, d):
if not hash:
@@ -142,17 +141,11 @@ def sstate_install(ss, d):
dstdir = dstdir + "/"
shareddirs.append(dstdir)
-# Check the file list for conflicts against the master manifest
-mastermanifest = d.getVar("SSTATE_MASTERMANIFEST", True)
+# Check the file list for conflicts against files which already exist
whitelist = (d.getVar("SSTATE_DUPWHITELIST", True) or "").split()
-lock = bb.utils.lockfile(mastermanifest + ".lock")
-if not os.path.exists(mastermanifest):
-open(mastermanifest, "w").close()
-fileslist = [line.strip() for line in open(mastermanifest)]
-bb.utils.unlockfile(lock)
match = []
for f in sharedfiles:
-if f in fileslist:
+if os.path.exists(f):
realmatch = True
for w in whitelist:
if f.startswith(w):
@@ -163,14 +156,10 @@ def sstate_install(ss, d):
if match:
bb.warn("The recipe is trying to install files into a shared area when
those files already exist. Those files are:\n %s" % "\n ".join(match))
-# Write out the manifest and add to the task's manifest file
-lock = bb.utils.lockfile(mastermanifest + ".lock")
-mf = open(mastermanifest, "a")
+# Write out the manifest
f = open(manifest, "w")
for file in sharedfiles:
-mf.write(file + "\n")
f.write(file + "\n")
-bb.utils.unlockfile(lock)
# We want to ensure that directories appear at the end of the manifest
# so that when we test to see if they should be deleted any contents
@@ -301,20 +290,6 @@ def sstate_clean_manifest(manifest, d):
except OSError:
pass
-# Remove the entries from the master manifest
-mastermanifest = d.getVar("SSTATE_MASTERMANIFEST", True)
-lock = bb.utils.lockfile(mastermanifest + ".lock")
-if not os.path.exists(mastermanifest):
-open(mastermanifest, "w").close()
-mf = open(mastermanifest + ".new", "w")
-for line in open(mastermanifest, "r"):
-if not line or line in entries:
-continue
-mf.write(line)
-mf.close()
-os.rename(mastermanifest + ".new", mastermanifest)
-bb.utils.unlockfile(lock)
-
oe.path.remove(manifest)
def sstate_clean(ss, d):
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gstreamer: make pulseaudio support dependent on DISTRO_FEATURES
On Wed, Sep 26, 2012 at 02:24:07PM +0100, Paul Eggleton wrote: > On Wednesday 26 September 2012 14:32:57 Martin Jansa wrote: > > On Wed, Sep 26, 2012 at 01:31:10PM +0100, Paul Eggleton wrote: > > > On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote: > > > > On Wed, Sep 26, 2012 at 12:34:05PM +0100, Paul Eggleton wrote: > > > > > This should be no change to the previous situation unless you > > > > > explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED > > > > > (currently). > > > > > > > > Why not use PACKAGECONFIG for this? > > > > > > Only because I didn't see the need complicate it just to be able to > > > configure it on a per-recipe basis - you almost certainly want pulseaudio > > > either on or off everywhere. If you want it for stylistic reasons, sure, > > > I guess... it is a bit ugly though. > > > > Well it looked to me like ideal use-case for PACKAGECONFIG. > > It does encapsulate the DEPENDS and EXTRA_OECONF into one piece, yes, but > then > when you make the PACKAGECONFIG option set from DISTRO_FEATURES anyway it > gets > ugly, and here I'm not convinced it adds anything useful. Yes, but that's the case for almost every other PACKAGECONFIG use in oe-core too AFAIK and I was asked to convert similar commit to use PACKAGECONFIG before so I was expecting that the ultimate goal is to replace all such DISTRO_FEATURE tests with PACKAGECONFIG where possible, not to add more of them. Cheers, > FWIW, this also matches how the same configuration is implemented for Qt. If > we > want to switch everything over to PACKAGECONFIG later we can with no penalty. > > Cheers, > Paul > > -- > > Paul Eggleton > Intel Open Source Technology Centre -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gstreamer: make pulseaudio support dependent on DISTRO_FEATURES
On Wednesday 26 September 2012 14:32:57 Martin Jansa wrote: > On Wed, Sep 26, 2012 at 01:31:10PM +0100, Paul Eggleton wrote: > > On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote: > > > On Wed, Sep 26, 2012 at 12:34:05PM +0100, Paul Eggleton wrote: > > > > This should be no change to the previous situation unless you > > > > explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED > > > > (currently). > > > > > > Why not use PACKAGECONFIG for this? > > > > Only because I didn't see the need complicate it just to be able to > > configure it on a per-recipe basis - you almost certainly want pulseaudio > > either on or off everywhere. If you want it for stylistic reasons, sure, > > I guess... it is a bit ugly though. > > Well it looked to me like ideal use-case for PACKAGECONFIG. It does encapsulate the DEPENDS and EXTRA_OECONF into one piece, yes, but then when you make the PACKAGECONFIG option set from DISTRO_FEATURES anyway it gets ugly, and here I'm not convinced it adds anything useful. FWIW, this also matches how the same configuration is implemented for Qt. If we want to switch everything over to PACKAGECONFIG later we can with no penalty. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] glib-2.0: Update to 2.34.0
Signed-off-by: Phil Blundell
---
v2: now with correct SRC_URI checksums
.../60_wait-longer-for-threads-to-die.patch| 11 ---
meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34 +++-
.../{glib-2.0_2.32.4.bb => glib-2.0_2.34.0.bb} |6 ++--
3 files changed, 21 insertions(+), 30 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.32.4.bb => glib-2.0_2.34.0.bb}
(90%)
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
index 4ff7b80..67dfeca 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++
b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
@@ -7,17 +7,6 @@ Upstream-Status: Inappropriate [patches for test code]
diff -ruN glib-2.30.0-orig/tests/threadpool-test.c
glib-2.30.0/tests/threadpool-test.c
--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.0
+0800
+++ glib-2.30.0/tests/threadpool-test.c2010-11-16 12:28:09.002172678
+0800
-@@ -5,8 +5,8 @@
-
- #include
-
--#define DEBUG_MSG(x)
--/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
-+/* #define DEBUG_MSG(x) */
-+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
-
- #define WAIT5/* seconds */
- #define MAX_THREADS 10
@@ -130,10 +130,10 @@
test_count_threads () == 0)
break;
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
index 1e65643..f5b8384 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
@@ -5,21 +5,23 @@ Upstream-Status: Inappropriate [configuration]
RP 2012/2/25
-Index: glib-2.30.2/configure.ac
-===
glib-2.30.2.orig/configure.ac 2012-02-25 14:50:07.444242397 +
-+++ glib-2.30.2/configure.ac 2012-02-25 14:51:28.096240485 +
-@@ -3769,10 +3769,9 @@
- # Check for libdbus1 - Optional - is only used in the GDBus test cases
+--- glib-2.34.0/configure.ac~ 2012-09-25 12:06:14.383311239 +0100
glib-2.34.0/configure.ac 2012-09-25 12:07:28.584958144 +0100
+@@ -3500,10 +3500,13 @@
#
# 1.2.14 required for dbus_message_set_serial
--PKG_CHECK_MODULES(DBUS1,
-- dbus-1 >= 1.2.14,
-- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available])
have_dbus1=yes],
-- have_dbus1=no)
-+DBUS1_CFLAGS=
-+DBUS1_LIBS=
-+$have_dbus1=no
- AC_SUBST(DBUS1_CFLAGS)
- AC_SUBST(DBUS1_LIBS)
- AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
+ AS_IF([ test x$enable_modular_tests = xyes], [
+- PKG_CHECK_MODULES(DBUS1,
+- dbus-1 >= 1.2.14,
+- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
available]) have_dbus1=yes],
+- have_dbus1=no)
++# PKG_CHECK_MODULES(DBUS1,
++# dbus-1 >= 1.2.14,
++# [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
available]) have_dbus1=yes],
++# have_dbus1=no)
++ DBUS1_CFLAGS=
++ DBUS1_LIBS=
++ have_dbus1=no
+AC_SUBST(DBUS1_CFLAGS)
+AC_SUBST(DBUS1_LIBS)
+ ])
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
b/meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
similarity index 90%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
index 10c0b61..85d093e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r6"
+PR = "r0"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
@@ -16,8 +16,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz
\
file://nodbus.patch \
file://nolibelf.patch \
"
-SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a"
-SRC_URI[sha256sum] =
"a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2"
+SRC_URI[md5sum] = "d80aef668f981b5dcf157633d13081c0"
+SRC_URI[sha256sum] =
"f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144"
SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
BBCLASSEXTEND = "native nativesdk"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glib-2.0: Update to 2.34.0
On Wed, 2012-09-26 at 13:28 +0100, Phil Blundell wrote: > SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a" > SRC_URI[sha256sum] = > "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2" Hm, it does look slightly suspicious that this didn't change. I guess something must have gone wrong when I rebased the patch. I'll sort that out and send a new one. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gdk-pixbuf: Use qemu to run postinsts in offline root mode
On Wed, Sep 26, 2012 at 01:11:44PM +0100, Phil Blundell wrote:
> This makes it possible to use gdk-pixbuf on a read-only rootfs.
Isn't this issue resolved in "[RFC 0/7] Postinstall improvements" too?
Cheers,
> Signed-off-by: Phil Blundell
> ---
> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 19 ---
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> index 82a7eaa..df35b8d 100644
> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
>
> SECTION = "libs"
>
> -DEPENDS = "libpng glib-2.0 jpeg"
> +DEPENDS = "libpng glib-2.0 jpeg qemu-native"
> DEPENDS_append_linuxstdbase = " virtual/libx11"
>
> SRC_URI =
> "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.xz
> \
> @@ -21,9 +21,9 @@ SRC_URI =
> "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
> SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
> SRC_URI[sha256sum] =
> "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
>
> -PR = "r7"
> +PR = "r8"
>
> -inherit autotools pkgconfig gettext
> +inherit autotools pkgconfig gettext qemu
>
> LIBV = "2.10.0"
>
> @@ -41,26 +41,31 @@ PACKAGES =+ "${PN}-xlib"
> FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
> ALLOW_EMPTY_${PN}-xlib = "1"
>
> +loadersdir = "${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders"
> +
> FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
> ${libdir}/lib*.so.*"
>
> FILES_${PN}-dev += " \
> ${bindir}/gdk-pixbuf-csource \
> ${includedir}/* \
> - ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \
> + ${loadersdir}/*.la \
> "
>
> FILES_${PN}-dbg += " \
> ${libdir}/.debug/* \
> - ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \
> + ${loadersdir}/.debug/* \
> "
>
> postinst_pixbufloader () {
> if [ "x$D" != "x" ]; then
> -exit 1
> + if [ ! -f "$D${loadersdir}/../loaders.cache" ]; then
> + ${@qemu_target_binary(d)} -drop-ld-preload -L $D
> $D${bindir}/gdk-pixbuf-query-loaders > "$D${loadersdir}/../loaders.cache"
> + fi
> + exit 0
> fi
>
> -GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders
> gdk-pixbuf-query-loaders --update-cache
> +GDK_PIXBUF_MODULEDIR="${loadersdir}" gdk-pixbuf-query-loaders --update-cache
>
> if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
> for icondir in /usr/share/icons/*; do
> --
> 1.7.10.4
>
>
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/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.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gstreamer: make pulseaudio support dependent on DISTRO_FEATURES
On Wed, Sep 26, 2012 at 01:31:10PM +0100, Paul Eggleton wrote: > On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote: > > On Wed, Sep 26, 2012 at 12:34:05PM +0100, Paul Eggleton wrote: > > > This should be no change to the previous situation unless you > > > explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED > > > (currently). > > > > Why not use PACKAGECONFIG for this? > > Only because I didn't see the need complicate it just to be able to configure > it on a per-recipe basis - you almost certainly want pulseaudio either on or > off everywhere. If you want it for stylistic reasons, sure, I guess... it is > a > bit ugly though. Well it looked to me like ideal use-case for PACKAGECONFIG. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gdk-pixbuf: Use qemu to run postinsts in offline root mode
On Wed, 2012-09-26 at 14:23 +0200, Martin Jansa wrote: > On Wed, Sep 26, 2012 at 01:11:44PM +0100, Phil Blundell wrote: > > This makes it possible to use gdk-pixbuf on a read-only rootfs. > > Isn't this issue resolved in "[RFC 0/7] Postinstall improvements" too? Ah, possibly. I haven't really been following that thread. I'll take a look. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gstreamer: make pulseaudio support dependent on DISTRO_FEATURES
On Wednesday 26 September 2012 13:38:19 Martin Jansa wrote: > On Wed, Sep 26, 2012 at 12:34:05PM +0100, Paul Eggleton wrote: > > This should be no change to the previous situation unless you > > explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED > > (currently). > > Why not use PACKAGECONFIG for this? Only because I didn't see the need complicate it just to be able to configure it on a per-recipe basis - you almost certainly want pulseaudio either on or off everywhere. If you want it for stylistic reasons, sure, I guess... it is a bit ugly though. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glib-2.0: Update to 2.34.0
On Wed, 2012-09-26 at 14:20 +0200, Martin Jansa wrote:
> On Wed, Sep 26, 2012 at 01:17:21PM +0100, Phil Blundell wrote:
> > Signed-off-by: Phil Blundell
> > ---
> > .../60_wait-longer-for-threads-to-die.patch| 11 -
> > meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34
> > meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 43
> >
> > meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb | 43
> >
> > 4 files changed, 61 insertions(+), 70 deletions(-)
> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
> > create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
>
> Can you please resend with -M?
As you wish:
>From 2f3362045e6084e1a30602918c062ed8ab45 Mon Sep 17 00:00:00 2001
From: Phil Blundell
Date: Wed, 26 Sep 2012 13:15:07 +0100
Subject: [PATCH] glib-2.0: Update to 2.34.0
Signed-off-by: Phil Blundell
---
.../60_wait-longer-for-threads-to-die.patch| 11 ---
meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34 +++-
.../{glib-2.0_2.32.4.bb => glib-2.0_2.34.0.bb} |4 +--
3 files changed, 20 insertions(+), 29 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.32.4.bb => glib-2.0_2.34.0.bb}
(99%)
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
index 4ff7b80..67dfeca 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++
b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
@@ -7,17 +7,6 @@ Upstream-Status: Inappropriate [patches for test code]
diff -ruN glib-2.30.0-orig/tests/threadpool-test.c
glib-2.30.0/tests/threadpool-test.c
--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.0
+0800
+++ glib-2.30.0/tests/threadpool-test.c2010-11-16 12:28:09.002172678
+0800
-@@ -5,8 +5,8 @@
-
- #include
-
--#define DEBUG_MSG(x)
--/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
-+/* #define DEBUG_MSG(x) */
-+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
-
- #define WAIT5/* seconds */
- #define MAX_THREADS 10
@@ -130,10 +130,10 @@
test_count_threads () == 0)
break;
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
index 1e65643..f5b8384 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
@@ -5,21 +5,23 @@ Upstream-Status: Inappropriate [configuration]
RP 2012/2/25
-Index: glib-2.30.2/configure.ac
-===
glib-2.30.2.orig/configure.ac 2012-02-25 14:50:07.444242397 +
-+++ glib-2.30.2/configure.ac 2012-02-25 14:51:28.096240485 +
-@@ -3769,10 +3769,9 @@
- # Check for libdbus1 - Optional - is only used in the GDBus test cases
+--- glib-2.34.0/configure.ac~ 2012-09-25 12:06:14.383311239 +0100
glib-2.34.0/configure.ac 2012-09-25 12:07:28.584958144 +0100
+@@ -3500,10 +3500,13 @@
#
# 1.2.14 required for dbus_message_set_serial
--PKG_CHECK_MODULES(DBUS1,
-- dbus-1 >= 1.2.14,
-- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available])
have_dbus1=yes],
-- have_dbus1=no)
-+DBUS1_CFLAGS=
-+DBUS1_LIBS=
-+$have_dbus1=no
- AC_SUBST(DBUS1_CFLAGS)
- AC_SUBST(DBUS1_LIBS)
- AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
+ AS_IF([ test x$enable_modular_tests = xyes], [
+- PKG_CHECK_MODULES(DBUS1,
+- dbus-1 >= 1.2.14,
+- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
available]) have_dbus1=yes],
+- have_dbus1=no)
++# PKG_CHECK_MODULES(DBUS1,
++# dbus-1 >= 1.2.14,
++# [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
available]) have_dbus1=yes],
++# have_dbus1=no)
++ DBUS1_CFLAGS=
++ DBUS1_LIBS=
++ have_dbus1=no
+AC_SUBST(DBUS1_CFLAGS)
+AC_SUBST(DBUS1_LIBS)
+ ])
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
b/meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
similarity index 99%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
index 10c0b61..f4e3682 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r6"
+PR = "r0"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
@@ -13,8 +13,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz
\
file://configure-libtool.patch \
file://60_wait-longer-for-threads-to-die.patch \
file://glib-2.0_fix_for_x32.patch \
- file://nodbus.patch \
file:/
Re: [OE-core] [PATCH] glib-2.0: Update to 2.34.0
On Wed, Sep 26, 2012 at 01:17:21PM +0100, Phil Blundell wrote:
> Signed-off-by: Phil Blundell
> ---
> .../60_wait-longer-for-threads-to-die.patch| 11 -
> meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34
> meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 43
>
> meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb | 43
>
> 4 files changed, 61 insertions(+), 70 deletions(-)
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
Can you please resend with -M?
Thanks
>
> diff --git
> a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> index 4ff7b80..67dfeca 100644
> ---
> a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> +++
> b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
> @@ -7,17 +7,6 @@ Upstream-Status: Inappropriate [patches for test code]
> diff -ruN glib-2.30.0-orig/tests/threadpool-test.c
> glib-2.30.0/tests/threadpool-test.c
> --- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.0
> +0800
> +++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678
> +0800
> -@@ -5,8 +5,8 @@
> -
> - #include
> -
> --#define DEBUG_MSG(x)
> --/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
> -+/* #define DEBUG_MSG(x) */
> -+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
> -
> - #define WAIT5/* seconds */
> - #define MAX_THREADS 10
> @@ -130,10 +130,10 @@
> test_count_threads () == 0)
>break;
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
> b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
> index 1e65643..f5b8384 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
> @@ -5,21 +5,23 @@ Upstream-Status: Inappropriate [configuration]
>
> RP 2012/2/25
>
> -Index: glib-2.30.2/configure.ac
> -===
> glib-2.30.2.orig/configure.ac2012-02-25 14:50:07.444242397 +
> -+++ glib-2.30.2/configure.ac 2012-02-25 14:51:28.096240485 +
> -@@ -3769,10 +3769,9 @@
> - # Check for libdbus1 - Optional - is only used in the GDBus test cases
> +--- glib-2.34.0/configure.ac~2012-09-25 12:06:14.383311239 +0100
> glib-2.34.0/configure.ac 2012-09-25 12:07:28.584958144 +0100
> +@@ -3500,10 +3500,13 @@
> #
> # 1.2.14 required for dbus_message_set_serial
> --PKG_CHECK_MODULES(DBUS1,
> -- dbus-1 >= 1.2.14,
> -- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
> available]) have_dbus1=yes],
> -- have_dbus1=no)
> -+DBUS1_CFLAGS=
> -+DBUS1_LIBS=
> -+$have_dbus1=no
> - AC_SUBST(DBUS1_CFLAGS)
> - AC_SUBST(DBUS1_LIBS)
> - AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
> + AS_IF([ test x$enable_modular_tests = xyes], [
> +- PKG_CHECK_MODULES(DBUS1,
> +- dbus-1 >= 1.2.14,
> +- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
> available]) have_dbus1=yes],
> +- have_dbus1=no)
> ++# PKG_CHECK_MODULES(DBUS1,
> ++# dbus-1 >= 1.2.14,
> ++# [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
> available]) have_dbus1=yes],
> ++# have_dbus1=no)
> ++ DBUS1_CFLAGS=
> ++ DBUS1_LIBS=
> ++ have_dbus1=no
> +AC_SUBST(DBUS1_CFLAGS)
> +AC_SUBST(DBUS1_LIBS)
> + ])
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
> b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
> deleted file mode 100644
> index 10c0b61..000
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -require glib.inc
> -
> -PR = "r6"
> -PE = "1"
> -
> -DEPENDS += "libffi python-argparse-native zlib"
> -DEPENDS_virtclass-native += "libffi-native python-argparse-native"
> -DEPENDS_virtclass-nativesdk += "nativesdk-libffi python-argparse-native
> nativesdk-zlib ${BPN}-native"
> -
> -SHRT_VER =
> "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
> -
> -SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> - file://configure-libtool.patch \
> - file://60_wait-longer-for-threads-to-die.patch \
> - file://glib-2.0_fix_for_x32.patch \
> - file://nodbus.patch \
> - file://nolibelf.patch \
> - "
> -SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a"
> -SRC_URI[sha256sum] =
> "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2"
> -
> -SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
> -BBCLASSEXTEND = "native nativesdk"
> -
> -do_configure_prepend() {
> - sed -i -e "s:TEST_PROGS +=
[OE-core] [PATCH] gdk-pixbuf: Use qemu to run postinsts in offline root mode
This makes it possible to use gdk-pixbuf on a read-only rootfs.
Signed-off-by: Phil Blundell
---
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index 82a7eaa..df35b8d 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
SECTION = "libs"
-DEPENDS = "libpng glib-2.0 jpeg"
+DEPENDS = "libpng glib-2.0 jpeg qemu-native"
DEPENDS_append_linuxstdbase = " virtual/libx11"
SRC_URI =
"http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.xz
\
@@ -21,9 +21,9 @@ SRC_URI =
"http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
SRC_URI[sha256sum] =
"da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
-PR = "r7"
+PR = "r8"
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext qemu
LIBV = "2.10.0"
@@ -41,26 +41,31 @@ PACKAGES =+ "${PN}-xlib"
FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
ALLOW_EMPTY_${PN}-xlib = "1"
+loadersdir = "${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders"
+
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
${libdir}/lib*.so.*"
FILES_${PN}-dev += " \
${bindir}/gdk-pixbuf-csource \
${includedir}/* \
- ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \
+ ${loadersdir}/*.la \
"
FILES_${PN}-dbg += " \
${libdir}/.debug/* \
- ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \
+ ${loadersdir}/.debug/* \
"
postinst_pixbufloader () {
if [ "x$D" != "x" ]; then
-exit 1
+ if [ ! -f "$D${loadersdir}/../loaders.cache" ]; then
+ ${@qemu_target_binary(d)} -drop-ld-preload -L $D
$D${bindir}/gdk-pixbuf-query-loaders > "$D${loadersdir}/../loaders.cache"
+ fi
+ exit 0
fi
-GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders
gdk-pixbuf-query-loaders --update-cache
+GDK_PIXBUF_MODULEDIR="${loadersdir}" gdk-pixbuf-query-loaders --update-cache
if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
for icondir in /usr/share/icons/*; do
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-2.0: Update to 2.34.0
Signed-off-by: Phil Blundell
---
.../60_wait-longer-for-threads-to-die.patch| 11 -
meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34
meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 43
meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb | 43
4 files changed, 61 insertions(+), 70 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
diff --git
a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
index 4ff7b80..67dfeca 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++
b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
@@ -7,17 +7,6 @@ Upstream-Status: Inappropriate [patches for test code]
diff -ruN glib-2.30.0-orig/tests/threadpool-test.c
glib-2.30.0/tests/threadpool-test.c
--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.0
+0800
+++ glib-2.30.0/tests/threadpool-test.c2010-11-16 12:28:09.002172678
+0800
-@@ -5,8 +5,8 @@
-
- #include
-
--#define DEBUG_MSG(x)
--/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
-+/* #define DEBUG_MSG(x) */
-+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
-
- #define WAIT5/* seconds */
- #define MAX_THREADS 10
@@ -130,10 +130,10 @@
test_count_threads () == 0)
break;
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
index 1e65643..f5b8384 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch
@@ -5,21 +5,23 @@ Upstream-Status: Inappropriate [configuration]
RP 2012/2/25
-Index: glib-2.30.2/configure.ac
-===
glib-2.30.2.orig/configure.ac 2012-02-25 14:50:07.444242397 +
-+++ glib-2.30.2/configure.ac 2012-02-25 14:51:28.096240485 +
-@@ -3769,10 +3769,9 @@
- # Check for libdbus1 - Optional - is only used in the GDBus test cases
+--- glib-2.34.0/configure.ac~ 2012-09-25 12:06:14.383311239 +0100
glib-2.34.0/configure.ac 2012-09-25 12:07:28.584958144 +0100
+@@ -3500,10 +3500,13 @@
#
# 1.2.14 required for dbus_message_set_serial
--PKG_CHECK_MODULES(DBUS1,
-- dbus-1 >= 1.2.14,
-- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available])
have_dbus1=yes],
-- have_dbus1=no)
-+DBUS1_CFLAGS=
-+DBUS1_LIBS=
-+$have_dbus1=no
- AC_SUBST(DBUS1_CFLAGS)
- AC_SUBST(DBUS1_LIBS)
- AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
+ AS_IF([ test x$enable_modular_tests = xyes], [
+- PKG_CHECK_MODULES(DBUS1,
+- dbus-1 >= 1.2.14,
+- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
available]) have_dbus1=yes],
+- have_dbus1=no)
++# PKG_CHECK_MODULES(DBUS1,
++# dbus-1 >= 1.2.14,
++# [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is
available]) have_dbus1=yes],
++# have_dbus1=no)
++ DBUS1_CFLAGS=
++ DBUS1_LIBS=
++ have_dbus1=no
+AC_SUBST(DBUS1_CFLAGS)
+AC_SUBST(DBUS1_LIBS)
+ ])
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
deleted file mode 100644
index 10c0b61..000
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-require glib.inc
-
-PR = "r6"
-PE = "1"
-
-DEPENDS += "libffi python-argparse-native zlib"
-DEPENDS_virtclass-native += "libffi-native python-argparse-native"
-DEPENDS_virtclass-nativesdk += "nativesdk-libffi python-argparse-native
nativesdk-zlib ${BPN}-native"
-
-SHRT_VER =
"${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
-
-SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
- file://configure-libtool.patch \
- file://60_wait-longer-for-threads-to-die.patch \
- file://glib-2.0_fix_for_x32.patch \
- file://nodbus.patch \
- file://nolibelf.patch \
- "
-SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a"
-SRC_URI[sha256sum] =
"a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2"
-
-SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
-BBCLASSEXTEND = "native nativesdk"
-
-do_configure_prepend() {
- sed -i -e "s:TEST_PROGS += gdbus-serialization::g"
${S}/gio/tests/Makefile.am
- sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,'
${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
-}
-
-do_install_append() {
- # remove some unpackaged files
- rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc
- rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo
- # and empty dirs
- rmdir ${D}${libd
Re: [OE-core] [PATCH] kernel.bbclass, module.bbclass: Make update-modules optional
On Wed, Sep 26, 2012 at 01:02:26PM +0100, Phil Blundell wrote:
> The update-modules mechanism is something of a historical relic and it isn't
> entirely clear that it has a great deal of value nowadays. Also, it causes a
What's replacement of this nowadays? IIRC without g_ether autoload I
don't get working usb networking on first boot, which sucks.
Cheers,
> problem when building a read-only rootfs since update-modules itself refuses
> to configure offline.
>
> Allow DISTROs to circumvent this whole thing by declaring (via
> DISTRO_FEATURES)
> that they don't wish to use update-modules. This is backfilled for existing
> distributions and will have to be marked as CONSIDERED by those who actually
> don't want it.
>
> Signed-off-by: Phil Blundell
> ---
> meta/classes/kernel.bbclass | 24
> meta/classes/module.bbclass |2 +-
> meta/conf/bitbake.conf |2 +-
> 3 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index fdef1be..d3af67c 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -398,10 +398,12 @@ python populate_packages_prepend () {
>
> dvar = d.getVar('PKGD', True)
>
> +use_update_modules = oe.utils.contains('DISTRO_FEATURES',
> 'update-modules', True, False, d)
> +
> # If autoloading is requested, output
> /etc/modules-load.d/.conf and append
> # appropriate modprobe commands to the postinst
> autoload = d.getVar('module_autoload_%s' % basename, True)
> -if autoload:
> +if autoload and use_update_modules:
> name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
> f = open(name, 'w')
> for m in autoload.split():
> @@ -415,15 +417,16 @@ python populate_packages_prepend () {
>
> # Write out any modconf fragment
> modconf = d.getVar('module_conf_%s' % basename, True)
> -if modconf:
> +if modconf and use_update_modules:
> name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
> f = open(name, 'w')
> f.write("%s\n" % modconf)
> f.close()
>
> -files = d.getVar('FILES_%s' % pkg, True)
> -files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" %
> (files, basename, basename)
> -d.setVar('FILES_%s' % pkg, files)
> +if use_update_modules:
> +files = d.getVar('FILES_%s' % pkg, True)
> +files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf"
> % (files, basename, basename)
> +d.setVar('FILES_%s' % pkg, files)
>
> if vals.has_key("description"):
> old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
> @@ -441,12 +444,17 @@ python populate_packages_prepend () {
> module_regex = '^(.*)\.k?o$'
> module_pattern = 'kernel-module-%s'
>
> -postinst = d.getVar('pkg_postinst_modules', True)
> -postrm = d.getVar('pkg_postrm_modules', True)
> +use_update_modules = oe.utils.contains('DISTRO_FEATURES',
> 'update-modules', True, False, d)
> +if use_update_modules:
> +postinst = d.getVar('pkg_postinst_modules', True)
> +postrm = d.getVar('pkg_postrm_modules', True)
> +else:
> +postinst = None
> +postrm = None
> do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$',
> output_pattern='kernel-firmware-%s', description='Firmware for %s',
> recursive=True, extra_depends='')
> do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$',
> output_pattern='kernel-firmware-%s', description='Firmware for %s',
> recursive=True, extra_depends='')
> do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$',
> output_pattern='kernel-firmware-%s', description='Firmware for %s',
> recursive=True, extra_depends='')
> -do_split_packages(d, root='/lib/modules', file_regex=module_regex,
> output_pattern=module_pattern, description='%s kernel module',
> postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata,
> extra_depends='update-modules kernel-%s' % d.getVar("KERNEL_VERSION", True))
> +do_split_packages(d, root='/lib/modules', file_regex=module_regex,
> output_pattern=module_pattern, description='%s kernel module',
> postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata,
> extra_depends='%skernel-%s' % (['', 'update-modules '][use_update_modules],
> d.getVar("KERNEL_VERSION", True)))
>
> # If modules-load.d and modprobe.d are empty at this point, remove them
> to
> # avoid warnings. removedirs only raises an OSError if an empty
> diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
> index c721202..e8d32eb 100644
> --- a/meta/classes/module.bbclass
> +++ b/meta/classes/module.bbclass
> @@ -1,4 +1,4 @@
> -RDEPENDS += "kernel-image update-modules"
> +RDEPENDS_${PN} += "kernel-image ${@oe.utils.contain
[OE-core] [PATCH] kernel.bbclass, module.bbclass: Make update-modules optional
The update-modules mechanism is something of a historical relic and it isn't
entirely clear that it has a great deal of value nowadays. Also, it causes a
problem when building a read-only rootfs since update-modules itself refuses
to configure offline.
Allow DISTROs to circumvent this whole thing by declaring (via DISTRO_FEATURES)
that they don't wish to use update-modules. This is backfilled for existing
distributions and will have to be marked as CONSIDERED by those who actually
don't want it.
Signed-off-by: Phil Blundell
---
meta/classes/kernel.bbclass | 24
meta/classes/module.bbclass |2 +-
meta/conf/bitbake.conf |2 +-
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index fdef1be..d3af67c 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -398,10 +398,12 @@ python populate_packages_prepend () {
dvar = d.getVar('PKGD', True)
+use_update_modules = oe.utils.contains('DISTRO_FEATURES',
'update-modules', True, False, d)
+
# If autoloading is requested, output /etc/modules-load.d/.conf
and append
# appropriate modprobe commands to the postinst
autoload = d.getVar('module_autoload_%s' % basename, True)
-if autoload:
+if autoload and use_update_modules:
name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
f = open(name, 'w')
for m in autoload.split():
@@ -415,15 +417,16 @@ python populate_packages_prepend () {
# Write out any modconf fragment
modconf = d.getVar('module_conf_%s' % basename, True)
-if modconf:
+if modconf and use_update_modules:
name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
f = open(name, 'w')
f.write("%s\n" % modconf)
f.close()
-files = d.getVar('FILES_%s' % pkg, True)
-files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" %
(files, basename, basename)
-d.setVar('FILES_%s' % pkg, files)
+if use_update_modules:
+files = d.getVar('FILES_%s' % pkg, True)
+files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" %
(files, basename, basename)
+d.setVar('FILES_%s' % pkg, files)
if vals.has_key("description"):
old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
@@ -441,12 +444,17 @@ python populate_packages_prepend () {
module_regex = '^(.*)\.k?o$'
module_pattern = 'kernel-module-%s'
-postinst = d.getVar('pkg_postinst_modules', True)
-postrm = d.getVar('pkg_postrm_modules', True)
+use_update_modules = oe.utils.contains('DISTRO_FEATURES',
'update-modules', True, False, d)
+if use_update_modules:
+postinst = d.getVar('pkg_postinst_modules', True)
+postrm = d.getVar('pkg_postrm_modules', True)
+else:
+postinst = None
+postrm = None
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$',
output_pattern='kernel-firmware-%s', description='Firmware for %s',
recursive=True, extra_depends='')
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$',
output_pattern='kernel-firmware-%s', description='Firmware for %s',
recursive=True, extra_depends='')
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$',
output_pattern='kernel-firmware-%s', description='Firmware for %s',
recursive=True, extra_depends='')
-do_split_packages(d, root='/lib/modules', file_regex=module_regex,
output_pattern=module_pattern, description='%s kernel module',
postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata,
extra_depends='update-modules kernel-%s' % d.getVar("KERNEL_VERSION", True))
+do_split_packages(d, root='/lib/modules', file_regex=module_regex,
output_pattern=module_pattern, description='%s kernel module',
postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata,
extra_depends='%skernel-%s' % (['', 'update-modules '][use_update_modules],
d.getVar("KERNEL_VERSION", True)))
# If modules-load.d and modprobe.d are empty at this point, remove them to
# avoid warnings. removedirs only raises an OSError if an empty
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index c721202..e8d32eb 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -1,4 +1,4 @@
-RDEPENDS += "kernel-image update-modules"
+RDEPENDS_${PN} += "kernel-image ${@oe.utils.contains('DISTRO_FEATURES',
'update-modules', 'update-modules', '', d)}"
DEPENDS += "virtual/kernel"
inherit module-base
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3496d2b..5196018 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -724,7 +724,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
[OE-core] [PATCH] package_ipk: Remove spurious '-i' in grep command for log_check
ipk_log_check uses a case-sensitive grep (which is correct) when deciding
whether there were any errors or not. But if it decides that there were, it
then uses a case-insensitive grep to display them. This results in a large
amount of irrelevant and confusing output which makes it hard to see the real
errors amongst the noise.
Suppress this by removing the unwanted -i.
Signed-off-by: Phil Blundell
---
meta/classes/package_ipk.bbclass |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index efe299e..59cb856 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -182,7 +182,7 @@ ipk_log_check() {
then
echo "log_check: There were error messages in the
logfile"
printf "log_check: Matched keyword: [$keyword_die]\n\n"
- echo "$lf_txt" | grep -v log_check | grep -C 5 -i
"$keyword_die"
+ echo "$lf_txt" | grep -v log_check | grep -C 5
"$keyword_die"
echo ""
do_exit=1
fi
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] packagedata/multilib: Fix search patch for multilib builds
The current multilib search path code for packagedata is flawed since it
doesn't correctly handle changes in the TARGET_VENDOR/TARGET_OS that
multilib may make. This patch enhances the code to correctly build the
search paths so multilib packagedata is found correctly.
Signed-off-by: Richard Purdie
---
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index b1a593e..73ccf3a 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -32,8 +32,6 @@ python multilib_virtclass_handler () {
e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant
,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
-if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is
None:
- e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant,
e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
}
diff --git a/meta/classes/multilib_global.bbclass
b/meta/classes/multilib_global.bbclass
index b76fd94..f55e3a2 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -2,6 +2,11 @@ python multilib_virtclass_handler_global () {
if not e.data:
return
+if isinstance(e, bb.event.RecipePreFinalise):
+for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
+if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False)
is None:
+ e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v,
e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
+
variant = e.data.getVar("BBEXTENDVARIANT", True)
if isinstance(e, bb.event.RecipeParsed) and not variant:
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index 5f897ff..ce92a7e 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -23,21 +23,39 @@ def read_pkgdatafile(fn):
return pkgdata
+def all_pkgdatadirs(d):
+archs = []
+tos = []
+tvs = []
+
+archs.append(d.getVar("PACKAGE_ARCHS", True).split())
+tos.append(d.getVar("TARGET_OS", True))
+tvs.append(d.getVar("TARGET_VENDOR", True))
+
+variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+for item in variants.split():
+localdata = bb.data.createCopy(d)
+overrides = localdata.getVar("OVERRIDES", False) +
":virtclass-multilib-" + item
+localdata.setVar("OVERRIDES", overrides)
+bb.data.update_data(localdata)
+
+archs.append(localdata.getVar("PACKAGE_ARCHS", True).split())
+tos.append(localdata.getVar("TARGET_OS", True))
+tvs.append(localdata.getVar("TARGET_VENDOR", True))
+
+dirs = []
+for i in range(len(archs)):
+for arch in archs[i]:
+dirs.append(arch + tvs[i] + "-" + tos[i] + "/runtime/")
+dirs.reverse()
+return dirs
+
def get_subpkgedata_fn(pkg, d):
-archs = d.expand("${PACKAGE_ARCHS}").split(" ")
-mlarchs = d.getVar("MULTILIB_PACKAGE_ARCHS", d) or None
+dirs = all_pkgdatadirs(d)
-if mlarchs:
-for mlarch in mlarchs.split(" "):
-if "_" in mlarch:
-prefix, split, new_arch = mlarch.partition("_")
-archs.append(new_arch)
-
-archs.reverse()
pkgdata = d.expand('${TMPDIR}/pkgdata/')
-targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
-for arch in archs:
-fn = pkgdata + arch + targetdir + pkg
+for dir in dirs:
+fn = pkgdata + dir + pkg
if os.path.exists(fn):
return fn
return d.expand('${PKGDATA_DIR}/runtime/%s' % pkg)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] sstate: Fix SSTATE_DUPWHITELIST variable usage
We need to split this variable before using it. Otherwise a single "/"
character in the list whitelists every overlapping sysroot file which
was not the intention making the whole thing useless.
We'll start seeing warnings about overlapping files now this is working
correctly after this patch.
Signed-off-by: Richard Purdie
---
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 6ccaf6d..0037ce5 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -144,7 +144,7 @@ def sstate_install(ss, d):
# Check the file list for conflicts against the master manifest
mastermanifest = d.getVar("SSTATE_MASTERMANIFEST", True)
-whitelist = d.getVar("SSTATE_DUPWHITELIST", True)
+whitelist = (d.getVar("SSTATE_DUPWHITELIST", True) or "").split()
lock = bb.utils.lockfile(mastermanifest + ".lock")
if not os.path.exists(mastermanifest):
open(mastermanifest, "w").close()
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gstreamer: make pulseaudio support dependent on DISTRO_FEATURES
On Wed, Sep 26, 2012 at 12:34:05PM +0100, Paul Eggleton wrote:
> This should be no change to the previous situation unless you
> explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED
> (currently).
Why not use PACKAGECONFIG for this?
Cheers,
>
> Signed-off-by: Paul Eggleton
> ---
> .../gstreamer/gst-plugins-good_0.10.31.bb |9 ++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
> b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
> index 641de7c..07fda87 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
> @@ -6,15 +6,18 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
>
> file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
>
> DEPENDS += "gst-plugins-base gconf cairo jpeg libpng zlib libid3tag flac \
> - speex libsoup-2.4 pulseaudio"
> -PR = "r5"
> +speex libsoup-2.4 \
> +${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio',
> '', d)}"
> +
> +PR = "r6"
>
> inherit gettext gconf
>
> SRC_URI +=
> "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch"
>
> EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2
> --disable-libcaca --disable-hal --without-check \
> - --disable-orc --disable-examples"
> + --disable-orc --disable-examples \
> + ${@base_contains('DISTRO_FEATURES', 'pulseaudio',
> '--enable-pulse', '--disable-pulse', d)}"
>
> do_configure_prepend() {
> # This m4 file contains nastiness which conflicts with libtool 2.2.2
> --
> 1.7.9.5
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/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.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gstreamer: make pulseaudio support dependent on DISTRO_FEATURES
This should be no change to the previous situation unless you
explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED
(currently).
Signed-off-by: Paul Eggleton
---
.../gstreamer/gst-plugins-good_0.10.31.bb |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
index 641de7c..07fda87 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -6,15 +6,18 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
DEPENDS += "gst-plugins-base gconf cairo jpeg libpng zlib libid3tag flac \
- speex libsoup-2.4 pulseaudio"
-PR = "r5"
+speex libsoup-2.4 \
+${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio',
'', d)}"
+
+PR = "r6"
inherit gettext gconf
SRC_URI +=
"file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch"
EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2
--disable-libcaca --disable-hal --without-check \
- --disable-orc --disable-examples"
+ --disable-orc --disable-examples \
+ ${@base_contains('DISTRO_FEATURES', 'pulseaudio',
'--enable-pulse', '--disable-pulse', d)}"
do_configure_prepend() {
# This m4 file contains nastiness which conflicts with libtool 2.2.2
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/1] gettext: Add depends to gettext to avoid host contamination
On Tue, 2012-09-25 at 15:25 +0100, Phil Blundell wrote: > Can you clarify what exactly is the host contamination issue here? I > don't quite understand why it's appropriate for the target gettext to be > depending on libxml2-native (which it presumably can't be linking > against). Also, since gettext-native is configured --with-included-xml, > it doesn't seem as though that one is going to be using libxml2-native > in any meaningful sense either. I tried to unravel this a bit. I think: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e5e6e761d15e42d94836a2153eda13bdbc4f915e which added the --with-included-xml came later and should have removed the DEPENDS but didn't. (the earlier commit being http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=a0abef457faeb2fd991d7ab67f0a94f59568) So this should be ok to go in and does some nice dependency unravelling. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-common.inc: Consider multilib when renaming libgcc for debian'ness
On Tue, 2012-09-25 at 18:07 +, McClintock Matthew-B29882 wrote: > This should probably go in denzil as well. Lets hold off that as I think we need to fix this in a better way at the core level... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-configure-cross: factor out --enable-threads argument into ${GCCTHREADS}
On Wed, 2012-09-26 at 12:46 +0200, Henning Heinold wrote: > should that not be GCCTHREADS ?= > > otherwise I do not see how it could be overwritten from outside. Well, a .bbappend can do it (since EXTRA_OECONF isn't assigned :=) or you can use an override GCCTHREADS_pn-gcc-cross = "no" for example. But yes, making it be ?= would be fine with me as well. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-configure-cross: factor out --enable-threads argument into ${GCCTHREADS}
On Wed, Sep 26, 2012 at 10:45:18AM +0100, Phil Blundell wrote: > This allows BSPs for architectures with no thread support to set (for > example) "GCCTHREADS=no" without having to override all the other configure > parameters. > > Signed-off-by: Phil Blundell > --- > meta/recipes-devtools/gcc/gcc-configure-common.inc |3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc > b/meta/recipes-devtools/gcc/gcc-configure-common.inc > index 908ad3e..504bfaa 100644 > --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc > +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc > @@ -26,12 +26,13 @@ EXTRA_OECONF_INITIAL ?= "" > EXTRA_OECONF_INTERMEDIATE ?= "" > > GCCMULTILIB = "--disable-multilib" > +GCCTHREADS = "posix" Hi Phil, should that not be GCCTHREADS ?= otherwise I do not see how it could be overwritten from outside. Bye Henning ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH] gettext: Remove spurious-looking dependencies on libxml2-native
These were added in aae5021101224344a2b1a3af5becf74291fbbfe5, ostensibly to
resolve
some sort of "host contamination" issue. However, that commit contains no
information
about what contamination was being observed or how the dependencies help.
gettext-native is being configured --with-included-libxml so it shouldn't be
using
libxml2 from either the host or the sysroot, in which case the dependency would
seem
to be useless. Using the included copy of libxml2 is in any case preferable to
adding
a dependency on libxml2-native because the latter brings quite a large stack of
other
dependencies with it.
Signed-off-by: Phil Blundell
---
meta/recipes-core/gettext/gettext_0.18.1.1.bb |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index a159405..96859aa 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,9 +5,9 @@ SECTION = "libs"
LICENSE = "GPLv3+ & LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r17"
-DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
-DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
+PR = "r18"
+DEPENDS = "gettext-native virtual/libiconv ncurses expat"
+DEPENDS_virtclass-native = "gettext-minimal-native"
PROVIDES = "virtual/libintl virtual/gettext"
PROVIDES_virtclass-native = "virtual/gettext-native"
RCONFLICTS_${PN} = "proxy-libintl"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-configure-cross: factor out --enable-threads argument into ${GCCTHREADS}
On Wed, 2012-09-26 at 12:01 +0200, Martin Jansa wrote: > Sorry I haven't noticed that it's the same value as before. > > But if it causes different sstate checksum than PR bump would be nice to get > new > builddir (well maybe not needed after > f15f61af77cc4e52a037f509f8e49e1ea530cf35). OK. In that case I'll leave the patch alone for now and see if Richard will swallow it as it stands. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] strace: Don't package strace-graph
Commit 9c9ea24b115a9bb87df1323b5f185ce426262aec made strace depend on perl
because the
strace-graph script needs it. However, this cost of the dependency is large
(building
all of perl) and the value of the script is marginal. Let's just delete the
script
instead and remove the dependency again.
If anybody wants strace-graph then it should be packaged in its own recipe and
that one
can be made to depend on perl without disrupting the main strace package.
Signed-off-by: Phil Blundell
---
meta/recipes-devtools/strace/strace_4.7.bb | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/strace/strace_4.7.bb
b/meta/recipes-devtools/strace/strace_4.7.bb
index 21dd47a..e1a5e82 100644
--- a/meta/recipes-devtools/strace/strace_4.7.bb
+++ b/meta/recipes-devtools/strace/strace_4.7.bb
@@ -3,11 +3,7 @@ HOMEPAGE = "http://strace.sourceforge.net";
SECTION = "console/utils"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=124500c21e856f0912df29295ba104c7"
-PR = "r1"
-
-PACKAGES =+ "${PN}-graph "
-FILES_${PN}-graph = "${bindir}/strace-graph"
-RDEPENDS_${PN}-graph = "perl"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
file://strace-eglibc-2.16.patch \
@@ -20,4 +16,9 @@ inherit autotools
export INCLUDES = "-I. -I./linux"
+do_install_append() {
+ # We don't ship strace-graph here because it needs perl
+ rm ${D}${bindir}/strace-graph
+}
+
BBCLASSEXTEND = "native"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-configure-cross: factor out --enable-threads argument into ${GCCTHREADS}
On Wed, Sep 26, 2012 at 10:57:41AM +0100, Phil Blundell wrote:
> On Wed, 2012-09-26 at 11:54 +0200, Martin Jansa wrote:
> > On Wed, Sep 26, 2012 at 10:45:18AM +0100, Phil Blundell wrote:
> > > diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> > > b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> > > index 908ad3e..504bfaa 100644
> > > --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> > > +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> > > @@ -26,12 +26,13 @@ EXTRA_OECONF_INITIAL ?= ""
> > > EXTRA_OECONF_INTERMEDIATE ?= ""
> > >
> > > GCCMULTILIB = "--disable-multilib"
> > > +GCCTHREADS = "posix"
> > >
> > > EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS',
> > > True) != 'no']} \
> > > --with-gnu-ld \
> > > --enable-shared \
> > > --enable-languages=${LANGUAGES} \
> > > ---enable-threads=posix \
> > > +--enable-threads=${GCCTHREADS} \
> > > ${GCCMULTILIB} \
> > > --enable-c99 \
> > > --enable-long-long \
> > > --
> > > 1.7.10.4
> >
> > Missing PR bump
>
> Does it really need one? It doesn't have any impact on the value that
> EXTRA_OECONF ends up with, and bumping the PRs on all the various .bb
> files would make the patch about ten times the size. I can do that if
> you insist but it seems like a bit of a waste of time.
Sorry I haven't noticed that it's the same value as before.
But if it causes different sstate checksum than PR bump would be nice to get new
builddir (well maybe not needed after f15f61af77cc4e52a037f509f8e49e1ea530cf35).
Cheers,
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-configure-cross: factor out --enable-threads argument into ${GCCTHREADS}
On Wed, 2012-09-26 at 11:54 +0200, Martin Jansa wrote:
> On Wed, Sep 26, 2012 at 10:45:18AM +0100, Phil Blundell wrote:
> > diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> > b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> > index 908ad3e..504bfaa 100644
> > --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> > +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> > @@ -26,12 +26,13 @@ EXTRA_OECONF_INITIAL ?= ""
> > EXTRA_OECONF_INTERMEDIATE ?= ""
> >
> > GCCMULTILIB = "--disable-multilib"
> > +GCCTHREADS = "posix"
> >
> > EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS',
> > True) != 'no']} \
> > --with-gnu-ld \
> > --enable-shared \
> > --enable-languages=${LANGUAGES} \
> > ---enable-threads=posix \
> > +--enable-threads=${GCCTHREADS} \
> > ${GCCMULTILIB} \
> > --enable-c99 \
> > --enable-long-long \
> > --
> > 1.7.10.4
>
> Missing PR bump
Does it really need one? It doesn't have any impact on the value that
EXTRA_OECONF ends up with, and bumping the PRs on all the various .bb
files would make the patch about ten times the size. I can do that if
you insist but it seems like a bit of a waste of time.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-configure-cross: factor out --enable-threads argument into ${GCCTHREADS}
On Wed, Sep 26, 2012 at 10:45:18AM +0100, Phil Blundell wrote:
> This allows BSPs for architectures with no thread support to set (for
> example) "GCCTHREADS=no" without having to override all the other configure
> parameters.
>
> Signed-off-by: Phil Blundell
> ---
> meta/recipes-devtools/gcc/gcc-configure-common.inc |3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> index 908ad3e..504bfaa 100644
> --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
> +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
> @@ -26,12 +26,13 @@ EXTRA_OECONF_INITIAL ?= ""
> EXTRA_OECONF_INTERMEDIATE ?= ""
>
> GCCMULTILIB = "--disable-multilib"
> +GCCTHREADS = "posix"
>
> EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS',
> True) != 'no']} \
> --with-gnu-ld \
> --enable-shared \
> --enable-languages=${LANGUAGES} \
> ---enable-threads=posix \
> +--enable-threads=${GCCTHREADS} \
> ${GCCMULTILIB} \
> --enable-c99 \
> --enable-long-long \
> --
> 1.7.10.4
Missing PR bump
Cheers,
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-configure-cross: factor out --enable-threads argument into ${GCCTHREADS}
This allows BSPs for architectures with no thread support to set (for
example) "GCCTHREADS=no" without having to override all the other configure
parameters.
Signed-off-by: Phil Blundell
---
meta/recipes-devtools/gcc/gcc-configure-common.inc |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 908ad3e..504bfaa 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -26,12 +26,13 @@ EXTRA_OECONF_INITIAL ?= ""
EXTRA_OECONF_INTERMEDIATE ?= ""
GCCMULTILIB = "--disable-multilib"
+GCCTHREADS = "posix"
EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True)
!= 'no']} \
--with-gnu-ld \
--enable-shared \
--enable-languages=${LANGUAGES} \
---enable-threads=posix \
+--enable-threads=${GCCTHREADS} \
${GCCMULTILIB} \
--enable-c99 \
--enable-long-long \
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] libx11: fix nativesdk build on older distros
On 26 September 2012 00:11, Daniel Stone wrote: >> The best fix is to just #define _GNU_SOURCE at the top of makekeys >> then, and push that upstream (mail patch to xorg-de...@lists.x.org). > > Actually, it isn't, as that breaks non-glibc badly. glibc takes > _GNU_SOURCE to mean 'please add useful GNU extensions to this POSIX > wasteland', whereas BSD and/or Solaris take it to mean 'please make > this only GNU and don't use any other extensions at all'. So we have > to do whatever AC_USE_SYSTEM_EXTENSIONS does, because that really is > the only thing that actually works. What do you mean non-glibc? :) Ignoring Minix as a build host (I think that's reasonable), AC_USE_SYSTEM_EXTENSIONS defines _ALL_SOURCE _GNU_SOURCE _POSIX_PTHREAD_SEMANTICS _TANDEM_SOURCE, and does a compile-time sanity test of __EXTENSIONS__ (because it's possible that some combination of these defines make the system headers unusable on Solaris). This is annoying. How about for oe-core we patch in -D_GNU_SOURCE to src/util/Makefile.am's CPPFLAGS definition and I'll discuss with xorg-dev for a proper fix? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: Remove static libraries from -dev packages
On Wed, 2012-09-26 at 09:49 +0100, Richard Purdie wrote: > On Tue, 2012-09-25 at 18:11 -0400, Colin Walters wrote: > > On Tue, 2012-09-25 at 23:00 +0100, Phil Blundell wrote: > > > > > That'd be inconsistent with other packages, since we do generally build > > > and ship the static libraries. Having a big switch to turn off static > > > libraries globally seems like a fine plan, but I can't see any obvious > > > reason why the util-linux ones are any more useless than the rest. > > > > Makes sense. I wonder if there are actually any users of the static > > libraries. > > > > For what it's worth in gnome-ostree I do just globally pass > > --disable-static by default. > > I tested this a while back to see what performance difference it made. > The answer was "nothing too significant", I don't have the exact timings > handy. I do remember having to exclude sqlite-native from the list since > pseudo static links against it. It's slightly surprising that it doesn't make that much of a difference, given that building static libraries does essentially double the number of compilations for library code. Though, of course, glibc doesn't support --disable-static nowadays and there might be a few other big packages that have the same issue. I guess that if you have enough cores, compilation count becomes something of a non-issue since it's one of the few things that does parallelize very well. It might be interesting to repeat the measurements of --disable-static on a machine with only a few CPUs and see whether it makes more of a difference there. Out of interest, why does pseudo static-link against sqlite anyway? p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] rootfs_rpm.bbclass: maybe no rpm postinst script
There maybe no rpm postinst script (e.g., core-image-minimal), then the
"*" is not expanded, and there would be error:
head: cannot open `rpm-postinsts/*' for reading: No such file or directory
Check whether it exists or not will fix the problem.
[YOCTO #3172]
Signed-off-by: Robert Yang
---
meta/classes/rootfs_rpm.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index d95ccfa..c86cd09 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -81,7 +81,9 @@ fakeroot rootfs_rpm_do_rootfs () {
# Report delayed package scriptlets
for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do
- echo "Delayed package scriptlet: `head -n 3 $i | tail -n 1`"
+ if [ -f $i ]; then
+ echo "Delayed package scriptlet: `head -n 3 $i | tail
-n 1`"
+ fi
done
install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
--
1.7.11.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] rootfs_rpm.bbclass: maybe no rpm postinst script
The following changes since commit b1f37e51e40774418a1b4c6e3df78df6ac6ee938: package_rpm.bbclass: no initial_solution in the second build (2012-09-26 10:15:20 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/rpm_head http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/rpm_head Robert Yang (1): rootfs_rpm.bbclass: maybe no rpm postinst script meta/classes/rootfs_rpm.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: Remove static libraries from -dev packages
On Tue, 2012-09-25 at 18:11 -0400, Colin Walters wrote: > On Tue, 2012-09-25 at 23:00 +0100, Phil Blundell wrote: > > > That'd be inconsistent with other packages, since we do generally build > > and ship the static libraries. Having a big switch to turn off static > > libraries globally seems like a fine plan, but I can't see any obvious > > reason why the util-linux ones are any more useless than the rest. > > Makes sense. I wonder if there are actually any users of the static > libraries. > > For what it's worth in gnome-ostree I do just globally pass > --disable-static by default. I tested this a while back to see what performance difference it made. The answer was "nothing too significant", I don't have the exact timings handy. I do remember having to exclude sqlite-native from the list since pseudo static links against it. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cmake.bbclass: modify construction of compiler flags
On Tue, 2012-09-25 at 14:37 -0700, Joe Slater wrote:
> Use CFLAGS instead of CPPFLAGS for C_FLAGS variants.
> Also remove duplicate flags from _RELEASE variants.
>
> Signed-off-by: Joe Slater
>
> *** Note - this can break things that have never really
> ***been compiled with -O2 optimization
This change says what you're doing but not really why. How are things
broken and why is this an improvement?
Cheers,
Richard
> ---
> meta/classes/cmake.bbclass |6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index dcd974a..ac5c048 100644
> --- a/meta/classes/cmake.bbclass
> +++ b/meta/classes/cmake.bbclass
> @@ -19,10 +19,10 @@ OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^
> ]*\).*/\1/'`"
> OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"
>
> # Compiler flags
> -OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CPPFLAGS}"
> +OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CFLAGS}"
> OECMAKE_CXX_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CXXFLAGS}
> -fpermissive"
> -OECMAKE_C_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CPPFLAGS} -DNDEBUG"
> -OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG"
> +OECMAKE_C_FLAGS_RELEASE ?= "${CFLAGS} -DNDEBUG"
> +OECMAKE_CXX_FLAGS_RELEASE ?= "${CXXFLAGS} -DNDEBUG"
>
> OECMAKE_RPATH ?= ""
> OECMAKE_PERLNATIVE_DIR ??= ""
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sanity.bbclass: bblayers.conf should be updated automatically
From: Constantin Musca
- add check_bblayers_conf bitbake function which does the bblayers.conf
v4 -> v5 update if necessary (every layer should make its specific
bblayers.conf upgrades appending to the check_bblayers_conf function)
- we ask the user to re-run bitbake because we can't trigger reparsing
without being invasive
[YOCTO #3082]
Signed-off-by: Constantin Musca
---
meta/classes/sanity.bbclass | 56 ++-
1 file changed, 55 insertions(+), 1 deletion(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 385d733..e25dcf5 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -4,6 +4,56 @@
SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar gzip gawk
chrpath wget cpio"
+python check_bblayers_conf() {
+bblayers_fn = os.path.join(d.getVar('TOPDIR', True), 'conf/bblayers.conf')
+
+current_lconf = int(d.getVar('LCONF_VERSION', True))
+if not current_lconf:
+sys.exit()
+lconf_version = int(d.getVar('LAYER_CONF_VERSION', True))
+lines = []
+
+import re
+def find_line(pattern, lines):
+return next(((index, line)
+for index, line in enumerate(lines)
+if re.search(pattern, line)), (None, None))
+
+if current_lconf < 4:
+sys.exit()
+
+with open(bblayers_fn, 'r') as f:
+lines = f.readlines()
+
+if current_lconf == 4:
+topdir_var = '$' + '{TOPDIR}'
+index, bbpath_line = find_line('BBPATH', lines)
+if bbpath_line:
+start = bbpath_line.find('"')
+if start != -1 and (len(bbpath_line) != (start + 1)):
+if bbpath_line[start + 1] == '"':
+lines[index] = (bbpath_line[:start + 1] +
+topdir_var + bbpath_line[start + 1:])
+else:
+if not topdir_var in bbpath_line:
+lines[index] = (bbpath_line[:start + 1] +
+topdir_var + ':' + bbpath_line[start + 1:])
+else:
+sys.exit()
+else:
+index, bbfiles_line = find_line('BBFILES', lines)
+if bbfiles_line:
+lines.insert(index, 'BBPATH = "' + topdir_var + '"\n')
+else:
+sys.exit()
+
+index, line = find_line('LCONF_VERSION', lines)
+current_lconf += 1
+lines[index] = 'LCONF_VERSION = "%d"\n' % current_lconf
+with open(bblayers_fn, "w") as f:
+f.write(''.join(lines))
+}
+
def raise_sanity_error(msg, d):
if d.getVar("SANITY_USE_EVENTS", True) == "1":
bb.event.fire(bb.event.SanityCheckFailed(msg), d)
@@ -337,7 +387,11 @@ def check_sanity(sanity_data):
current_lconf = sanity_data.getVar('LCONF_VERSION', True)
lconf_version = sanity_data.getVar('LAYER_CONF_VERSION', True)
if current_lconf != lconf_version:
-messages = messages + "Your version of bblayers.conf was generated
from an older version of bblayers.conf.sample and there have been updates made
to this file. Please compare the two files and merge any changes before
continuing.\nMatching the version numbers will remove this message.\n\"meld
conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample\" is a good way
to visualise the changes.\n"
+try:
+bb.build.exec_func("check_bblayers_conf", sanity_data)
+messages = messages + "Your bblayers.conf has been updated. Please
re-run."
+except Exception:
+messages = messages + "Your version of bblayers.conf was generated
from an older version of bblayers.conf.sample and there have been updates made
to this file. Please compare the two files and merge any changes before
continuing.\nMatching the version numbers will remove this message.\n\"meld
conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample\" is a good way
to visualise the changes.\n"
# If we have a site.conf, check it's valid
if check_conf_exists("conf/site.conf", sanity_data):
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] *** bblayers.conf should be updated automatically
To keep things simple for this release, Paul proposed to put the bblayers.conf merging code in sanity.bbclass. After upgrading bblayers.conf we tell the user to re-run. It would be better if we could re-read the configuration but that is something we can address in 1.4. Every layer should make its specific bblayers.conf updates by appending to the check_bblayers_conf bitbake function. We decided that this is the right thing to do because we don't want to be invasive. This represents the meta merging functionality and does only the bblayers.conf v4 -> v5 update. The v5 -> v6 bblayers.conf update is done in another patch sent to p...@yoctoproject.org. Constantin Musca (1): sanity.bbclass: bblayers.conf should be updated automatically meta/classes/sanity.bbclass | 56 ++- 1 file changed, 55 insertions(+), 1 deletion(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC 0/7] Postinstall improvements
On Wed, Sep 26, 2012 at 9:09 AM, Laurentiu Palcu
wrote:
>
>
> On 09/20/2012 07:12 PM, Andreas Müller wrote:
>> On Thu, Sep 20, 2012 at 5:38 PM, Andreas Müller
>> wrote:
>>> On Wed, Sep 19, 2012 at 5:33 PM, Laurentiu Palcu
>>> wrote:
On 09/19/2012 04:41 PM, Andreas Müller wrote:
> On Wed, Sep 19, 2012 at 1:49 PM, Laurentiu Palcu
> wrote:
>> Hi,
>>
>> It's been quite a long time since I sent the first version of postinstall
>> improvements which, after some debate, we decided it needed run-once
>> support of postinst scriptlets on host. This patcheset (RFC actually)
>> adds
>> that.
>>
>> So, in order to achieve this goal I took advantage of
>> ROOTFS_POSTPROCESS_COMMAND variable. Basically, if running some postinst
>> scriptlets is time consuming (even on host) and execute repeatedly,
>> then we can postpone the running and run the scriplet just once. The
>> idea is
>> to put the scriptlet in the ${WORKDIR}/intercept_scripts directory. When
>> the
>> ROOTFS_POSTPROCESS_COMMAND is executed, it will pick up all the scripts
>> in
>> this directory and execute them.
>>
>> This actual patchset does the above for the gtk icon cache generation
>> which
>> takes a very long time to run on target and even on some hosts.
>>
>> The people willing to give this patchset a test, are most than welcome.
>> Also,
>> please feel free to review.
>>
>> Thanks,
>> Laurentiu
>>
> Thanks for taking care. I will give it a test tonight and hope to have
> results tomorrow.
It would be great if you could give it a try and let me know your results.
>>> I removed gtk-native append in meta-oe, build from scratch and tested
>>> the image. No issues so far - seems you have done a great job -
>>> Thanks!
>>>
>> Aargh I really would like to consider this done but I found suspicious
>> when browsing on the machine with the new image (hicolor- and
>> gnome-icon-theme installed):
>>
>> * in the folder /usr/share/icons/gnome *no* icon-theme.cache is found
>> * /usr/share/icons/hicolor/icon-theme.cache is there but it has the
>> date of 01.01.2000 (have no rtc backup on the machine). I would expect
>> this file to have build host's date.
>>
>> So I checked the contents on the build machine in image's rootfs:
>>
>> * in the folder /usr/share/icons/gnome *no* icon-theme.cache is found
>> * /usr/share/icons/hicolor/icon-theme.cache is there but has only
>> 64,5KB (the version on the machine is 2,3MB!!).
> Did you have any chance to debug the issue on your setup? I tried to
> replicate your environment but I failed. Lots of build errors, so I gave
> up. It would have taken me more time to make your setup work than
> debugging the real problem.
>
> Another alternative would be for you to prepare a tarball with all the
> repos and configs that you use and put it somewhere where I can take it.
> It would be easier for me to directly start debugging your issue.
>
Sorry but I am occupied by other issues at the moment. Hope to find
time at the weekend to add some debug messages to see what's going on.
Andreas
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core] ysvinit-inittab: fix hang issue of series consoles check
From: Zhenhua Luo
the kernel boot process hangs when /proc/consoles doesn't exists, check
the existence of /proc/consoles before executing pkg_postinst script.
Following is the log when /proc/consoles doesn't exist:
Running postinst /etc/rpm-postinsts/102...
cat: /proc/consoles: No such file or directory
cat: /proc/consoles: No such file or directory
cat: /proc/consoles: No such file or directory
INIT: Entering runlevel: 5
Starting OpenBSD Secure Shell server: sshd
generating ssh RSA key...
generating ssh ECDSA key...
generating ssh DSA key...
done.
Starting network benchmark server: netserver.
Starting system log daemon...0
Starting kernel log daemon...0
Stopping Bootlog daemon: bootlogd.
INIT: no more processes left in this runlevel
Signed-off-by: Zhenhua Luo
---
.../sysvinit/sysvinit-inittab_2.88dsf.bb |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 5b79caf..b289853 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Inittab for sysvinit"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r8"
+PR = "r9"
SRC_URI = "file://inittab"
@@ -54,7 +54,7 @@ EOF
pkg_postinst_${PN} () {
# run this on the target
-if [ "x$D" = "x" ]; then
+if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
tmp="${SERIAL_CONSOLES_CHECK}"
for i in $tmp
do
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] at: atd remove useless --make-pidfile option.
For start-stop-daemon, --make-pidfile is used when starting a
program that does not create its own pid file.
atd would create its own /var/run/atd.pid, so remove this option.
Signed-off-by: Xin Ouyang
---
meta/recipes-extended/at/at_3.1.13.bb |2 +-
meta/recipes-extended/at/files/S99at |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/at/at_3.1.13.bb
b/meta/recipes-extended/at/at_3.1.13.bb
index a391d6e..3580e09 100644
--- a/meta/recipes-extended/at/at_3.1.13.bb
+++ b/meta/recipes-extended/at/at_3.1.13.bb
@@ -11,7 +11,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env
pam-plugin-limits"
RCONFLICTS_${PN} = "atd"
RREPLACES_${PN} = "atd"
-PR = "r3"
+PR = "r4"
SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://configure.patch \
diff --git a/meta/recipes-extended/at/files/S99at
b/meta/recipes-extended/at/files/S99at
index bcfcbda..386f8a4 100644
--- a/meta/recipes-extended/at/files/S99at
+++ b/meta/recipes-extended/at/files/S99at
@@ -7,7 +7,7 @@ umask 077
start() {
echo -n "Starting atd: "
- start-stop-daemon --start --quiet --make-pidfile --pidfile
/var/run/atd.pid --background --exec /usr/sbin/atd -- -f
+ start-stop-daemon --start --quiet --pidfile /var/run/atd.pid
--background --exec /usr/sbin/atd -- -f
echo "OK"
}
stop() {
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC 0/7] Postinstall improvements
On 09/20/2012 07:12 PM, Andreas Müller wrote:
> On Thu, Sep 20, 2012 at 5:38 PM, Andreas Müller
> wrote:
>> On Wed, Sep 19, 2012 at 5:33 PM, Laurentiu Palcu
>> wrote:
>>>
>>>
>>> On 09/19/2012 04:41 PM, Andreas Müller wrote:
On Wed, Sep 19, 2012 at 1:49 PM, Laurentiu Palcu
wrote:
> Hi,
>
> It's been quite a long time since I sent the first version of postinstall
> improvements which, after some debate, we decided it needed run-once
> support of postinst scriptlets on host. This patcheset (RFC actually) adds
> that.
>
> So, in order to achieve this goal I took advantage of
> ROOTFS_POSTPROCESS_COMMAND variable. Basically, if running some postinst
> scriptlets is time consuming (even on host) and execute repeatedly,
> then we can postpone the running and run the scriplet just once. The idea
> is
> to put the scriptlet in the ${WORKDIR}/intercept_scripts directory. When
> the
> ROOTFS_POSTPROCESS_COMMAND is executed, it will pick up all the scripts in
> this directory and execute them.
>
> This actual patchset does the above for the gtk icon cache generation
> which
> takes a very long time to run on target and even on some hosts.
>
> The people willing to give this patchset a test, are most than welcome.
> Also,
> please feel free to review.
>
> Thanks,
> Laurentiu
>
Thanks for taking care. I will give it a test tonight and hope to have
results tomorrow.
>>> It would be great if you could give it a try and let me know your results.
>>>
>> I removed gtk-native append in meta-oe, build from scratch and tested
>> the image. No issues so far - seems you have done a great job -
>> Thanks!
>>
> Aargh I really would like to consider this done but I found suspicious
> when browsing on the machine with the new image (hicolor- and
> gnome-icon-theme installed):
>
> * in the folder /usr/share/icons/gnome *no* icon-theme.cache is found
> * /usr/share/icons/hicolor/icon-theme.cache is there but it has the
> date of 01.01.2000 (have no rtc backup on the machine). I would expect
> this file to have build host's date.
>
> So I checked the contents on the build machine in image's rootfs:
>
> * in the folder /usr/share/icons/gnome *no* icon-theme.cache is found
> * /usr/share/icons/hicolor/icon-theme.cache is there but has only
> 64,5KB (the version on the machine is 2,3MB!!).
Did you have any chance to debug the issue on your setup? I tried to
replicate your environment but I failed. Lots of build errors, so I gave
up. It would have taken me more time to make your setup work than
debugging the real problem.
Another alternative would be for you to prepare a tarball with all the
repos and configs that you use and put it somewhere where I can take it.
It would be easier for me to directly start debugging your issue.
Thanks,
Laurentiu
>
>
> Andreas
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
