* qt4-x11-free with PACKAGE_ARCH=palmpre :/
@ 2011-05-28 8:01 Martin Jansa
2011-05-28 8:09 ` [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre Martin Jansa
2011-05-28 14:27 ` qt4-x11-free with PACKAGE_ARCH=palmpre :/ Simon Busch
0 siblings, 2 replies; 5+ messages in thread
From: Martin Jansa @ 2011-05-28 8:01 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
Hi,
8a8dbc88232935835c1698cdf162bdf02fc1701b
qt4-embedded: add palmpre specific profile script and bump PR
sets PACKAGE_ARCH_palmpre = "${MACHINE_ARCH}" only in
qt4-embedded.inc, but machine specific file
qt4/files/palmpre/qte.sh
is included *also* in shared qt-${PV}.inc SRC_URI
./qt-4.7.3.inc:SRC_URI += "file://qte.sh"
./qt-4.6.3.inc:SRC_URI += "file://qte.sh"
./qt4-embedded.inc:SRC_URI += "file://qte.sh"
which makes qt4-x11-free also MACHINE_ARCH because of
utils.bbclass:machine_paths
I don't see qte.sh used in qt4-x11-free so I'm going to remove it from
.inc file as well as PACKAGE_ARCH_palmpre which is detected fine by
utils.bbclass.
I'll attach patch, please test, because I'm using qt4-x11-free only.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre 2011-05-28 8:01 qt4-x11-free with PACKAGE_ARCH=palmpre :/ Martin Jansa @ 2011-05-28 8:09 ` Martin Jansa 2011-05-28 14:28 ` Simon Busch 2011-05-28 14:27 ` qt4-x11-free with PACKAGE_ARCH=palmpre :/ Simon Busch 1 sibling, 1 reply; 5+ messages in thread From: Martin Jansa @ 2011-05-28 8:09 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- recipes/qt4/qt-4.6.3.inc | 3 --- recipes/qt4/qt-4.7.3.inc | 3 --- recipes/qt4/qt4-embedded.inc | 3 --- recipes/qt4/qt4-embedded_4.6.3.bb | 4 ++++ recipes/qt4/qt4-embedded_4.7.3.bb | 4 ++++ 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/recipes/qt4/qt-4.6.3.inc b/recipes/qt4/qt-4.6.3.inc index a35d57a..36c6a56 100644 --- a/recipes/qt4/qt-4.6.3.inc +++ b/recipes/qt4/qt-4.6.3.inc @@ -19,9 +19,6 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. file://linux.conf \ " -# Set necessary variables in the profile -SRC_URI += "file://qte.sh" - S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" do_configure_prepend() { diff --git a/recipes/qt4/qt-4.7.3.inc b/recipes/qt4/qt-4.7.3.inc index 2450144..b29d892 100644 --- a/recipes/qt4/qt-4.7.3.inc +++ b/recipes/qt4/qt-4.7.3.inc @@ -16,9 +16,6 @@ SRC_URI = "\ file://linux.conf \ " -# Set necessary variables in the profile -SRC_URI += "file://qte.sh" - S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 147126d..168a867 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -28,9 +28,6 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ # Set necessary variables in the profile SRC_URI += "file://qte.sh" -# For the palmpre we ship a modified qte.sh -PACKAGE_ARCH_palmpre = "${MACHINE_ARCH}" - S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" QT_CONFIG_FLAGS += " \ diff --git a/recipes/qt4/qt4-embedded_4.6.3.bb b/recipes/qt4/qt4-embedded_4.6.3.bb index fe49fdb..8c883f5 100644 --- a/recipes/qt4/qt4-embedded_4.6.3.bb +++ b/recipes/qt4/qt4-embedded_4.6.3.bb @@ -5,3 +5,7 @@ PR = "${INC_PR}.2" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " require qt-${PV}.inc + +# SRC_URI from qt4-embedded.inc was replaced in .inc above and qte.sh lost +# Set necessary variables in the profile +SRC_URI += "file://qte.sh" diff --git a/recipes/qt4/qt4-embedded_4.7.3.bb b/recipes/qt4/qt4-embedded_4.7.3.bb index 7e3d4b8..47176a9 100644 --- a/recipes/qt4/qt4-embedded_4.7.3.bb +++ b/recipes/qt4/qt4-embedded_4.7.3.bb @@ -8,6 +8,10 @@ QT_CONFIG_FLAGS_append_armv6 = " -no-neon " require qt-${PV}.inc +# SRC_URI from qt4-embedded.inc was replaced in .inc above and qte.sh lost +# Set necessary variables in the profile +SRC_URI += "file://qte.sh" + QT_CONFIG_FLAGS += " \ -exceptions \ " -- 1.7.5.rc3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre 2011-05-28 8:09 ` [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre Martin Jansa @ 2011-05-28 14:28 ` Simon Busch 2011-05-28 14:51 ` Martin Jansa 0 siblings, 1 reply; 5+ messages in thread From: Simon Busch @ 2011-05-28 14:28 UTC (permalink / raw) To: openembedded-devel On 28.05.2011 10:09, Martin Jansa wrote: > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > recipes/qt4/qt-4.6.3.inc | 3 --- > recipes/qt4/qt-4.7.3.inc | 3 --- > recipes/qt4/qt4-embedded.inc | 3 --- > recipes/qt4/qt4-embedded_4.6.3.bb | 4 ++++ > recipes/qt4/qt4-embedded_4.7.3.bb | 4 ++++ > 5 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/recipes/qt4/qt-4.6.3.inc b/recipes/qt4/qt-4.6.3.inc > index a35d57a..36c6a56 100644 > --- a/recipes/qt4/qt-4.6.3.inc > +++ b/recipes/qt4/qt-4.6.3.inc > @@ -19,9 +19,6 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. > file://linux.conf \ > " > > -# Set necessary variables in the profile > -SRC_URI += "file://qte.sh" > - > S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" > > do_configure_prepend() { > diff --git a/recipes/qt4/qt-4.7.3.inc b/recipes/qt4/qt-4.7.3.inc > index 2450144..b29d892 100644 > --- a/recipes/qt4/qt-4.7.3.inc > +++ b/recipes/qt4/qt-4.7.3.inc > @@ -16,9 +16,6 @@ SRC_URI = "\ > file://linux.conf \ > " > > -# Set necessary variables in the profile > -SRC_URI += "file://qte.sh" > - > S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" > > FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" > diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc > index 147126d..168a867 100644 > --- a/recipes/qt4/qt4-embedded.inc > +++ b/recipes/qt4/qt4-embedded.inc > @@ -28,9 +28,6 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ > # Set necessary variables in the profile > SRC_URI += "file://qte.sh" > > -# For the palmpre we ship a modified qte.sh > -PACKAGE_ARCH_palmpre = "${MACHINE_ARCH}" > - > S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" > > QT_CONFIG_FLAGS += " \ > diff --git a/recipes/qt4/qt4-embedded_4.6.3.bb b/recipes/qt4/qt4-embedded_4.6.3.bb > index fe49fdb..8c883f5 100644 > --- a/recipes/qt4/qt4-embedded_4.6.3.bb > +++ b/recipes/qt4/qt4-embedded_4.6.3.bb > @@ -5,3 +5,7 @@ PR = "${INC_PR}.2" > QT_CONFIG_FLAGS_append_armv6 = " -no-neon " > > require qt-${PV}.inc > + > +# SRC_URI from qt4-embedded.inc was replaced in .inc above and qte.sh lost > +# Set necessary variables in the profile > +SRC_URI += "file://qte.sh" > diff --git a/recipes/qt4/qt4-embedded_4.7.3.bb b/recipes/qt4/qt4-embedded_4.7.3.bb > index 7e3d4b8..47176a9 100644 > --- a/recipes/qt4/qt4-embedded_4.7.3.bb > +++ b/recipes/qt4/qt4-embedded_4.7.3.bb > @@ -8,6 +8,10 @@ QT_CONFIG_FLAGS_append_armv6 = " -no-neon " > > require qt-${PV}.inc > > +# SRC_URI from qt4-embedded.inc was replaced in .inc above and qte.sh lost > +# Set necessary variables in the profile > +SRC_URI += "file://qte.sh" > + > QT_CONFIG_FLAGS += " \ > -exceptions \ > " Isn't this needing a PR bump? Are we safe that the package is exactly the same as before? regards, Simon ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre 2011-05-28 14:28 ` Simon Busch @ 2011-05-28 14:51 ` Martin Jansa 0 siblings, 0 replies; 5+ messages in thread From: Martin Jansa @ 2011-05-28 14:51 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 3934 bytes --] On Sat, May 28, 2011 at 04:28:43PM +0200, Simon Busch wrote: > On 28.05.2011 10:09, Martin Jansa wrote: > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > > --- > > recipes/qt4/qt-4.6.3.inc | 3 --- > > recipes/qt4/qt-4.7.3.inc | 3 --- > > recipes/qt4/qt4-embedded.inc | 3 --- > > recipes/qt4/qt4-embedded_4.6.3.bb | 4 ++++ > > recipes/qt4/qt4-embedded_4.7.3.bb | 4 ++++ > > 5 files changed, 8 insertions(+), 9 deletions(-) > > > > diff --git a/recipes/qt4/qt-4.6.3.inc b/recipes/qt4/qt-4.6.3.inc > > index a35d57a..36c6a56 100644 > > --- a/recipes/qt4/qt-4.6.3.inc > > +++ b/recipes/qt4/qt-4.6.3.inc > > @@ -19,9 +19,6 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. > > file://linux.conf \ > > " > > > > -# Set necessary variables in the profile > > -SRC_URI += "file://qte.sh" > > - > > S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" > > > > do_configure_prepend() { > > diff --git a/recipes/qt4/qt-4.7.3.inc b/recipes/qt4/qt-4.7.3.inc > > index 2450144..b29d892 100644 > > --- a/recipes/qt4/qt-4.7.3.inc > > +++ b/recipes/qt4/qt-4.7.3.inc > > @@ -16,9 +16,6 @@ SRC_URI = "\ > > file://linux.conf \ > > " > > > > -# Set necessary variables in the profile > > -SRC_URI += "file://qte.sh" > > - > > S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" > > > > FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" > > diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc > > index 147126d..168a867 100644 > > --- a/recipes/qt4/qt4-embedded.inc > > +++ b/recipes/qt4/qt4-embedded.inc > > @@ -28,9 +28,6 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ > > # Set necessary variables in the profile > > SRC_URI += "file://qte.sh" > > > > -# For the palmpre we ship a modified qte.sh > > -PACKAGE_ARCH_palmpre = "${MACHINE_ARCH}" > > - > > S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" > > > > QT_CONFIG_FLAGS += " \ > > diff --git a/recipes/qt4/qt4-embedded_4.6.3.bb b/recipes/qt4/qt4-embedded_4.6.3.bb > > index fe49fdb..8c883f5 100644 > > --- a/recipes/qt4/qt4-embedded_4.6.3.bb > > +++ b/recipes/qt4/qt4-embedded_4.6.3.bb > > @@ -5,3 +5,7 @@ PR = "${INC_PR}.2" > > QT_CONFIG_FLAGS_append_armv6 = " -no-neon " > > > > require qt-${PV}.inc > > + > > +# SRC_URI from qt4-embedded.inc was replaced in .inc above and qte.sh lost > > +# Set necessary variables in the profile > > +SRC_URI += "file://qte.sh" > > diff --git a/recipes/qt4/qt4-embedded_4.7.3.bb b/recipes/qt4/qt4-embedded_4.7.3.bb > > index 7e3d4b8..47176a9 100644 > > --- a/recipes/qt4/qt4-embedded_4.7.3.bb > > +++ b/recipes/qt4/qt4-embedded_4.7.3.bb > > @@ -8,6 +8,10 @@ QT_CONFIG_FLAGS_append_armv6 = " -no-neon " > > > > require qt-${PV}.inc > > > > +# SRC_URI from qt4-embedded.inc was replaced in .inc above and qte.sh lost > > +# Set necessary variables in the profile > > +SRC_URI += "file://qte.sh" > > + > > QT_CONFIG_FLAGS += " \ > > -exceptions \ > > " > > Isn't this needing a PR bump? Are we safe that the package is exactly > the same as before? PR bump would be usefull only to test that I didn't break SRC_URI for qt4-embedded (which you can test after -c clean) and to rebuild qt4-x11-free with FEED_ARCH instead of MACHINE_ARCH but it can be rebuilt with next change (I've killed build on shr buildhost when I noticed building palmpre specific..). I think buildsystem in ${S} is not looking for qte.sh in ${WORKDIR} and we're using qte.sh in recipe only for embedded version, so I bet resulting packages are the same. Please confirm that I didn't break SRC_URI in qt4-embedded and if no I'll push it without PR bump (it takes really long to build :)). Regards, -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: qt4-x11-free with PACKAGE_ARCH=palmpre :/ 2011-05-28 8:01 qt4-x11-free with PACKAGE_ARCH=palmpre :/ Martin Jansa 2011-05-28 8:09 ` [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre Martin Jansa @ 2011-05-28 14:27 ` Simon Busch 1 sibling, 0 replies; 5+ messages in thread From: Simon Busch @ 2011-05-28 14:27 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel On 28.05.2011 10:01, Martin Jansa wrote: > Hi, > > 8a8dbc88232935835c1698cdf162bdf02fc1701b > qt4-embedded: add palmpre specific profile script and bump PR > > sets PACKAGE_ARCH_palmpre = "${MACHINE_ARCH}" only in > qt4-embedded.inc, but machine specific file > qt4/files/palmpre/qte.sh > is included *also* in shared qt-${PV}.inc SRC_URI > > ./qt-4.7.3.inc:SRC_URI += "file://qte.sh" > ./qt-4.6.3.inc:SRC_URI += "file://qte.sh" > ./qt4-embedded.inc:SRC_URI += "file://qte.sh" > > which makes qt4-x11-free also MACHINE_ARCH because of > utils.bbclass:machine_paths > > I don't see qte.sh used in qt4-x11-free so I'm going to remove it from > .inc file as well as PACKAGE_ARCH_palmpre which is detected fine by > utils.bbclass. Ok, I didn't that PACKAGE_ARCH is automatically set to MACHINE_ARCH when I include a file subdirectory specific for that machine I am building for. > I'll attach patch, please test, because I'm using qt4-x11-free only. Will comment on the patch in a separate mail after I build the qt4-embedded version with the patch included. regards, Simon ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-05-28 14:55 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-05-28 8:01 qt4-x11-free with PACKAGE_ARCH=palmpre :/ Martin Jansa 2011-05-28 8:09 ` [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre Martin Jansa 2011-05-28 14:28 ` Simon Busch 2011-05-28 14:51 ` Martin Jansa 2011-05-28 14:27 ` qt4-x11-free with PACKAGE_ARCH=palmpre :/ Simon Busch
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox