Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Denys Dmytriyenko <denys@ti.com>
Subject: Re: [meta-qt5][PATCHv2] nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}
Date: Sat, 22 Feb 2014 09:05:05 +0100	[thread overview]
Message-ID: <20140222080505.GK3854@jama> (raw)
In-Reply-To: <1392916331-30391-1-git-send-email-denis@denix.org>

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

On Thu, Feb 20, 2014 at 12:12:11PM -0500, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> * This way we don't mangle ${B} and can repeat do_install if necessary. And
>   previously it would require running do_compile again to restore the proper
>   state of ${B}.
> * Need to bump PR, since do_compile isn't changing, but needs to re-run to
>   re-populate qmake-real binary.
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  recipes-qt/qt5/nativesdk-qtbase.inc | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
> index fa44009..3cb9b0e 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase.inc
> +++ b/recipes-qt/qt5/nativesdk-qtbase.inc
> @@ -10,6 +10,8 @@ require nativesdk-qt5.inc
>  # it's already included with newer oe-core, but include it here for dylan
>  FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
>  
> +PR = "r1"
> +

It's already merged, but please don't add new PRs, especially to .inc
files.

>  # common with -native and target version
>  SRC_URI += "\
>      file://0001-Add-linux-oe-g-platform.patch \
> @@ -192,14 +194,12 @@ do_install() {
>      # Fix install paths for all
>      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
> -    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}
>  
> +    # replace the native qmake installed above with nativesdk version
> +    rm -rf ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
> +    install -m 755 ${B}/bin/qmake-real ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
> +
>      # 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
> -- 
> 1.8.3.2
> 
> _______________________________________________
> 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 --]

  parent reply	other threads:[~2014-02-22  8:04 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-20 17:12 [meta-qt5][PATCHv2] nativesdk-qtbase: do qmake replacement in ${D} instead of ${B} Denys Dmytriyenko
2014-02-20 17:52 ` Otavio Salvador
2014-02-22  8:05 ` Martin Jansa [this message]
2014-02-24 14:46   ` Denys Dmytriyenko
2014-02-24 15:18   ` Otavio Salvador
2014-02-24 15:44     ` Martin Jansa
2014-02-24 15:47       ` Otavio Salvador

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140222080505.GK3854@jama \
    --to=martin.jansa@gmail.com \
    --cc=denys@ti.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox