[gnome-continuous-yocto/gnomeostree-3.28-rocko: 278/8267] feature-arm-vfp.inc: fix overzealous ARMPKGSFX_FPU modification

[Emmanuele Bassi <ebassi src gnome org>]

commit 45dd3d28e430b6bd8db66a36afa9ab931367fcde
Author: André Draszik <git andred net>
Date:   Thu May 12 16:17:51 2016 +0100

    feature-arm-vfp.inc: fix overzealous ARMPKGSFX_FPU modification
    
    Since commit 972b4fc (feature-arm-neon.inc: restore vfpv3-d16 support)
    we're replacing _all_ dashes (-) in ARMPKGSFX_FPU, which is causing
    problems for all legitimate uses of the dash as TUNE_PKGARCH doesn't
    have the right value anymore:
    
    E.g. on raspberrypi2:
    
    ERROR:  OE-core's config sanity checker detected a potential misconfiguration.
        Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
        Following is the list of potential problems / advisories:
    
        Error, the PACKAGE_ARCHS variable (all any noarch armv5hf-vfp armv5thf-vfp
    armv5ehf-vfp armv5tehf-vfp armv6hf-vfp armv6thf-vfp armv7ahf-vfp
    armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon
    armv7vehf-neon-vfpv4 armv7vet2hf-neon-vfpv4 cortexa7hf-vfp cortexa7hf-neon
    cortexa7hf-neon-vfpv4 cortexa7t2hf-vfp cortexa7t2hf-neon
    cortexa7t2hf-neon-vfpv4 raspberrypi3) for DEFAULTTUNE (cortexa7thf-neon-vfpv4)
    does not contain TUNE_PKGARCH (cortexa7hf-neonvfpv4).
    
    Fix this by being more explicit about what we're modifying.
    
    Reported-by: Khem Raj <raj khem gmail com>
    (From OE-Core rev: cf82db2ba732031f392760e4f363e8b608e6fae3)
    
    Signed-off-by: André Draszik <git andred net>
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/machine/include/arm/feature-arm-vfp.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/conf/machine/include/arm/feature-arm-vfp.inc 
b/meta/conf/machine/include/arm/feature-arm-vfp.inc
index bd366a1..9ef31e7 100644
--- a/meta/conf/machine/include/arm/feature-arm-vfp.inc
+++ b/meta/conf/machine/include/arm/feature-arm-vfp.inc
@@ -6,7 +6,7 @@ TUNEVALID[vfp] = "Enable Vector Floating Point (vfp) unit."
 TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfp', ' vfp', '', d)}"
 
 TUNE_CCARGS  .= "${@ (' -mfpu=%s ' % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1]) if 
(d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
-ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1].replace('-', '')) if 
(d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
+ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1].replace('vfpv3-d16', 
'vfpv3d16')) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
 
 TUNEVALID[callconvention-hard] = "Enable EABI hard float call convention, requires VFP."
 TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d) if 
(d.getVar('TUNE_CCARGS_MFPU', True) != '') else '' }"