[OE-core] [PATCH 11/26] nss: reorder SRC_URI lines to fix upstream version check

[Martin Jansa]

On Thu, Jul 30, 2015 at 04:31:40PM +0300, Alexander Kanavin wrote:
> The source tarball should be listed first
> 
> Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> ---
>  meta/recipes-support/nss/nss.inc       | 2 +-
>  meta/recipes-support/nss/nss_3.17.3.bb | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
> index 665e4e6..b21dc39 100644
> --- a/meta/recipes-support/nss/nss.inc
> +++ b/meta/recipes-support/nss/nss.inc
> @@ -12,7 +12,7 @@ LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)"
>  
>  LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
>                      file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=6bf96825e3d7ce4de25621ae886cc859"
> -SRC_URI = "\
> +SRC_URI += "\
>      file://nss-fix-support-cross-compiling.patch \
>      file://nss-no-rpath-for-cross-compiling.patch \
>      file://nss-fix-incorrect-shebang-of-perl.patch \
> diff --git a/meta/recipes-support/nss/nss_3.17.3.bb b/meta/recipes-support/nss/nss_3.17.3.bb
> index e7d0780..b22eb95 100644
> --- a/meta/recipes-support/nss/nss_3.17.3.bb
> +++ b/meta/recipes-support/nss/nss_3.17.3.bb
> @@ -1,7 +1,7 @@
> -require nss.inc
> -
> -SRC_URI += "\
> +SRC_URI = "\
>      http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${BP}.tar.gz \
>  "

Why don't you move this to .inc file and replace "3_17_3_RTM" with some
variable set in .bb, it would be easier to read than this reorder and
require .inc later..

>  SRC_URI[md5sum] = "fba7489e1b26f2a0bfe5527430fd61e1"
>  SRC_URI[sha256sum] = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5"
> +
> +require nss.inc
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20150730/f600d91a/attachment-0002.sig>