qt4-x11-free with PACKAGE_ARCH=palmpre :/
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,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 1/1 qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre
--- 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(-)
recipes/qt4/qt-4.6.3.inc +0 -3
@@ -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() {
recipes/qt4/qt-4.7.3.inc +0 -3
@@ -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"
recipes/qt4/qt4-embedded.inc +0 -3
@@ -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 += " \
recipes/qt4/qt4-embedded_4.6.3.bb +4 -0
@@ -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"
recipes/qt4/qt4-embedded_4.7.3.bb +4 -0
@@ -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 \ "
Signature · 1 line
1.7.5.rc3
Re: [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre
Quoted 68 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- 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(-)recipes/qt4/qt-4.6.3.inc +0
-3@@ -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() {recipes/qt4/qt-4.7.3.inc +0
-3@@ -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"recipes/qt4/qt4-embedded.inc +0
-3@@ -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 += " \recipes/qt4/qt4-embedded_4.6.3.bb +4
-0@@ -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"recipes/qt4/qt4-embedded_4.7.3.bb +0
-0
recipes/qt4/qt4-embedded_4.7.3.bb QT_CONFIG_FLAGS_append_armv6 = " -no-neon " · line 17
Quoted 10 lines
recipes/qt4/qt4-embedded_4.7.3.bb +4
-0@@ -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
Re: [PATCH] qt4: remove qte.sh from shared SRC_URI and PACKAGE_ARCH_palmpre
Quoted 72 lines · Simon Busch
Quoted 71 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- 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(-)recipes/qt4/qt-4.6.3.inc +0
-3@@ -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() {recipes/qt4/qt-4.7.3.inc +0
-3@@ -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"recipes/qt4/qt4-embedded.inc +0
-3@@ -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 += " \recipes/qt4/qt4-embedded_4.6.3.bb +4
-0@@ -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"recipes/qt4/qt4-embedded_4.7.3.bb +0
-0@@ -8,6 +8,10 @@ QT_CONFIG_FLAGS_append_armv6 = " -no-neon " require qt-${PV}.inc
Quoted 10 lines
recipes/qt4/qt4-embedded_4.7.3.bb QT_CONFIG_FLAGS_append_armv6 = " -no-neon " · line 17
Quoted 7 lines
recipes/qt4/qt4-embedded_4.7.3.bb +4
-0+# 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,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 14 lines · Martin Jansa
Hi,
8a8dbc88232935835c1698cdf162bdf02fc1701b
qt4-embedded: add palmpre specific profile script and bump PRsets
PACKAGE_ARCH_palmpre= "${MACHINE_ARCH}" only in qt4-embedded.inc, but machine specific fileqt4/files/palmpre/qte.sh
is included *also* in shared qt-${PV}.incSRC_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"
Quoted 6 lines
which makes qt4-x11-free also
MACHINE_ARCHbecause of utils.bbclass:machine_pathsI don't see
qte.shused in qt4-x11-free so I'm going to remove it from .inc file as well asPACKAGE_ARCH_palmprewhich 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.
Quoted 1 line
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