[oe,meta-oe,v2] fwts: update to latest git and fix build with gcc 5

Message ID 1466415303-25975-1-git-send-email-koen.kooi@linaro.org
State New
Headers show

Commit Message

Koen Kooi June 20, 2016, 9:35 a.m.
License checksum change due to 2014->2016 changes. Fix build with gcc 5 by removing -Wno-werror:

	cc1: error: -Werror=misleading-indentation: no option -Wmisleading-indentation

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>

---
 meta-oe/recipes-test/fwts/fwts_git.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

-- 
2.4.3

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Koen Kooi June 21, 2016, 5:04 a.m. | #1
On 20 June 2016 at 18:07, Khem Raj <raj.khem@gmail.com> wrote:
> On Mon, Jun 20, 2016 at 2:35 AM, Koen Kooi <koen.kooi@linaro.org> wrote:

>> License checksum change due to 2014->2016 changes. Fix build with gcc 5 by removing -Wno-werror:

>>

>>         cc1: error: -Werror=misleading-indentation: no option -Wmisleading-indentation

>

> This would then break build with gcc6 unless the indentations are

> fixed in new version. Can you confirm that

> it works with gcc6 equally well ?


ATM I can't, since I don't have a gcc6 config setup. But this is a
general problem: How can we turn off that indentation warning for gcc6
without breaking gcc5?

>

>>

>> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>

>> ---

>>  meta-oe/recipes-test/fwts/fwts_git.bb | 10 ++++++----

>>  1 file changed, 6 insertions(+), 4 deletions(-)

>>

>> diff --git a/meta-oe/recipes-test/fwts/fwts_git.bb b/meta-oe/recipes-test/fwts/fwts_git.bb

>> index 197fe20..2868034 100644

>> --- a/meta-oe/recipes-test/fwts/fwts_git.bb

>> +++ b/meta-oe/recipes-test/fwts/fwts_git.bb

>> @@ -3,11 +3,11 @@ DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to

>>  HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts"

>>

>>  LICENSE = "GPLv2+"

>> -LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f"

>> +LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519"

>>

>> -PV = "14.12.00"

>> +PV = "16.05.01"

>>

>> -SRCREV = "efc18d16294f492b7f72bba64344b2eed50e6a69"

>> +SRCREV = "4d9500d1fb119e2136e07c0cc2844f51b5e5b97a"

>>  SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git"

>>

>>  S = "${WORKDIR}/git"

>> @@ -16,7 +16,9 @@ DEPENDS = "libpcre json-c glib-2.0"

>>

>>  inherit autotools-brokensep

>>

>> -CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=misleading-indentation"

>> +CFLAGS += "-I${STAGING_INCDIR}/json-c"

>> +

>> +RDEPENDS_${PN} += "dtc"

>>

>>  FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}"

>>  FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la"

>> --

>> 2.4.3

>>

>> --

>> _______________________________________________

>> Openembedded-devel mailing list

>> Openembedded-devel@lists.openembedded.org

>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel




-- 
Koen Kooi

Builds and Baselines | Release Manager
Linaro.org | Open source software for ARM SoCs
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Koen Kooi June 21, 2016, 7:45 a.m. | #2
On 20 June 2016 at 11:35, Koen Kooi <koen.kooi@linaro.org> wrote:
> License checksum change due to 2014->2016 changes. Fix build with gcc 5 by removing -Wno-werror:

>

>         cc1: error: -Werror=misleading-indentation: no option -Wmisleading-indentation

>

> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>


*sigh* this builds fine on armv8, but breaks on armv7 :(

> ---

>  meta-oe/recipes-test/fwts/fwts_git.bb | 10 ++++++----

>  1 file changed, 6 insertions(+), 4 deletions(-)

>

> diff --git a/meta-oe/recipes-test/fwts/fwts_git.bb b/meta-oe/recipes-test/fwts/fwts_git.bb

> index 197fe20..2868034 100644

> --- a/meta-oe/recipes-test/fwts/fwts_git.bb

> +++ b/meta-oe/recipes-test/fwts/fwts_git.bb

> @@ -3,11 +3,11 @@ DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to

>  HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts"

>

>  LICENSE = "GPLv2+"

> -LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f"

> +LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519"

>

> -PV = "14.12.00"

> +PV = "16.05.01"

>

> -SRCREV = "efc18d16294f492b7f72bba64344b2eed50e6a69"

> +SRCREV = "4d9500d1fb119e2136e07c0cc2844f51b5e5b97a"

>  SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git"

>

>  S = "${WORKDIR}/git"

> @@ -16,7 +16,9 @@ DEPENDS = "libpcre json-c glib-2.0"

>

>  inherit autotools-brokensep

>

> -CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=misleading-indentation"

> +CFLAGS += "-I${STAGING_INCDIR}/json-c"

> +

> +RDEPENDS_${PN} += "dtc"

>

>  FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}"

>  FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la"

> --

> 2.4.3

>




-- 
Koen Kooi

Builds and Baselines | Release Manager
Linaro.org | Open source software for ARM SoCs
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-test/fwts/fwts_git.bb b/meta-oe/recipes-test/fwts/fwts_git.bb
index 197fe20..2868034 100644
--- a/meta-oe/recipes-test/fwts/fwts_git.bb
+++ b/meta-oe/recipes-test/fwts/fwts_git.bb
@@ -3,11 +3,11 @@  DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to
 HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f"
+LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519"
 
-PV = "14.12.00"
+PV = "16.05.01"
 
-SRCREV = "efc18d16294f492b7f72bba64344b2eed50e6a69"
+SRCREV = "4d9500d1fb119e2136e07c0cc2844f51b5e5b97a"
 SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git"
 
 S = "${WORKDIR}/git"
@@ -16,7 +16,9 @@  DEPENDS = "libpcre json-c glib-2.0"
 
 inherit autotools-brokensep
 
-CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=misleading-indentation"
+CFLAGS += "-I${STAGING_INCDIR}/json-c"
+
+RDEPENDS_${PN} += "dtc"
 
 FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}"
 FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la"