* [PATCH 1/6] classes/image: avoid cp race condition when building multiple images
2012-03-16 19:00 [PATCH 0/6] Misc fixes Paul Eggleton
@ 2012-03-16 19:00 ` Paul Eggleton
2012-03-16 19:00 ` [PATCH 2/6] buildhistory_analysis: fix duplicate PE/PV/PR in related fields Paul Eggleton
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Paul Eggleton @ 2012-03-16 19:00 UTC (permalink / raw)
To: openembedded-core
Avoid a race condition when building multiple images by ignoring a
failure to copy the README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
to DEPLOY_DIR_IMAGE.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/image.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 533f53c..ccfcaba 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -145,7 +145,7 @@ fakeroot do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}
mkdir -p ${DEPLOY_DIR_IMAGE}
- cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
+ cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt || true
# If "${IMAGE_ROOTFS}/dev" exists, then the device had been made by
# the previous build
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/6] buildhistory_analysis: fix duplicate PE/PV/PR in related fields
2012-03-16 19:00 [PATCH 0/6] Misc fixes Paul Eggleton
2012-03-16 19:00 ` [PATCH 1/6] classes/image: avoid cp race condition when building multiple images Paul Eggleton
@ 2012-03-16 19:00 ` Paul Eggleton
2012-03-16 19:00 ` [PATCH 3/6] buildhistory: allow disabling image and/or package history Paul Eggleton
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Paul Eggleton @ 2012-03-16 19:00 UTC (permalink / raw)
To: openembedded-core
Since PE, PV and PR appear in both the recipe history and package
history files these were showing up twice when they were added as
related fields to monitored changes. Only add them when the path is
exactly the same.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/lib/oe/buildhistory_analysis.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py
index 4f3e635..d09911c 100644
--- a/meta/lib/oe/buildhistory_analysis.py
+++ b/meta/lib/oe/buildhistory_analysis.py
@@ -307,7 +307,7 @@ def process_changes(repopath, revision1, revision2 = 'HEAD', report_all = False)
if chg.path == chg2.path or os.path.dirname(chg.path) == chg2.path:
if chg2.fieldname in related_fields.get(chg.fieldname, []):
chg.related.append(chg2)
- elif chg.path.startswith('packages/') and chg2.fieldname in ['PE', 'PV', 'PR']:
+ elif chg.path == chg2.path and chg.path.startswith('packages/') and chg2.fieldname in ['PE', 'PV', 'PR']:
chg.related.append(chg2)
if report_all:
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/6] buildhistory: allow disabling image and/or package history
2012-03-16 19:00 [PATCH 0/6] Misc fixes Paul Eggleton
2012-03-16 19:00 ` [PATCH 1/6] classes/image: avoid cp race condition when building multiple images Paul Eggleton
2012-03-16 19:00 ` [PATCH 2/6] buildhistory_analysis: fix duplicate PE/PV/PR in related fields Paul Eggleton
@ 2012-03-16 19:00 ` Paul Eggleton
2012-03-16 19:00 ` [PATCH 4/6] buildhistory: avoid reruns of do_package Paul Eggleton
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Paul Eggleton @ 2012-03-16 19:00 UTC (permalink / raw)
To: openembedded-core
Add a BUILDHISTORY_FEATURES variable which can be set to "" to disable
buildhistory with the class still inherited.
BUILDHISTORY_FEATURES by default contains two items - image and package.
You can use these to disable the image and package history functions
individually - this is particularly useful if you want to get the image
contents and dependency graphs but don't need the package history.
Additionally, ensure we quit shell procedures gracefully by using return
instead of exit.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/buildhistory.bbclass | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 6c2d4e9..3a68d8d 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -7,6 +7,7 @@
# Copyright (C) 2007-2011 Koen Kooi <koen@openembedded.org>
#
+BUILDHISTORY_FEATURES ?= "image package"
BUILDHISTORY_DIR ?= "${TMPDIR}/buildhistory"
BUILDHISTORY_DIR_IMAGE = "${BUILDHISTORY_DIR}/images/${MACHINE_ARCH}/${TCLIBC}/${IMAGE_BASENAME}"
BUILDHISTORY_DIR_PACKAGE = "${BUILDHISTORY_DIR}/packages/${MULTIMACH_TARGET_SYS}/${PN}"
@@ -25,6 +26,9 @@ PACKAGEFUNCS += "buildhistory_emit_pkghistory"
python buildhistory_emit_pkghistory() {
import re
+ if not "package" in (d.getVar('BUILDHISTORY_FEATURES', True) or "").split():
+ return 0
+
pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE', True)
class RecipeInfo:
@@ -269,6 +273,10 @@ buildhistory_get_image_installed() {
# Anything requiring the use of the packaging system should be done in here
# in case the packaging files are going to be removed for this image
+ if [ "${@base_contains('BUILDHISTORY_FEATURES', 'image', '1', '0', d)}" = "0" ] ; then
+ return
+ fi
+
mkdir -p ${BUILDHISTORY_DIR_IMAGE}
# Get list of installed packages
@@ -317,6 +325,10 @@ buildhistory_get_image_installed() {
}
buildhistory_get_imageinfo() {
+ if [ "${@base_contains('BUILDHISTORY_FEATURES', 'image', '1', '0', d)}" = "0" ] ; then
+ return
+ fi
+
# List the files in the image, but exclude date/time etc.
# This awk script is somewhat messy, but handles where the size is not printed for device files under pseudo
( cd ${IMAGE_ROOTFS} && find . -ls | awk '{ if ( $7 ~ /[0-9]/ ) printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, $7, $11, $12, $13 ; else printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, 0, $10, $11, $12 }' | sort -k5 > ${BUILDHISTORY_DIR_IMAGE}/files-in-image.txt )
@@ -371,7 +383,7 @@ def buildhistory_get_imagevars(d):
buildhistory_commit() {
if [ ! -d ${BUILDHISTORY_DIR} ] ; then
# Code above that creates this dir never executed, so there can't be anything to commit
- exit
+ return
fi
( cd ${BUILDHISTORY_DIR}/
@@ -396,8 +408,9 @@ python buildhistory_eventhandler() {
import bb.event
if isinstance(e, bb.event.BuildCompleted):
- if e.data.getVar("BUILDHISTORY_COMMIT", True) == "1":
- bb.build.exec_func("buildhistory_commit", e.data)
+ if e.data.getVar('BUILDHISTORY_FEATURES', True).strip():
+ if e.data.getVar("BUILDHISTORY_COMMIT", True) == "1":
+ bb.build.exec_func("buildhistory_commit", e.data)
}
addhandler buildhistory_eventhandler
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/6] buildhistory: avoid reruns of do_package
2012-03-16 19:00 [PATCH 0/6] Misc fixes Paul Eggleton
` (2 preceding siblings ...)
2012-03-16 19:00 ` [PATCH 3/6] buildhistory: allow disabling image and/or package history Paul Eggleton
@ 2012-03-16 19:00 ` Paul Eggleton
2012-03-16 19:01 ` [PATCH 5/6] iproute2: fix unpackaged files warning Paul Eggleton
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Paul Eggleton @ 2012-03-16 19:00 UTC (permalink / raw)
To: openembedded-core
Avoid triggering a rerun of all do_package* tasks when OEBasicHash
signature generator is being used and the buildhistory package code or
any of the package related variables change.
Note that adding and removing INHERIT of buildhistory will still force
this rebuild - use the newly added BUILDHISTORY_FEATURES variable to
enable and disable buildhistory instead in order to avoid this.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/buildhistory.bbclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 3a68d8d..f99aa7f 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -19,6 +19,11 @@ BUILDHISTORY_PUSH_REPO ?= ""
inherit package
PACKAGEFUNCS += "buildhistory_emit_pkghistory"
+# We don't want to force a rerun of do_package for everything
+# if the buildhistory_emit_pkghistory function or any of the
+# variables it refers to changes
+do_package[vardepsexclude] += "buildhistory_emit_pkghistory"
+
#
# Called during do_package to write out metadata about this package
# for comparision when writing future packages
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/6] iproute2: fix unpackaged files warning
2012-03-16 19:00 [PATCH 0/6] Misc fixes Paul Eggleton
` (3 preceding siblings ...)
2012-03-16 19:00 ` [PATCH 4/6] buildhistory: avoid reruns of do_package Paul Eggleton
@ 2012-03-16 19:01 ` Paul Eggleton
2012-03-16 19:01 ` [PATCH 6/6] qt4: add RPROVIDES/RREPLACES for qmake2 recipe Paul Eggleton
2012-03-19 16:30 ` [PATCH 0/6] Misc fixes Saul Wold
6 siblings, 0 replies; 9+ messages in thread
From: Paul Eggleton @ 2012-03-16 19:01 UTC (permalink / raw)
To: openembedded-core
Fixes the following warnings:
WARNING: For recipe iproute2, the following files/directories were installed but not shipped in any package:
WARNING: /lib
WARNING: /lib/tc
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-connectivity/iproute2/iproute2.inc | 2 +-
.../iproute2/iproute2_3.2.0.bb | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index 6fc30a0..86847ef 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -26,7 +26,7 @@ do_install () {
# There are only .so files in iproute2
INSANE_SKIP_${PN} = "dev-so"
-FILES_${PN} += "${base_libdir}/tc/*"
+FILES_${PN} += "${base_libdir}/tc"
FILES_${PN}-dbg += "${base_libdir}/tc/.debug"
ALTERNATIVE_NAME = "ip"
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb
index 4391fb6..5af12af 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb
@@ -1,5 +1,7 @@
require iproute2.inc
+PR = "r1"
+
#v3.2.0 tag is "447c118f138171b260ad045ad6e1b17f9ef462e2"
#but it was not fully tested and had build error, and the next commit fixed it.
SRCREV = "13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/6] qt4: add RPROVIDES/RREPLACES for qmake2 recipe
2012-03-16 19:00 [PATCH 0/6] Misc fixes Paul Eggleton
` (4 preceding siblings ...)
2012-03-16 19:01 ` [PATCH 5/6] iproute2: fix unpackaged files warning Paul Eggleton
@ 2012-03-16 19:01 ` Paul Eggleton
2012-03-16 19:40 ` Koen Kooi
2012-03-19 16:30 ` [PATCH 0/6] Misc fixes Saul Wold
6 siblings, 1 reply; 9+ messages in thread
From: Paul Eggleton @ 2012-03-16 19:01 UTC (permalink / raw)
To: openembedded-core
OE-Classic and meta-oe provide a qmake2 recipe; since this has been
obsoleted by the recent change to provide qmake within the tools package
and (in the latter case) will soon be removed, add an RREPLACES to aid
upgrades and RPROVIDES to make it easy to install.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 0e57e5a..8c15352 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 = "r42"
+INC_PR = "r43"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index e1bef64..072c522 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r40"
+INC_PR = "r41"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 7f1f6f0..468a46f 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -155,6 +155,9 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
RRECOMMENDS_${QT_BASE_NAME}-doc += " \
${QT_BASE_NAME}-demos-doc"
+RPROVIDES_${QT_BASE_NAME}-tools += "qmake2"
+RREPLACES_${QT_BASE_NAME}-tools += "qmake2"
+
FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 6/6] qt4: add RPROVIDES/RREPLACES for qmake2 recipe
2012-03-16 19:01 ` [PATCH 6/6] qt4: add RPROVIDES/RREPLACES for qmake2 recipe Paul Eggleton
@ 2012-03-16 19:40 ` Koen Kooi
0 siblings, 0 replies; 9+ messages in thread
From: Koen Kooi @ 2012-03-16 19:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 16 mrt. 2012, om 20:01 heeft Paul Eggleton het volgende geschreven:
> OE-Classic and meta-oe provide a qmake2 recipe; since this has been
> obsoleted by the recent change to provide qmake within the tools package
> and (in the latter case) will soon be removed, add an RREPLACES to aid
> upgrades and RPROVIDES to make it easy to install.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 3 +++
> 3 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
> index 0e57e5a..8c15352 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 = "r42"
> +INC_PR = "r43"
>
> QT_BASE_LIB ?= "libqt-embedded"
>
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index e1bef64..072c522 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
> SECTION = "x11/libs"
> DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
>
> -INC_PR = "r40"
> +INC_PR = "r41"
>
> QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
> QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 7f1f6f0..468a46f 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -155,6 +155,9 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
> RRECOMMENDS_${QT_BASE_NAME}-doc += " \
> ${QT_BASE_NAME}-demos-doc"
>
> +RPROVIDES_${QT_BASE_NAME}-tools += "qmake2"
> +RREPLACES_${QT_BASE_NAME}-tools += "qmake2"
> +
> FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
> FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
> FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
> --
> 1.7.5.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/6] Misc fixes
2012-03-16 19:00 [PATCH 0/6] Misc fixes Paul Eggleton
` (5 preceding siblings ...)
2012-03-16 19:01 ` [PATCH 6/6] qt4: add RPROVIDES/RREPLACES for qmake2 recipe Paul Eggleton
@ 2012-03-19 16:30 ` Saul Wold
6 siblings, 0 replies; 9+ messages in thread
From: Saul Wold @ 2012-03-19 16:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton
On 03/16/2012 12:00 PM, Paul Eggleton wrote:
> The following changes since commit efd80fd23cb96ccc203893017938c1163d20b898:
>
> tcl: Fix bad RPATH QA warning (2012-03-16 16:47:27 +0000)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib paule/fixes16
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes16
>
> Paul Eggleton (6):
> classes/image: avoid cp race condition when building multiple images
> buildhistory_analysis: fix duplicate PE/PV/PR in related fields
> buildhistory: allow disabling image and/or package history
> buildhistory: avoid reruns of do_package
> iproute2: fix unpackaged files warning
> qt4: add RPROVIDES/RREPLACES for qmake2 recipe
>
> meta/classes/buildhistory.bbclass | 24 +++++++++++++++++--
> meta/classes/image.bbclass | 2 +-
> meta/lib/oe/buildhistory_analysis.py | 2 +-
> meta/recipes-connectivity/iproute2/iproute2.inc | 2 +-
> .../iproute2/iproute2_3.2.0.bb | 2 +
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 3 ++
> 8 files changed, 31 insertions(+), 8 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 9+ messages in thread