On 28.05.2011 10:09, Martin Jansa wrote: > 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(-) > > 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 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
