All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
@ 2014-05-01 20:01 Donald R. Poole, Jr.
  2014-05-01 21:03 ` Martin Jansa
  2014-05-04 21:28 ` Martin Jansa
  0 siblings, 2 replies; 12+ messages in thread
From: Donald R. Poole, Jr. @ 2014-05-01 20:01 UTC (permalink / raw)
  To: openembedded-devel

From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>

Currently, if you are building native applications with Qt5, the current qmake5_base_do_install() method assumes an install into the image folder for the target. Since the native builds handle this a little differently, this patch should account for the native install scenario.
---
 classes/qmake5_base.bbclass |   37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 18fdb2a..df8a59a 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -163,23 +163,30 @@ qmake5_base_do_configure () {
 
 qmake5_base_do_install() {
     # Fix install paths for all
-    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
+    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
+        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
+    else
+        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
+    fi
 
     oe_runmake install INSTALL_ROOT=${D}
 
-    # everything except HostData and HostBinaries is prefixed with sysroot value,
-    # but we cannot remove sysroot override, because that's useful for pkg-config etc
-    # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
-    # fix them manually
-    if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}" ] ; then
-        echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
-        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
-        rm -rf ${D}${STAGING_DIR_TARGET}
-        # remove empty dirs
-        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
-        while test ${TMP} != ${D}; do
-            rmdir ${TMP}
-            TMP=`dirname ${TMP}`;
-        done
+    # Only do this for target builds. Native install work a little differently
+    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
+        # everything except HostData and HostBinaries is prefixed with sysroot value,
+        # but we cannot remove sysroot override, because that's useful for pkg-config etc
+        # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
+        # fix them manually
+        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}" ] ; then
+            echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
+            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
+            rm -rf ${D}${STAGING_DIR_TARGET}
+            # remove empty dirs
+            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
+            while test ${TMP} != ${D}; do
+                rmdir ${TMP}
+                TMP=`dirname ${TMP}`;
+            done
+        fi
     fi
 }
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-01 20:01 [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds Donald R. Poole, Jr.
@ 2014-05-01 21:03 ` Martin Jansa
  2014-05-01 21:14   ` Donald Poole
  2014-05-02 18:44   ` Poole Jr, Donald R.
  2014-05-04 21:28 ` Martin Jansa
  1 sibling, 2 replies; 12+ messages in thread
From: Martin Jansa @ 2014-05-01 21:03 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 3511 bytes --]

On Thu, May 01, 2014 at 03:01:01PM -0500, Donald R. Poole, Jr. wrote:
> From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>
> 
> Currently, if you are building native applications with Qt5, the current qmake5_base_do_install() method assumes an install into the image folder for the target. Since the native builds handle this a little differently, this patch should account for the native install scenario.

Can you explain a bit why you're building qt5 native application? Is it
used to build some target packages?

> ---
>  classes/qmake5_base.bbclass |   37 ++++++++++++++++++++++---------------
>  1 file changed, 22 insertions(+), 15 deletions(-)
> 
> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> index 18fdb2a..df8a59a 100644
> --- a/classes/qmake5_base.bbclass
> +++ b/classes/qmake5_base.bbclass
> @@ -163,23 +163,30 @@ qmake5_base_do_configure () {
>  
>  qmake5_base_do_install() {
>      # Fix install paths for all
> -    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> +    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
> +        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
> +    else
> +        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> +    fi
>  
>      oe_runmake install INSTALL_ROOT=${D}
>  
> -    # everything except HostData and HostBinaries is prefixed with sysroot value,
> -    # but we cannot remove sysroot override, because that's useful for pkg-config etc
> -    # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
> -    # fix them manually
> -    if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}" ] ; then
> -        echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
> -        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> -        rm -rf ${D}${STAGING_DIR_TARGET}
> -        # remove empty dirs
> -        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> -        while test ${TMP} != ${D}; do
> -            rmdir ${TMP}
> -            TMP=`dirname ${TMP}`;
> -        done
> +    # Only do this for target builds. Native install work a little differently
> +    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
> +        # everything except HostData and HostBinaries is prefixed with sysroot value,
> +        # but we cannot remove sysroot override, because that's useful for pkg-config etc
> +        # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
> +        # fix them manually
> +        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}" ] ; then
> +            echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
> +            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> +            rm -rf ${D}${STAGING_DIR_TARGET}
> +            # remove empty dirs
> +            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> +            while test ${TMP} != ${D}; do
> +                rmdir ${TMP}
> +                TMP=`dirname ${TMP}`;
> +            done
> +        fi
>      fi
>  }
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-01 21:03 ` Martin Jansa
@ 2014-05-01 21:14   ` Donald Poole
  2014-05-02 18:44   ` Poole Jr, Donald R.
  1 sibling, 0 replies; 12+ messages in thread
From: Donald Poole @ 2014-05-01 21:14 UTC (permalink / raw)
  To: openembedded-devel

Yes, I have a Qt5 application that I need to build to run on the host
machine to generated some of the target application code.
On May 1, 2014 4:03 PM, "Martin Jansa" <martin.jansa@gmail.com> wrote:

> On Thu, May 01, 2014 at 03:01:01PM -0500, Donald R. Poole, Jr. wrote:
> > From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>
> >
> > Currently, if you are building native applications with Qt5, the current
> qmake5_base_do_install() method assumes an install into the image folder
> for the target. Since the native builds handle this a little differently,
> this patch should account for the native install scenario.
>
> Can you explain a bit why you're building qt5 native application? Is it
> used to build some target packages?
>
> > ---
> >  classes/qmake5_base.bbclass |   37 ++++++++++++++++++++++---------------
> >  1 file changed, 22 insertions(+), 15 deletions(-)
> >
> > diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> > index 18fdb2a..df8a59a 100644
> > --- a/classes/qmake5_base.bbclass
> > +++ b/classes/qmake5_base.bbclass
> > @@ -163,23 +163,30 @@ qmake5_base_do_configure () {
> >
> >  qmake5_base_do_install() {
> >      # Fix install paths for all
> > -    find -name "Makefile*" | xargs sed -i
> "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> > +    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
> > +        find -name "Makefile*" | xargs sed -i
> "s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
> > +    else
> > +        find -name "Makefile*" | xargs sed -i
> "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> > +    fi
> >
> >      oe_runmake install INSTALL_ROOT=${D}
> >
> > -    # everything except HostData and HostBinaries is prefixed with
> sysroot value,
> > -    # but we cannot remove sysroot override, because that's useful for
> pkg-config etc
> > -    # In some cases like QtQmlDevTools in qtdeclarative, the sed above
> does not work,
> > -    # fix them manually
> > -    if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}"
> ] ; then
> > -        echo "Some files are installed in wrong directory
> ${D}${STAGING_DIR_TARGET}"
> > -        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> > -        rm -rf ${D}${STAGING_DIR_TARGET}
> > -        # remove empty dirs
> > -        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> > -        while test ${TMP} != ${D}; do
> > -            rmdir ${TMP}
> > -            TMP=`dirname ${TMP}`;
> > -        done
> > +    # Only do this for target builds. Native install work a little
> differently
> > +    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
> > +        # everything except HostData and HostBinaries is prefixed with
> sysroot value,
> > +        # but we cannot remove sysroot override, because that's useful
> for pkg-config etc
> > +        # In some cases like QtQmlDevTools in qtdeclarative, the sed
> above does not work,
> > +        # fix them manually
> > +        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n
> "${STAGING_DIR_TARGET}" ] ; then
> > +            echo "Some files are installed in wrong directory
> ${D}${STAGING_DIR_TARGET}"
> > +            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> > +            rm -rf ${D}${STAGING_DIR_TARGET}
> > +            # remove empty dirs
> > +            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> > +            while test ${TMP} != ${D}; do
> > +                rmdir ${TMP}
> > +                TMP=`dirname ${TMP}`;
> > +            done
> > +        fi
> >      fi
> >  }
> > --
> > 1.7.9.5
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-01 21:03 ` Martin Jansa
  2014-05-01 21:14   ` Donald Poole
@ 2014-05-02 18:44   ` Poole Jr, Donald R.
  2014-05-02 20:46     ` Otavio Salvador
  1 sibling, 1 reply; 12+ messages in thread
From: Poole Jr, Donald R. @ 2014-05-02 18:44 UTC (permalink / raw)
  To: openembedded-devel@lists.openembedded.org

Martin, et. al,

What is the processes for patch submission review? Does the review team
review and test the patch and then report it¹s acceptance?

Donald R. Poole, Jr.
Research Engineer
Voice: 210.522.3131 | Fax: 210.522.4931
Tactical Networks & Communications (tacticalnetworks.swri.org)
Southwest Research Institute (SwRI)


On 5/1/14, 4:03 PM, "Martin Jansa" <martin.jansa@gmail.com> wrote:

>On Thu, May 01, 2014 at 03:01:01PM -0500, Donald R. Poole, Jr. wrote:
>> From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>
>> 
>> Currently, if you are building native applications with Qt5, the
>>current qmake5_base_do_install() method assumes an install into the
>>image folder for the target. Since the native builds handle this a
>>little differently, this patch should account for the native install
>>scenario.
>
>Can you explain a bit why you're building qt5 native application? Is it
>used to build some target packages?
>
>> ---
>>  classes/qmake5_base.bbclass |   37
>>++++++++++++++++++++++---------------
>>  1 file changed, 22 insertions(+), 15 deletions(-)
>> 
>> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
>> index 18fdb2a..df8a59a 100644
>> --- a/classes/qmake5_base.bbclass
>> +++ b/classes/qmake5_base.bbclass
>> @@ -163,23 +163,30 @@ qmake5_base_do_configure () {
>>  
>>  qmake5_base_do_install() {
>>      # Fix install paths for all
>> -    find -name "Makefile*" | xargs sed -i
>>"s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
>> +    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
>> +        find -name "Makefile*" | xargs sed -i
>>"s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
>> +    else
>> +        find -name "Makefile*" | xargs sed -i
>>"s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
>> +    fi
>>  
>>      oe_runmake install INSTALL_ROOT=${D}
>>  
>> -    # everything except HostData and HostBinaries is prefixed with
>>sysroot value,
>> -    # but we cannot remove sysroot override, because that's useful for
>>pkg-config etc
>> -    # In some cases like QtQmlDevTools in qtdeclarative, the sed above
>>does not work,
>> -    # fix them manually
>> -    if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n
>>"${STAGING_DIR_TARGET}" ] ; then
>> -        echo "Some files are installed in wrong directory
>>${D}${STAGING_DIR_TARGET}"
>> -        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
>> -        rm -rf ${D}${STAGING_DIR_TARGET}
>> -        # remove empty dirs
>> -        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
>> -        while test ${TMP} != ${D}; do
>> -            rmdir ${TMP}
>> -            TMP=`dirname ${TMP}`;
>> -        done
>> +    # Only do this for target builds. Native install work a little
>>differently
>> +    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
>> +        # everything except HostData and HostBinaries is prefixed with
>>sysroot value,
>> +        # but we cannot remove sysroot override, because that's useful
>>for pkg-config etc
>> +        # In some cases like QtQmlDevTools in qtdeclarative, the sed
>>above does not work,
>> +        # fix them manually
>> +        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n
>>"${STAGING_DIR_TARGET}" ] ; then
>> +            echo "Some files are installed in wrong directory
>>${D}${STAGING_DIR_TARGET}"
>> +            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
>> +            rm -rf ${D}${STAGING_DIR_TARGET}
>> +            # remove empty dirs
>> +            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
>> +            while test ${TMP} != ${D}; do
>> +                rmdir ${TMP}
>> +                TMP=`dirname ${TMP}`;
>> +            done
>> +        fi
>>      fi
>>  }
>> -- 
>> 1.7.9.5
>> 
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>-- 
>Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-02 18:44   ` Poole Jr, Donald R.
@ 2014-05-02 20:46     ` Otavio Salvador
  2014-05-02 20:49       ` Poole Jr, Donald R.
  0 siblings, 1 reply; 12+ messages in thread
From: Otavio Salvador @ 2014-05-02 20:46 UTC (permalink / raw)
  To: OpenEmbedded Devel List

On Fri, May 2, 2014 at 3:44 PM, Poole Jr, Donald R.
<donald.poole@swri.org> wrote:
> Martin, et. al,
>
> What is the processes for patch submission review? Does the review team
> review and test the patch and then report it¹s acceptance?

We all can review; we test it and try to discuss if we find anything
which might be problematic.

Usually people has a knowledge in a specific area and those people
usually are awaited for their feedback before merging anything.

-- 
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] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-02 20:46     ` Otavio Salvador
@ 2014-05-02 20:49       ` Poole Jr, Donald R.
  0 siblings, 0 replies; 12+ messages in thread
From: Poole Jr, Donald R. @ 2014-05-02 20:49 UTC (permalink / raw)
  To: openembedded-devel@lists.openembedded.org

On 5/2/14, 3:46 PM, "Otavio Salvador" <otavio@ossystems.com.br> wrote:


>On Fri, May 2, 2014 at 3:44 PM, Poole Jr, Donald R.
><donald.poole@swri.org> wrote:
>> Martin, et. al,
>>
>> What is the processes for patch submission review? Does the review team
>> review and test the patch and then report it¹s acceptance?
>
>We all can review; we test it and try to discuss if we find anything
>which might be problematic.
>
>Usually people has a knowledge in a specific area and those people
>usually are awaited for their feedback before merging anything.
>
>-- 
>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
>-- 
>_______________________________________________
>Openembedded-devel mailing list
>Openembedded-devel@lists.openembedded.org
>http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Thanks Otavio. I just want to be sure that I’m complying with protocol.

Donald R. Poole, Jr.
Research Engineer
Voice: 210.522.3131 | Fax: 210.522.4931
Tactical Networks & Communications (tacticalnetworks.swri.org)
Southwest Research Institute (SwRI)


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-01 20:01 [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds Donald R. Poole, Jr.
  2014-05-01 21:03 ` Martin Jansa
@ 2014-05-04 21:28 ` Martin Jansa
  1 sibling, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2014-05-04 21:28 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 3690 bytes --]

On Thu, May 01, 2014 at 03:01:01PM -0500, Donald R. Poole, Jr. wrote:
> From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>
> 
> Currently, if you are building native applications with Qt5, the current qmake5_base_do_install() method assumes an install into the image folder for the target. Since the native builds handle this a little differently, this patch should account for the native install scenario.
> ---
>  classes/qmake5_base.bbclass |   37 ++++++++++++++++++++++---------------
>  1 file changed, 22 insertions(+), 15 deletions(-)
> 
> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> index 18fdb2a..df8a59a 100644
> --- a/classes/qmake5_base.bbclass
> +++ b/classes/qmake5_base.bbclass
> @@ -163,23 +163,30 @@ qmake5_base_do_configure () {
>  
>  qmake5_base_do_install() {

I think it would be more readable if we use
qmake5_base_do_install_class-target
qmake5_base_do_install_class-native
qmake5_base_do_install_class-nativesdk

instead of "${BUILD_SYS}" = "${HOST_SYS}" inline, can you please update
patch that way and test it on your use-case? thanks


>      # Fix install paths for all
> -    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> +    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
> +        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
> +    else
> +        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> +    fi
>  
>      oe_runmake install INSTALL_ROOT=${D}
>  
> -    # everything except HostData and HostBinaries is prefixed with sysroot value,
> -    # but we cannot remove sysroot override, because that's useful for pkg-config etc
> -    # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
> -    # fix them manually
> -    if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}" ] ; then
> -        echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
> -        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> -        rm -rf ${D}${STAGING_DIR_TARGET}
> -        # remove empty dirs
> -        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> -        while test ${TMP} != ${D}; do
> -            rmdir ${TMP}
> -            TMP=`dirname ${TMP}`;
> -        done
> +    # Only do this for target builds. Native install work a little differently
> +    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
> +        # everything except HostData and HostBinaries is prefixed with sysroot value,
> +        # but we cannot remove sysroot override, because that's useful for pkg-config etc
> +        # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
> +        # fix them manually
> +        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}" ] ; then
> +            echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
> +            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> +            rm -rf ${D}${STAGING_DIR_TARGET}
> +            # remove empty dirs
> +            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> +            while test ${TMP} != ${D}; do
> +                rmdir ${TMP}
> +                TMP=`dirname ${TMP}`;
> +            done
> +        fi
>      fi
>  }
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
@ 2014-05-06 18:34 Donald R. Poole, Jr.
  2014-05-06 18:34 ` Donald R. Poole, Jr.
  0 siblings, 1 reply; 12+ messages in thread
From: Donald R. Poole, Jr. @ 2014-05-06 18:34 UTC (permalink / raw)
  To: openembedded-devel


Martin,
I have updated the patch per you last message and confirmed that it still works for my use-case.


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-06 18:34 Donald R. Poole, Jr.
@ 2014-05-06 18:34 ` Donald R. Poole, Jr.
  2014-05-09 12:50   ` Martin Jansa
  0 siblings, 1 reply; 12+ messages in thread
From: Donald R. Poole, Jr. @ 2014-05-06 18:34 UTC (permalink / raw)
  To: openembedded-devel

From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>

Currently, if you are building native applications with Qt5, the current qmake5_base_do_install() method assumes an install into the image folder for the target. Since the native builds handle this a little differently, this patch should account for the native install scenario.
---
 classes/qmake5.bbclass      |    8 ++++++--
 classes/qmake5_base.bbclass |   46 +++++++++++++++++++++----------------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
index e1dda0d..01454f3 100644
--- a/classes/qmake5.bbclass
+++ b/classes/qmake5.bbclass
@@ -19,6 +19,10 @@ do_configure() {
     qmake5_base_do_configure
 }
 
-do_install() {
-    qmake5_base_do_install
+do_install_class-target() {
+    qmake5_base_do_install_target
+}
+
+do_install_class-native() {
+    qmake5_base_do_install_native
 }
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index df8a59a..5a380d0 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -161,32 +161,32 @@ qmake5_base_do_configure () {
     ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD"
 }
 
-qmake5_base_do_install() {
+qmake5_base_do_install_target() {
     # Fix install paths for all
-    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
-        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
-    else
-        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
-    fi
+    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
 
     oe_runmake install INSTALL_ROOT=${D}
 
-    # Only do this for target builds. Native install work a little differently
-    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
-        # everything except HostData and HostBinaries is prefixed with sysroot value,
-        # but we cannot remove sysroot override, because that's useful for pkg-config etc
-        # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
-        # fix them manually
-        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}" ] ; then
-            echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
-            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
-            rm -rf ${D}${STAGING_DIR_TARGET}
-            # remove empty dirs
-            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
-            while test ${TMP} != ${D}; do
-                rmdir ${TMP}
-                TMP=`dirname ${TMP}`;
-            done
-        fi
+    # everything except HostData and HostBinaries is prefixed with sysroot value,
+    # but we cannot remove sysroot override, because that's useful for pkg-config etc
+    # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
+    # fix them manually
+    if [ -d ${D}${STAGING_DIR_TARGET} ] ; then
+        echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
+        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
+        rm -rf ${D}${STAGING_DIR_TARGET}
+        # remove empty dirs
+        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
+        while test ${TMP} != ${D}; do
+            rmdir ${TMP}
+            TMP=`dirname ${TMP}`;
+        done
     fi
 }
+
+qmake5_base_do_install_native() {
+    # Fix install paths for all
+    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
+
+    oe_runmake install INSTALL_ROOT=${D}
+}
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-06 18:34 ` Donald R. Poole, Jr.
@ 2014-05-09 12:50   ` Martin Jansa
  2014-05-09 16:36     ` Poole Jr, Donald R.
  0 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2014-05-09 12:50 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 4549 bytes --]

On Tue, May 06, 2014 at 01:34:24PM -0500, Donald R. Poole, Jr. wrote:
> From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>
> 
> Currently, if you are building native applications with Qt5, the current qmake5_base_do_install() method assumes an install into the image folder for the target. Since the native builds handle this a little differently, this patch should account for the native install scenario.

Add SOB line.

> ---
>  classes/qmake5.bbclass      |    8 ++++++--
>  classes/qmake5_base.bbclass |   46 +++++++++++++++++++++----------------------
>  2 files changed, 29 insertions(+), 25 deletions(-)
> 
> diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
> index e1dda0d..01454f3 100644
> --- a/classes/qmake5.bbclass
> +++ b/classes/qmake5.bbclass
> @@ -19,6 +19,10 @@ do_configure() {
>      qmake5_base_do_configure
>  }
>  
> -do_install() {
> -    qmake5_base_do_install
> +do_install_class-target() {
> +    qmake5_base_do_install_target
> +}
> +
> +do_install_class-native() {
> +    qmake5_base_do_install_native
>  }
> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> index df8a59a..5a380d0 100644
> --- a/classes/qmake5_base.bbclass
> +++ b/classes/qmake5_base.bbclass
> @@ -161,32 +161,32 @@ qmake5_base_do_configure () {
>      ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD"
>  }
>  
> -qmake5_base_do_install() {
> +qmake5_base_do_install_target() {
>      # Fix install paths for all
> -    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
> -        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
> -    else
> -        find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> -    fi
> +    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"

This looks like incremental patch from your v1, please rebase and send
v3.

>  
>      oe_runmake install INSTALL_ROOT=${D}
>  
> -    # Only do this for target builds. Native install work a little differently
> -    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
> -        # everything except HostData and HostBinaries is prefixed with sysroot value,
> -        # but we cannot remove sysroot override, because that's useful for pkg-config etc
> -        # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
> -        # fix them manually
> -        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n "${STAGING_DIR_TARGET}" ] ; then
> -            echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
> -            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> -            rm -rf ${D}${STAGING_DIR_TARGET}
> -            # remove empty dirs
> -            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> -            while test ${TMP} != ${D}; do
> -                rmdir ${TMP}
> -                TMP=`dirname ${TMP}`;
> -            done
> -        fi
> +    # everything except HostData and HostBinaries is prefixed with sysroot value,
> +    # but we cannot remove sysroot override, because that's useful for pkg-config etc
> +    # In some cases like QtQmlDevTools in qtdeclarative, the sed above does not work,
> +    # fix them manually
> +    if [ -d ${D}${STAGING_DIR_TARGET} ] ; then
> +        echo "Some files are installed in wrong directory ${D}${STAGING_DIR_TARGET}"
> +        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> +        rm -rf ${D}${STAGING_DIR_TARGET}
> +        # remove empty dirs
> +        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> +        while test ${TMP} != ${D}; do
> +            rmdir ${TMP}
> +            TMP=`dirname ${TMP}`;
> +        done
>      fi
>  }
> +
> +qmake5_base_do_install_native() {

Why don't you use

qmake5_base_do_install_class-native() {

here and leave qmake5.bbclass and qmake5_base_do_install as it is?

> +    # Fix install paths for all
> +    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
> +
> +    oe_runmake install INSTALL_ROOT=${D}
> +}
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-09 12:50   ` Martin Jansa
@ 2014-05-09 16:36     ` Poole Jr, Donald R.
  2014-05-09 22:25       ` Martin Jansa
  0 siblings, 1 reply; 12+ messages in thread
From: Poole Jr, Donald R. @ 2014-05-09 16:36 UTC (permalink / raw)
  To: openembedded-devel@lists.openembedded.org

On 5/9/14, 7:50 AM, "Martin Jansa" <martin.jansa@gmail.com> wrote:


>On Tue, May 06, 2014 at 01:34:24PM -0500, Donald R. Poole, Jr. wrote:
>> From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>
>> 
>> Currently, if you are building native applications with Qt5, the
>>current qmake5_base_do_install() method assumes an install into the
>>image folder for the target. Since the native builds handle this a
>>little differently, this patch should account for the native install
>>scenario.
>
>Add SOB line.

I¹m not familiar with the acronym SOB (I¹m still learning about this
process). Is that State of Bitbake? If so, what does State of Bitbake mean?

>
>> ---
>>  classes/qmake5.bbclass      |    8 ++++++--
>>  classes/qmake5_base.bbclass |   46
>>+++++++++++++++++++++----------------------
>>  2 files changed, 29 insertions(+), 25 deletions(-)
>> 
>> diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
>> index e1dda0d..01454f3 100644
>> --- a/classes/qmake5.bbclass
>> +++ b/classes/qmake5.bbclass
>> @@ -19,6 +19,10 @@ do_configure() {
>>      qmake5_base_do_configure
>>  }
>>  
>> -do_install() {
>> -    qmake5_base_do_install
>> +do_install_class-target() {
>> +    qmake5_base_do_install_target
>> +}
>> +
>> +do_install_class-native() {
>> +    qmake5_base_do_install_native
>>  }
>> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
>> index df8a59a..5a380d0 100644
>> --- a/classes/qmake5_base.bbclass
>> +++ b/classes/qmake5_base.bbclass
>> @@ -161,32 +161,32 @@ qmake5_base_do_configure () {
>>      ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT}
>>-r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die
>>"Error calling $CMD"
>>  }
>>  
>> -qmake5_base_do_install() {
>> +qmake5_base_do_install_target() {
>>      # Fix install paths for all
>> -    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
>> -        find -name "Makefile*" | xargs sed -i
>>"s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
>> -    else
>> -        find -name "Makefile*" | xargs sed -i
>>"s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
>> -    fi
>> +    find -name "Makefile*" | xargs sed -i
>>"s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
>
>This looks like incremental patch from your v1, please rebase and send
>v3.

Will do.

>
>>  
>>      oe_runmake install INSTALL_ROOT=${D}
>>  
>> -    # Only do this for target builds. Native install work a little
>>differently
>> -    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
>> -        # everything except HostData and HostBinaries is prefixed with
>>sysroot value,
>> -        # but we cannot remove sysroot override, because that's useful
>>for pkg-config etc
>> -        # In some cases like QtQmlDevTools in qtdeclarative, the sed
>>above does not work,
>> -        # fix them manually
>> -        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n
>>"${STAGING_DIR_TARGET}" ] ; then
>> -            echo "Some files are installed in wrong directory
>>${D}${STAGING_DIR_TARGET}"
>> -            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
>> -            rm -rf ${D}${STAGING_DIR_TARGET}
>> -            # remove empty dirs
>> -            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
>> -            while test ${TMP} != ${D}; do
>> -                rmdir ${TMP}
>> -                TMP=`dirname ${TMP}`;
>> -            done
>> -        fi
>> +    # everything except HostData and HostBinaries is prefixed with
>>sysroot value,
>> +    # but we cannot remove sysroot override, because that's useful for
>>pkg-config etc
>> +    # In some cases like QtQmlDevTools in qtdeclarative, the sed above
>>does not work,
>> +    # fix them manually
>> +    if [ -d ${D}${STAGING_DIR_TARGET} ] ; then
>> +        echo "Some files are installed in wrong directory
>>${D}${STAGING_DIR_TARGET}"
>> +        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
>> +        rm -rf ${D}${STAGING_DIR_TARGET}
>> +        # remove empty dirs
>> +        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
>> +        while test ${TMP} != ${D}; do
>> +            rmdir ${TMP}
>> +            TMP=`dirname ${TMP}`;
>> +        done
>>      fi
>>  }
>> +
>> +qmake5_base_do_install_native() {
>
>Why don't you use
>
>qmake5_base_do_install_class-native() {
>
>here and leave qmake5.bbclass and qmake5_base_do_install as it is?

The reason I didn¹t use qmake5_base_do_install_class-native() is because
the system couldn¹t find the native/target overrides in the
qmake5_base.bbclass. So, I put them in the qmake5.bbclass.

>
>> +    # Fix install paths for all
>> +    find -name "Makefile*" | xargs sed -i
>>"s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
>> +
>> +    oe_runmake install INSTALL_ROOT=${D}
>> +}
>> -- 
>> 1.7.9.5
>> 
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>-- 
>Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Donald R. Poole, Jr.
Research Engineer
Voice: 210.522.3131 | Fax: 210.522.4931
Tactical Networks & Communications (tacticalnetworks.swri.org)
Southwest Research Institute (SwRI)



^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds
  2014-05-09 16:36     ` Poole Jr, Donald R.
@ 2014-05-09 22:25       ` Martin Jansa
  0 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2014-05-09 22:25 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 6013 bytes --]

On Fri, May 09, 2014 at 04:36:22PM +0000, Poole Jr, Donald R. wrote:
> On 5/9/14, 7:50 AM, "Martin Jansa" <martin.jansa@gmail.com> wrote:
> 
> 
> >On Tue, May 06, 2014 at 01:34:24PM -0500, Donald R. Poole, Jr. wrote:
> >> From: "Donald R. Poole, Jr" <donald (dot) poole (at) swri (dot) org>
> >> 
> >> Currently, if you are building native applications with Qt5, the
> >>current qmake5_base_do_install() method assumes an install into the
> >>image folder for the target. Since the native builds handle this a
> >>little differently, this patch should account for the native install
> >>scenario.
> >
> >Add SOB line.
> 
> I¹m not familiar with the acronym SOB (I¹m still learning about this
> process). Is that State of Bitbake? If so, what does State of Bitbake mean?

Signed-off-by

> 
> >
> >> ---
> >>  classes/qmake5.bbclass      |    8 ++++++--
> >>  classes/qmake5_base.bbclass |   46
> >>+++++++++++++++++++++----------------------
> >>  2 files changed, 29 insertions(+), 25 deletions(-)
> >> 
> >> diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
> >> index e1dda0d..01454f3 100644
> >> --- a/classes/qmake5.bbclass
> >> +++ b/classes/qmake5.bbclass
> >> @@ -19,6 +19,10 @@ do_configure() {
> >>      qmake5_base_do_configure
> >>  }
> >>  
> >> -do_install() {
> >> -    qmake5_base_do_install
> >> +do_install_class-target() {
> >> +    qmake5_base_do_install_target
> >> +}
> >> +
> >> +do_install_class-native() {
> >> +    qmake5_base_do_install_native
> >>  }
> >> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> >> index df8a59a..5a380d0 100644
> >> --- a/classes/qmake5_base.bbclass
> >> +++ b/classes/qmake5_base.bbclass
> >> @@ -161,32 +161,32 @@ qmake5_base_do_configure () {
> >>      ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT}
> >>-r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die
> >>"Error calling $CMD"
> >>  }
> >>  
> >> -qmake5_base_do_install() {
> >> +qmake5_base_do_install_target() {
> >>      # Fix install paths for all
> >> -    if [ "${BUILD_SYS}" = "${HOST_SYS}" ] ; then
> >> -        find -name "Makefile*" | xargs sed -i
> >>"s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
> >> -    else
> >> -        find -name "Makefile*" | xargs sed -i
> >>"s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> >> -    fi
> >> +    find -name "Makefile*" | xargs sed -i
> >>"s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
> >
> >This looks like incremental patch from your v1, please rebase and send
> >v3.
> 
> Will do.
> 
> >
> >>  
> >>      oe_runmake install INSTALL_ROOT=${D}
> >>  
> >> -    # Only do this for target builds. Native install work a little
> >>differently
> >> -    if [ "${BUILD_SYS}" != "${HOST_SYS}" ] ; then
> >> -        # everything except HostData and HostBinaries is prefixed with
> >>sysroot value,
> >> -        # but we cannot remove sysroot override, because that's useful
> >>for pkg-config etc
> >> -        # In some cases like QtQmlDevTools in qtdeclarative, the sed
> >>above does not work,
> >> -        # fix them manually
> >> -        if [ -d ${D}${STAGING_DIR_TARGET} ] && [ -n
> >>"${STAGING_DIR_TARGET}" ] ; then
> >> -            echo "Some files are installed in wrong directory
> >>${D}${STAGING_DIR_TARGET}"
> >> -            cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> >> -            rm -rf ${D}${STAGING_DIR_TARGET}
> >> -            # remove empty dirs
> >> -            TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> >> -            while test ${TMP} != ${D}; do
> >> -                rmdir ${TMP}
> >> -                TMP=`dirname ${TMP}`;
> >> -            done
> >> -        fi
> >> +    # everything except HostData and HostBinaries is prefixed with
> >>sysroot value,
> >> +    # but we cannot remove sysroot override, because that's useful for
> >>pkg-config etc
> >> +    # In some cases like QtQmlDevTools in qtdeclarative, the sed above
> >>does not work,
> >> +    # fix them manually
> >> +    if [ -d ${D}${STAGING_DIR_TARGET} ] ; then
> >> +        echo "Some files are installed in wrong directory
> >>${D}${STAGING_DIR_TARGET}"
> >> +        cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
> >> +        rm -rf ${D}${STAGING_DIR_TARGET}
> >> +        # remove empty dirs
> >> +        TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
> >> +        while test ${TMP} != ${D}; do
> >> +            rmdir ${TMP}
> >> +            TMP=`dirname ${TMP}`;
> >> +        done
> >>      fi
> >>  }
> >> +
> >> +qmake5_base_do_install_native() {
> >
> >Why don't you use
> >
> >qmake5_base_do_install_class-native() {
> >
> >here and leave qmake5.bbclass and qmake5_base_do_install as it is?
> 
> The reason I didn¹t use qmake5_base_do_install_class-native() is because
> the system couldn¹t find the native/target overrides in the
> qmake5_base.bbclass. So, I put them in the qmake5.bbclass.
> 
> >
> >> +    # Fix install paths for all
> >> +    find -name "Makefile*" | xargs sed -i
> >>"s,(INSTALL_ROOT),(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
> >> +
> >> +    oe_runmake install INSTALL_ROOT=${D}
> >> +}
> >> -- 
> >> 1.7.9.5
> >> 
> >> -- 
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> >-- 
> >Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> 
> Donald R. Poole, Jr.
> Research Engineer
> Voice: 210.522.3131 | Fax: 210.522.4931
> Tactical Networks & Communications (tacticalnetworks.swri.org)
> Southwest Research Institute (SwRI)
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2014-05-09 22:24 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-01 20:01 [meta-qt5][PATCH] qmake5_base.bbclass: Add install support for native builds Donald R. Poole, Jr.
2014-05-01 21:03 ` Martin Jansa
2014-05-01 21:14   ` Donald Poole
2014-05-02 18:44   ` Poole Jr, Donald R.
2014-05-02 20:46     ` Otavio Salvador
2014-05-02 20:49       ` Poole Jr, Donald R.
2014-05-04 21:28 ` Martin Jansa
  -- strict thread matches above, loose matches on Subject: below --
2014-05-06 18:34 Donald R. Poole, Jr.
2014-05-06 18:34 ` Donald R. Poole, Jr.
2014-05-09 12:50   ` Martin Jansa
2014-05-09 16:36     ` Poole Jr, Donald R.
2014-05-09 22:25       ` Martin Jansa

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.