* [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun
@ 2014-02-14 21:02 Otavio Salvador
2014-02-14 21:02 ` [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents Otavio Salvador
2014-02-17 17:38 ` [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Denys Dmytriyenko
0 siblings, 2 replies; 9+ messages in thread
From: Otavio Salvador @ 2014-02-14 21:02 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
In case changes are done in do_install and the sstate checksums
change, the task would fail as the qmake binary has already been
replaced. Avoid this error checking for the original filename.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
recipes-qt/qt5/nativesdk-qtbase.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index c4ef6e8..36bc334 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -178,8 +178,10 @@ do_install() {
find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
# switch back the proper qmake
- rm ${B}/bin/qmake
- mv ${B}/bin/qmake-real ${B}/bin/qmake
+ if [ -e ${B}/bin/qmake-real ]; then
+ rm ${B}/bin/qmake
+ mv ${B}/bin/qmake-real ${B}/bin/qmake
+ fi
oe_runmake install INSTALL_ROOT=${D}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents
2014-02-14 21:02 [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Otavio Salvador
@ 2014-02-14 21:02 ` Otavio Salvador
2014-02-17 17:36 ` Denys Dmytriyenko
2014-02-17 17:38 ` [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Denys Dmytriyenko
1 sibling, 1 reply; 9+ messages in thread
From: Otavio Salvador @ 2014-02-14 21:02 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Fixes:
ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped
/opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib
/opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include
/opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share
/opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so
/opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so
...
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
recipes-qt/qt5/nativesdk-qtbase.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index 36bc334..fe80c9b 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -188,4 +188,8 @@ do_install() {
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
# e.g. qt3d, qtwayland
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
+
+ # remove things unused in nativesdk; things are statically link
+ # and we just use the binaries so drop all unused files
+ rm -rf ${D}${includedir} ${D}${libdir} ${D}${datadir}/doc
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents
2014-02-14 21:02 ` [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents Otavio Salvador
@ 2014-02-17 17:36 ` Denys Dmytriyenko
2014-02-17 17:45 ` Otavio Salvador
0 siblings, 1 reply; 9+ messages in thread
From: Denys Dmytriyenko @ 2014-02-17 17:36 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
On Fri, Feb 14, 2014 at 07:02:34PM -0200, Otavio Salvador wrote:
> Fixes:
>
> ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped
> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib
> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include
> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share
> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so
> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so
> ...
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Denys Dmytriyenko <denys@ti.com>
> ---
> recipes-qt/qt5/nativesdk-qtbase.inc | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
> index 36bc334..fe80c9b 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase.inc
> +++ b/recipes-qt/qt5/nativesdk-qtbase.inc
> @@ -188,4 +188,8 @@ do_install() {
> # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
> # e.g. qt3d, qtwayland
> ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
> +
> + # remove things unused in nativesdk; things are statically link
> + # and we just use the binaries so drop all unused files
> + rm -rf ${D}${includedir} ${D}${libdir} ${D}${datadir}/doc
> }
> --
> 1.7.10.4
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun
2014-02-14 21:02 [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Otavio Salvador
2014-02-14 21:02 ` [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents Otavio Salvador
@ 2014-02-17 17:38 ` Denys Dmytriyenko
2014-02-17 17:46 ` Otavio Salvador
1 sibling, 1 reply; 9+ messages in thread
From: Denys Dmytriyenko @ 2014-02-17 17:38 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
On Fri, Feb 14, 2014 at 07:02:33PM -0200, Otavio Salvador wrote:
> In case changes are done in do_install and the sstate checksums
> change, the task would fail as the qmake binary has already been
> replaced. Avoid this error checking for the original filename.
BTW, I was working on a different change in this area, which would do the
qmake swap in ${D} instead of ${B} - that way it would be safe to repeat
do_install if it fails and it would fix the above issue. Would you rather want
that change or keep yours?
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> recipes-qt/qt5/nativesdk-qtbase.inc | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
> index c4ef6e8..36bc334 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase.inc
> +++ b/recipes-qt/qt5/nativesdk-qtbase.inc
> @@ -178,8 +178,10 @@ do_install() {
> find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
>
> # switch back the proper qmake
> - rm ${B}/bin/qmake
> - mv ${B}/bin/qmake-real ${B}/bin/qmake
> + if [ -e ${B}/bin/qmake-real ]; then
> + rm ${B}/bin/qmake
> + mv ${B}/bin/qmake-real ${B}/bin/qmake
> + fi
>
> oe_runmake install INSTALL_ROOT=${D}
>
> --
> 1.7.10.4
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents
2014-02-17 17:36 ` Denys Dmytriyenko
@ 2014-02-17 17:45 ` Otavio Salvador
2014-02-21 21:31 ` Jacob Kroon
0 siblings, 1 reply; 9+ messages in thread
From: Otavio Salvador @ 2014-02-17 17:45 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: OpenEmbedded Devel List
On Mon, Feb 17, 2014 at 2:36 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Fri, Feb 14, 2014 at 07:02:34PM -0200, Otavio Salvador wrote:
>> Fixes:
>>
>> ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped
>> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib
>> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include
>> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share
>> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so
>> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so
>> ...
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> Acked-by: Denys Dmytriyenko <denys@ti.com>
I applied it and found it broke the build afterwards. I fixed this one
(will send the patch in some minutes) but this uncovered another issue
I am working on now.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun
2014-02-17 17:38 ` [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Denys Dmytriyenko
@ 2014-02-17 17:46 ` Otavio Salvador
0 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2014-02-17 17:46 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: OpenEmbedded Devel List
On Mon, Feb 17, 2014 at 2:38 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Fri, Feb 14, 2014 at 07:02:33PM -0200, Otavio Salvador wrote:
>> In case changes are done in do_install and the sstate checksums
>> change, the task would fail as the qmake binary has already been
>> replaced. Avoid this error checking for the original filename.
>
> BTW, I was working on a different change in this area, which would do the
> qmake swap in ${D} instead of ${B} - that way it would be safe to repeat
> do_install if it fails and it would fix the above issue. Would you rather want
> that change or keep yours?
This one has been applied but I'd be open to get yours in top of mine.
I think yours is cleaner.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents
2014-02-17 17:45 ` Otavio Salvador
@ 2014-02-21 21:31 ` Jacob Kroon
2014-02-21 21:46 ` Otavio Salvador
0 siblings, 1 reply; 9+ messages in thread
From: Jacob Kroon @ 2014-02-21 21:31 UTC (permalink / raw)
To: openembedded-devel
On Mon, Feb 17, 2014 at 6:45 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:
> On Mon, Feb 17, 2014 at 2:36 PM, Denys Dmytriyenko <denis@denix.org>
> wrote:
> > On Fri, Feb 14, 2014 at 07:02:34PM -0200, Otavio Salvador wrote:
> >> Fixes:
> >>
> >> ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but
> not shipped
> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib
> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include
> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share
> >>
> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so
> >>
> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so
> >> ...
> >>
> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >
> > Acked-by: Denys Dmytriyenko <denys@ti.com>
>
> I applied it and found it broke the build afterwards. I fixed this one
> (will send the patch in some minutes) but this uncovered another issue
> I am working on now.
>
> I may be wrong, but I think
7d8f8d6b5a00af7a212cce41350f4e1c5989aabd
or
8da5017712a7ddcb8488e095b9aa03b0273f23e9
screws up the package name for nativesdk-qtbase-tools. On my system now, no
nativesdk-qtbase-tools ipk is created, instead the "moc" program is placed
in nativesdk-libqt5core5 ipk.
Adding
DEBIAN_NOAUTONAME_${PN}-tools = "1"
in nativesdk-qtbase.inc restores the created ipk package name to
"nativesdk-qtbase-tools".
-- Jacob
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents
2014-02-21 21:31 ` Jacob Kroon
@ 2014-02-21 21:46 ` Otavio Salvador
2014-02-21 21:56 ` Jacob Kroon
0 siblings, 1 reply; 9+ messages in thread
From: Otavio Salvador @ 2014-02-21 21:46 UTC (permalink / raw)
To: OpenEmbedded Devel List
Hello Jacob,
On Fri, Feb 21, 2014 at 6:31 PM, Jacob Kroon <jacob.kroon@gmail.com> wrote:
> On Mon, Feb 17, 2014 at 6:45 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:
>
>> On Mon, Feb 17, 2014 at 2:36 PM, Denys Dmytriyenko <denis@denix.org>
>> wrote:
>> > On Fri, Feb 14, 2014 at 07:02:34PM -0200, Otavio Salvador wrote:
>> >> Fixes:
>> >>
>> >> ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but
>> not shipped
>> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib
>> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include
>> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share
>> >>
>> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so
>> >>
>> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so
>> >> ...
>> >>
>> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> >
>> > Acked-by: Denys Dmytriyenko <denys@ti.com>
>>
>> I applied it and found it broke the build afterwards. I fixed this one
>> (will send the patch in some minutes) but this uncovered another issue
>> I am working on now.
>>
>> I may be wrong, but I think
>
> 7d8f8d6b5a00af7a212cce41350f4e1c5989aabd
> or
> 8da5017712a7ddcb8488e095b9aa03b0273f23e9
>
> screws up the package name for nativesdk-qtbase-tools. On my system now, no
> nativesdk-qtbase-tools ipk is created, instead the "moc" program is placed
> in nativesdk-libqt5core5 ipk.
>
> Adding
>
> DEBIAN_NOAUTONAME_${PN}-tools = "1"
>
> in nativesdk-qtbase.inc restores the created ipk package name to
> "nativesdk-qtbase-tools".
Indeed; are you going to send a patch for it or want me to handle this?
Regards,
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents
2014-02-21 21:46 ` Otavio Salvador
@ 2014-02-21 21:56 ` Jacob Kroon
0 siblings, 0 replies; 9+ messages in thread
From: Jacob Kroon @ 2014-02-21 21:56 UTC (permalink / raw)
To: openembedded-devel
On Fri, Feb 21, 2014 at 10:46 PM, Otavio Salvador
<otavio@ossystems.com.br>wrote:
> Hello Jacob,
>
> On Fri, Feb 21, 2014 at 6:31 PM, Jacob Kroon <jacob.kroon@gmail.com>
> wrote:
> > On Mon, Feb 17, 2014 at 6:45 PM, Otavio Salvador <
> otavio@ossystems.com.br>wrote:
> >
> >> On Mon, Feb 17, 2014 at 2:36 PM, Denys Dmytriyenko <denis@denix.org>
> >> wrote:
> >> > On Fri, Feb 14, 2014 at 07:02:34PM -0200, Otavio Salvador wrote:
> >> >> Fixes:
> >> >>
> >> >> ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed
> but
> >> not shipped
> >> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib
> >> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include
> >> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share
> >> >>
> >> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so
> >> >>
> >>
> /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so
> >> >> ...
> >> >>
> >> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >> >
> >> > Acked-by: Denys Dmytriyenko <denys@ti.com>
> >>
> >> I applied it and found it broke the build afterwards. I fixed this one
> >> (will send the patch in some minutes) but this uncovered another issue
> >> I am working on now.
> >>
> >> I may be wrong, but I think
> >
> > 7d8f8d6b5a00af7a212cce41350f4e1c5989aabd
> > or
> > 8da5017712a7ddcb8488e095b9aa03b0273f23e9
> >
> > screws up the package name for nativesdk-qtbase-tools. On my system now,
> no
> > nativesdk-qtbase-tools ipk is created, instead the "moc" program is
> placed
> > in nativesdk-libqt5core5 ipk.
> >
> > Adding
> >
> > DEBIAN_NOAUTONAME_${PN}-tools = "1"
> >
> > in nativesdk-qtbase.inc restores the created ipk package name to
> > "nativesdk-qtbase-tools".
>
> Indeed; are you going to send a patch for it or want me to handle this?
>
>
Sure, I can send a patch, I just wasn't sure wether this fix was correct or
not.
-- Jacob
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-02-21 21:56 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-14 21:02 [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Otavio Salvador
2014-02-14 21:02 ` [meta-qt5][PATCH 2/2] nativesdk-qtbase.inc: Remove unused contents Otavio Salvador
2014-02-17 17:36 ` Denys Dmytriyenko
2014-02-17 17:45 ` Otavio Salvador
2014-02-21 21:31 ` Jacob Kroon
2014-02-21 21:46 ` Otavio Salvador
2014-02-21 21:56 ` Jacob Kroon
2014-02-17 17:38 ` [meta-qt5][PATCH 1/2] nativesdk-qtbase: Fix install error in case install task is rerun Denys Dmytriyenko
2014-02-17 17:46 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.