* [PATCH 1/5] qt4: allow a reduction in build time
2011-08-16 13:57 [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related Anders Darander
@ 2011-08-16 13:57 ` Anders Darander
2011-08-16 14:18 ` Paul Eggleton
2011-08-17 14:08 ` Richard Purdie
2011-08-16 13:57 ` [PATCH 2/5] qmake_base: add uclibceabi Anders Darander
` (4 subsequent siblings)
5 siblings, 2 replies; 13+ messages in thread
From: Anders Darander @ 2011-08-16 13:57 UTC (permalink / raw)
To: openembedded-core
When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
-nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
all tools.
* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Guard do_split_packages() with an try-except-clause, otherwise we get an error stating
that .../phrasebooks/... do not exist.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-qt/qt4/qt4.inc | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 0410a92..994ec12 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -227,7 +227,10 @@ python populate_packages_prepend() {
phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
- do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
+ try:
+ do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
+ except:
+ pass
# Package all the plugins and their -dbg version and create a meta package
import os
@@ -278,11 +281,11 @@ do_install() {
# These are host binaries, we should only use them in staging
rm ${D}/${bindir}/qmake
- rm ${D}/${bindir}/uic
- rm ${D}/${bindir}/uic3
+ rm -f ${D}/${bindir}/uic
+ rm -f ${D}/${bindir}/uic3
rm ${D}/${bindir}/moc
rm ${D}/${bindir}/rcc
- rm ${D}/${bindir}/lrelease
+ rm -f ${D}/${bindir}/lrelease
# fix pkgconfig, libtool and prl files
sed -i -e s#-L${S}/lib##g \
@@ -319,6 +322,6 @@ do_install() {
#Append an E to the qtdemo file
if [ -n "${QT_LIBINFIX}" ] ; then
- mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+ [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
fi
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 1/5] qt4: allow a reduction in build time
2011-08-16 13:57 ` [PATCH 1/5] qt4: allow a reduction in build time Anders Darander
@ 2011-08-16 14:18 ` Paul Eggleton
2011-08-17 14:08 ` Richard Purdie
1 sibling, 0 replies; 13+ messages in thread
From: Paul Eggleton @ 2011-08-16 14:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tuesday 16 August 2011 14:57:48 Anders Darander wrote:
> When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui
> -nomake tools -nomake examples -nomake demos -nomake docs', build failure
> can occur, due to not building all tools.
>
> * Make rm not error out when removing one of the, possibly, non-existing
> tools. * Only try to rename qtdemo, if qtdemo exists.
> * Guard do_split_packages() with an try-except-clause, otherwise we get an
> error stating that .../phrasebooks/... do not exist.
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
> meta/recipes-qt/qt4/qt4.inc | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 0410a92..994ec12 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -227,7 +227,10 @@ python populate_packages_prepend() {
>
> phrasebook_dir =
> bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) -
> do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name,
> '${PN} phrasebook for %s', extra_depends='' ) + try:
> + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$',
> phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) +
> except:
> + pass
>
> # Package all the plugins and their -dbg version and create a meta
> package import os
> @@ -278,11 +281,11 @@ do_install() {
>
> # These are host binaries, we should only use them in staging
> rm ${D}/${bindir}/qmake
> - rm ${D}/${bindir}/uic
> - rm ${D}/${bindir}/uic3
> + rm -f ${D}/${bindir}/uic
> + rm -f ${D}/${bindir}/uic3
> rm ${D}/${bindir}/moc
> rm ${D}/${bindir}/rcc
> - rm ${D}/${bindir}/lrelease
> + rm -f ${D}/${bindir}/lrelease
>
> # fix pkgconfig, libtool and prl files
> sed -i -e s#-L${S}/lib##g \
> @@ -319,6 +322,6 @@ do_install() {
>
> #Append an E to the qtdemo file
> if [ -n "${QT_LIBINFIX}" ] ; then
> - mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
> + [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo
> ${D}${bindir}/qtdemo${QT_LIBINFIX} fi
> }
Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/5] qt4: allow a reduction in build time
2011-08-16 13:57 ` [PATCH 1/5] qt4: allow a reduction in build time Anders Darander
2011-08-16 14:18 ` Paul Eggleton
@ 2011-08-17 14:08 ` Richard Purdie
2011-08-17 17:15 ` Anders Darander
2011-08-17 17:51 ` Anders Darander
1 sibling, 2 replies; 13+ messages in thread
From: Richard Purdie @ 2011-08-17 14:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-08-16 at 15:57 +0200, Anders Darander wrote:
> When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
> -nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
> all tools.
>
> * Make rm not error out when removing one of the, possibly, non-existing tools.
> * Only try to rename qtdemo, if qtdemo exists.
> * Guard do_split_packages() with an try-except-clause, otherwise we get an error stating
> that .../phrasebooks/... do not exist.
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
> meta/recipes-qt/qt4/qt4.inc | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 0410a92..994ec12 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -227,7 +227,10 @@ python populate_packages_prepend() {
>
> phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
> - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> + try:
> + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> + except:
> + pass
Please use some actual test here, not a general try/except/pass. This
reason is that is some failure we want to know about happens, this will
hide it as the code stands.
The rest of the patch is ok, this just needs tweaking.
Cheers,
Richard
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/5] qt4: allow a reduction in build time
2011-08-17 14:08 ` Richard Purdie
@ 2011-08-17 17:15 ` Anders Darander
2011-08-17 17:51 ` Anders Darander
1 sibling, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-08-17 17:15 UTC (permalink / raw)
To: openembedded-core
* Richard Purdie <richard.purdie@linuxfoundation.org> [110817 16:09]:
> On Tue, 2011-08-16 at 15:57 +0200, Anders Darander wrote:
> > When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
> > -nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
> > all tools.
> >
> > * Make rm not error out when removing one of the, possibly, non-existing tools.
> > * Only try to rename qtdemo, if qtdemo exists.
> > * Guard do_split_packages() with an try-except-clause, otherwise we get an error stating
> > that .../phrasebooks/... do not exist.
> >
> > Signed-off-by: Anders Darander <anders@chargestorm.se>
> > ---
> > meta/recipes-qt/qt4/qt4.inc | 13 ++++++++-----
> > 1 files changed, 8 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> > index 0410a92..994ec12 100644
> > --- a/meta/recipes-qt/qt4/qt4.inc
> > +++ b/meta/recipes-qt/qt4/qt4.inc
> > @@ -227,7 +227,10 @@ python populate_packages_prepend() {
> >
> > phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> > phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
> > - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> > + try:
> > + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> > + except:
> > + pass
> Please use some actual test here, not a general try/except/pass. This
> reason is that is some failure we want to know about happens, this will
> hide it as the code stands.
Yes, that's right. Initially I had a plan to get some ideas on how to
tackle this, but I think I've got a good test outlined. Hopefully I can
implement and test it tonight, otherwise I'll do it tomorrow.
Cheers,
Anders
--
Anders Darander
ChargeStorm AB
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/5] qt4: allow a reduction in build time
2011-08-17 14:08 ` Richard Purdie
2011-08-17 17:15 ` Anders Darander
@ 2011-08-17 17:51 ` Anders Darander
1 sibling, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-08-17 17:51 UTC (permalink / raw)
To: openembedded-core
* Richard Purdie <richard.purdie@linuxfoundation.org> [110817 16:09]:
> On Tue, 2011-08-16 at 15:57 +0200, Anders Darander wrote:
> > phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> > phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
> > - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> > + try:
> > + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> > + except:
> > + pass
> Please use some actual test here, not a general try/except/pass. This
> reason is that is some failure we want to know about happens, this will
> hide it as the code stands.
> The rest of the patch is ok, this just needs tweaking.
An updated patch is available at the same pull tree. I've also sent a
new pull request titled: [PATCH v3 0/1] Qt4: reduce build time.
In this updated version, I'll check if the path in phrasebook_dir
exists, and depending on this outcome, I'll call do_split_packages.
Cheers,
Anders
--
Anders Darander
ChargeStorm AB
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/5] qmake_base: add uclibceabi
2011-08-16 13:57 [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related Anders Darander
2011-08-16 13:57 ` [PATCH 1/5] qt4: allow a reduction in build time Anders Darander
@ 2011-08-16 13:57 ` Anders Darander
2011-08-16 13:57 ` [PATCH 3/5] connman: use DISTRO_FEATURES to enable wifi and bluetooth Anders Darander
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-08-16 13:57 UTC (permalink / raw)
To: openembedded-core
Partial sync of qmake_base from meta-oe.
* Add a matching rule for *linux-uclibceabi-oe-g++, to make qmake_base.bbclase more
similar to the version in meta-oe.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/classes/qmake_base.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass
index 165d689..b61b84c 100644
--- a/meta/classes/qmake_base.bbclass
+++ b/meta/classes/qmake_base.bbclass
@@ -47,7 +47,7 @@ addtask generate_qt_config_file after do_patch before do_configure
qmake_base_do_configure() {
case ${QMAKESPEC} in
- *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
+ *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++|*linux-uclibceabi-oe-g++)
;;
*-oe-g++)
die Unsupported target ${TARGET_OS} for oe-g++ qmake spec
--
1.7.5.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/5] connman: use DISTRO_FEATURES to enable wifi and bluetooth
2011-08-16 13:57 [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related Anders Darander
2011-08-16 13:57 ` [PATCH 1/5] qt4: allow a reduction in build time Anders Darander
2011-08-16 13:57 ` [PATCH 2/5] qmake_base: add uclibceabi Anders Darander
@ 2011-08-16 13:57 ` Anders Darander
2011-08-16 13:57 ` [PATCH 4/5] ofono: conditionally enable bluetooth Anders Darander
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-08-16 13:57 UTC (permalink / raw)
To: openembedded-core
As wifi and bluetooth is set in DISTRO_FEATURES, connman should respect this during configuring.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-connectivity/connman/connman_0.75.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
index aeff439..5a7b284 100644
--- a/meta/recipes-connectivity/connman/connman_0.75.bb
+++ b/meta/recipes-connectivity/connman/connman_0.75.bb
@@ -8,8 +8,8 @@ EXTRA_OECONF += "\
--enable-threads \
--enable-loopback \
--enable-ethernet \
- --enable-wifi \
- --enable-bluetooth \
+ ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
--enable-dnsproxy \
--disable-dhclient \
--enable-test \
--
1.7.5.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/5] ofono: conditionally enable bluetooth
2011-08-16 13:57 [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related Anders Darander
` (2 preceding siblings ...)
2011-08-16 13:57 ` [PATCH 3/5] connman: use DISTRO_FEATURES to enable wifi and bluetooth Anders Darander
@ 2011-08-16 13:57 ` Anders Darander
2011-08-16 14:33 ` Koen Kooi
2011-08-16 13:57 ` [PATCH 5/5] create-pull-request: increase likelihood of detecting a rename Anders Darander
2011-08-23 1:00 ` [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related Saul Wold
5 siblings, 1 reply; 13+ messages in thread
From: Anders Darander @ 2011-08-16 13:57 UTC (permalink / raw)
To: openembedded-core
Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling bluetooth.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-connectivity/ofono/ofono.inc | 3 ++-
meta/recipes-connectivity/ofono/ofono_0.50.bb | 1 +
meta/recipes-connectivity/ofono/ofono_git.bb | 4 ++++
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index a14b35a..ab233dc 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
inherit autotools pkgconfig update-rc.d
-DEPENDS = "dbus glib-2.0 udev bluez4"
+BLUEZDEPENDS = "bluez4"
+DEPENDS = "dbus glib-2.0 udev ${@base_contains('DISTRO_FEATURES', 'bluetooth','${BLUEZDEPENDS}', '', d)}"
INITSCRIPT_NAME = "ofono"
INITSCRIPT_PARAMS = "defaults 22"
diff --git a/meta/recipes-connectivity/ofono/ofono_0.50.bb b/meta/recipes-connectivity/ofono/ofono_0.50.bb
index ef4fbf0..b679200 100644
--- a/meta/recipes-connectivity/ofono/ofono_0.50.bb
+++ b/meta/recipes-connectivity/ofono/ofono_0.50.bb
@@ -7,6 +7,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/ofono/${BPN}-${PV}.tar.bz2 \
EXTRA_OECONF += "\
--enable-test \
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
"
SRC_URI[md5sum] = "b2656fd0bbf33f926fc86c1e8915d697"
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb
index dbad5a1..f1770c2 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
@@ -10,6 +10,10 @@ PR = "r1"
SRC_URI = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
file://ofono"
+EXTRA_OECONF += "\
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
+"
+
do_configure_prepend () {
${S}/bootstrap
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 4/5] ofono: conditionally enable bluetooth
2011-08-16 13:57 ` [PATCH 4/5] ofono: conditionally enable bluetooth Anders Darander
@ 2011-08-16 14:33 ` Koen Kooi
2011-08-17 6:31 ` Anders Darander
0 siblings, 1 reply; 13+ messages in thread
From: Koen Kooi @ 2011-08-16 14:33 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 16 aug. 2011, om 15:57 heeft Anders Darander het volgende geschreven:
> Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling bluetooth.
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
> meta/recipes-connectivity/ofono/ofono.inc | 3 ++-
> meta/recipes-connectivity/ofono/ofono_0.50.bb | 1 +
> meta/recipes-connectivity/ofono/ofono_git.bb | 4 ++++
> 3 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
> index a14b35a..ab233dc 100644
> --- a/meta/recipes-connectivity/ofono/ofono.inc
> +++ b/meta/recipes-connectivity/ofono/ofono.inc
> @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
>
> inherit autotools pkgconfig update-rc.d
>
> -DEPENDS = "dbus glib-2.0 udev bluez4"
> +BLUEZDEPENDS = "bluez4"
> +DEPENDS = "dbus glib-2.0 udev ${@base_contains('DISTRO_FEATURES', 'bluetooth','${BLUEZDEPENDS}', '', d)}"
is that BLUEZDEPENDS helper var really needed?
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 4/5] ofono: conditionally enable bluetooth
2011-08-16 14:33 ` Koen Kooi
@ 2011-08-17 6:31 ` Anders Darander
0 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-08-17 6:31 UTC (permalink / raw)
To: openembedded-core
* Koen Kooi <koen@dominion.thruhere.net> [110816 16:34]:
> Op 16 aug. 2011, om 15:57 heeft Anders Darander het volgende geschreven:
> > Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling bluetooth.
> >
> > Signed-off-by: Anders Darander <anders@chargestorm.se>
> > ---
> > meta/recipes-connectivity/ofono/ofono.inc | 3 ++-
> > meta/recipes-connectivity/ofono/ofono_0.50.bb | 1 +
> > meta/recipes-connectivity/ofono/ofono_git.bb | 4 ++++
> > 3 files changed, 7 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
> > index a14b35a..ab233dc 100644
> > --- a/meta/recipes-connectivity/ofono/ofono.inc
> > +++ b/meta/recipes-connectivity/ofono/ofono.inc
> > @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
> >
> > inherit autotools pkgconfig update-rc.d
> >
> > -DEPENDS = "dbus glib-2.0 udev bluez4"
> > +BLUEZDEPENDS = "bluez4"
> > +DEPENDS = "dbus glib-2.0 udev ${@base_contains('DISTRO_FEATURES', 'bluetooth','${BLUEZDEPENDS}', '', d)}"
> is that BLUEZDEPENDS helper var really needed?
I'll rework this patch and send an updated pull-request shortly.
Cheers,
Anders
--
Anders Darander
ChargeStorm AB
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 5/5] create-pull-request: increase likelihood of detecting a rename
2011-08-16 13:57 [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related Anders Darander
` (3 preceding siblings ...)
2011-08-16 13:57 ` [PATCH 4/5] ofono: conditionally enable bluetooth Anders Darander
@ 2011-08-16 13:57 ` Anders Darander
2011-08-23 1:00 ` [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related Saul Wold
5 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-08-16 13:57 UTC (permalink / raw)
To: openembedded-core
Decrease the similarity percentage needed to recognize a delete/add-pair followed by an edit,
as a rename.
This make reviewing patches easier.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
scripts/create-pull-request | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 7d021d3..600fa7a 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -166,7 +166,7 @@ mkdir $ODIR
# Generate the patches and cover letter
-git format-patch -M --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
+git format-patch -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
# Customize the cover letter
--
1.7.5.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related
2011-08-16 13:57 [PATCH 0/5] Miscellaneous fixes: mainly qt- and DISTRO_FEATURES-related Anders Darander
` (4 preceding siblings ...)
2011-08-16 13:57 ` [PATCH 5/5] create-pull-request: increase likelihood of detecting a rename Anders Darander
@ 2011-08-23 1:00 ` Saul Wold
5 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2011-08-23 1:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Anders Darander
On 08/16/2011 06:57 AM, Anders Darander wrote:
>
> A series with some miscellaneous fixes/changes.
>
> Patches:
> 0001: make it possible to build qt4 while disabling certain parts of it.
> 0002: A partial sync of qmake_base.bbclass from meta-oe. Hopefully we should
> be able to delete qmake_base.bbclass from meta-oe after this sync.
> 0003-4: respect wifi and bluetooth in DISTRO_FEATURES while building connman
> and ofono.
> 0005: increase the likelihood that a rename and modification is detected,
> instead of a deleta/add-pair.
>
> Patch 0005 is the patch that is most likely to be controversial. The other
> patches should be of minor impact, and result in a more consistent build
> environment (i.e. better respect for DISTRO_FEATURES).
>
> The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4:
>
> distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. (2011-08-15 15:26:04 +0100)
>
> are available in the git repository at:
> git://github.com/darander/oe-core qt4-fixes
> https://github.com/darander/oe-core/tree/qt4-fixes
>
> Anders Darander (5):
> qt4: allow a reduction in build time
See comments from Richard.
> qmake_base: add uclibceabi
> connman: use DISTRO_FEATURES to enable wifi and bluetooth
> ofono: conditionally enable bluetooth
> create-pull-request: increase likelihood of detecting a rename
>
> meta/classes/qmake_base.bbclass | 2 +-
> meta/recipes-connectivity/connman/connman_0.75.bb | 4 ++--
> meta/recipes-connectivity/ofono/ofono.inc | 3 ++-
> meta/recipes-connectivity/ofono/ofono_0.50.bb | 1 +
> meta/recipes-connectivity/ofono/ofono_git.bb | 4 ++++
> meta/recipes-qt/qt4/qt4.inc | 13 ++++++++-----
> scripts/create-pull-request | 2 +-
> 7 files changed, 19 insertions(+), 10 deletions(-)
>
Merged into OE-Core, except for the Qt4 patch as already commented on by
Richard
Thanks
Sau!
^ permalink raw reply [flat|nested] 13+ messages in thread