Re: [oe] [meta-oe][PATCH V3] fwts: Bump SRCREV to latest past 17.03.00 release

2017-06-08 Thread Martin Jansa 
Still fails to build:
http://errors.yoctoproject.org/Errors/Details/144185/

On Thu, Jun 8, 2017 at 10:08 AM, Fathi Boudra 
wrote:

> On 8 June 2017 at 11:05, Koen Kooi  wrote:
> > Op 08-06-17 om 07:11 schreef Khem Raj:
> >> Helps fixing build issues with gcc7
> >>
> >> Signed-off-by: Khem Raj 
> >
> > Acked-by: Koen Kooi 
>
> Acked-by: Fathi Boudra 
>
> >> ---
> >> v2 -> v3
> >> - move the LDFLAGS after CFLAGS
> >>
> >>  ...e-poll.h-instead-of-deprecated-sys-poll.h.patch | 48
> ++
> >>  ...efine-__SWORD_TYPE-if-not-defined-by-libc.patch | 33
> +++
> >>  .../fwts/fwts/0003-Undefine-PAGE_SIZE.patch| 30 ++
> >>  meta-oe/recipes-test/fwts/fwts_git.bb  |  9 +++-
> >>  4 files changed, 118 insertions(+), 2 deletions(-)
> >>  create mode 100644 meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-
> instead-of-deprecated-sys-poll.h.patch
> >>  create mode 100644 meta-oe/recipes-test/fwts/
> fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
> >>  create mode 100644 meta-oe/recipes-test/fwts/
> fwts/0003-Undefine-PAGE_SIZE.patch
> >>
> >> diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-
> instead-of-deprecated-sys-poll.h.patch b/meta-oe/recipes-test/fwts/
> fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
> >> new file mode 100644
> >> index 0..8ad078936
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-
> instead-of-deprecated-sys-poll.h.patch
> >> @@ -0,0 +1,48 @@
> >> +From 100a107a53d5dc9b0554252ac5dbf2c9330615e9 Mon Sep 17 00:00:00 2001
> >> +From: Khem Raj 
> >> +Date: Tue, 6 Jun 2017 07:25:09 -0700
> >> +Subject: [PATCH 1/3] Include poll.h instead of deprecated sys/poll.h
> >> +
> >> +Upstream-Status: Pending
> >> +
> >> +Signed-off-by: Khem Raj 
> >> +---
> >> + src/lib/src/fwts_ipmi.c   | 3 ++-
> >> + src/lib/src/fwts_pipeio.c | 2 +-
> >> + 2 files changed, 3 insertions(+), 2 deletions(-)
> >> +
> >> +diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c
> >> +index cbb27611..70d11cfa 100644
> >> +--- a/src/lib/src/fwts_ipmi.c
> >>  b/src/lib/src/fwts_ipmi.c
> >> +@@ -18,10 +18,11 @@
> >> +  *
> >> +  */
> >> +
> >> ++#include 
> >> ++
> >> + #include 
> >> + #include 
> >> + #include 
> >> +-#include 
> >> + #include 
> >> + #include 
> >> +
> >> +diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c
> >> +index fd719640..bdc5b2ea 100644
> >> +--- a/src/lib/src/fwts_pipeio.c
> >>  b/src/lib/src/fwts_pipeio.c
> >> +@@ -30,9 +30,9 @@
> >> + #include 
> >> + #include 
> >> + #include 
> >> ++#include 
> >> +
> >> + #include 
> >> +-#include 
> >> + #include 
> >> + #include 
> >> + #include 
> >> +--
> >> +2.13.0
> >> +
> >> diff --git 
> >> a/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
> b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-
> if-not-defined-by-libc.patch
> >> new file mode 100644
> >> index 0..3b83ca57c
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-
> if-not-defined-by-libc.patch
> >> @@ -0,0 +1,33 @@
> >> +From 0e89127cd02ecd5ea4506b935cb2b59eb94107d2 Mon Sep 17 00:00:00 2001
> >> +From: Khem Raj 
> >> +Date: Tue, 6 Jun 2017 07:37:20 -0700
> >> +Subject: [PATCH 2/3] Define __SWORD_TYPE if not defined by libc
> >> +
> >> +__SWORD_TYPE is internal to glibc, therefore
> >> +check and define it if needed e.g. on musl
> >> +
> >> +Upstream-Status: Pending
> >> +
> >> +Signed-off-by: Khem Raj 
> >> +---
> >> + src/lib/src/fwts_uefi.c | 4 
> >> + 1 file changed, 4 insertions(+)
> >> +
> >> +diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c
> >> +index 1f9d31fa..2d925f8d 100644
> >> +--- a/src/lib/src/fwts_uefi.c
> >>  b/src/lib/src/fwts_uefi.c
> >> +@@ -59,6 +59,10 @@ typedef struct {
> >> + #define UEFI_IFACE_SYSFS(2) /* sysfs */
> >> + #define UEFI_IFACE_EFIVARS  (3) /* efivar fs */
> >> +
> >> ++#ifndef __SWORD_TYPE
> >> ++typedef __typeof__( ((struct statfs *)0)->f_type )  __SWORD_TYPE;
> >> ++#endif
> >> ++
> >> + /* File system magic numbers */
> >> + #define PSTOREFS_MAGIC  ((__SWORD_TYPE)0x6165676C)
> >> + #define EFIVARFS_MAGIC  ((__SWORD_TYPE)0xde5e81e4)
> >> +--
> >> +2.13.0
> >> +
> >> diff --git a/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
> b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
> >> new file mode 100644
> >> index 0..f84fbffd8
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
> >> @@ -0,0 +1,30 @@
> >> +From 0857269d5a053b5b4c31cfa01b6501526b24035f Mon Sep 17 00:00:00 2001
> >> +From: Khem Raj 
> >> +Date: Tue, 6 Jun 2017 07:39:28 -0700
> >> +Subject:

Re: [oe] [meta-oe][PATCH V3] fwts: Bump SRCREV to latest past 17.03.00 release

2017-06-08 Thread Fathi Boudra 
On 8 June 2017 at 11:05, Koen Kooi  wrote:
> Op 08-06-17 om 07:11 schreef Khem Raj:
>> Helps fixing build issues with gcc7
>>
>> Signed-off-by: Khem Raj 
>
> Acked-by: Koen Kooi 

Acked-by: Fathi Boudra 

>> ---
>> v2 -> v3
>> - move the LDFLAGS after CFLAGS
>>
>>  ...e-poll.h-instead-of-deprecated-sys-poll.h.patch | 48 
>> ++
>>  ...efine-__SWORD_TYPE-if-not-defined-by-libc.patch | 33 +++
>>  .../fwts/fwts/0003-Undefine-PAGE_SIZE.patch| 30 ++
>>  meta-oe/recipes-test/fwts/fwts_git.bb  |  9 +++-
>>  4 files changed, 118 insertions(+), 2 deletions(-)
>>  create mode 100644 
>> meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
>>  create mode 100644 
>> meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
>>  create mode 100644 
>> meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
>>
>> diff --git 
>> a/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
>>  
>> b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
>> new file mode 100644
>> index 0..8ad078936
>> --- /dev/null
>> +++ 
>> b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
>> @@ -0,0 +1,48 @@
>> +From 100a107a53d5dc9b0554252ac5dbf2c9330615e9 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj 
>> +Date: Tue, 6 Jun 2017 07:25:09 -0700
>> +Subject: [PATCH 1/3] Include poll.h instead of deprecated sys/poll.h
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Khem Raj 
>> +---
>> + src/lib/src/fwts_ipmi.c   | 3 ++-
>> + src/lib/src/fwts_pipeio.c | 2 +-
>> + 2 files changed, 3 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c
>> +index cbb27611..70d11cfa 100644
>> +--- a/src/lib/src/fwts_ipmi.c
>>  b/src/lib/src/fwts_ipmi.c
>> +@@ -18,10 +18,11 @@
>> +  *
>> +  */
>> +
>> ++#include 
>> ++
>> + #include 
>> + #include 
>> + #include 
>> +-#include 
>> + #include 
>> + #include 
>> +
>> +diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c
>> +index fd719640..bdc5b2ea 100644
>> +--- a/src/lib/src/fwts_pipeio.c
>>  b/src/lib/src/fwts_pipeio.c
>> +@@ -30,9 +30,9 @@
>> + #include 
>> + #include 
>> + #include 
>> ++#include 
>> +
>> + #include 
>> +-#include 
>> + #include 
>> + #include 
>> + #include 
>> +--
>> +2.13.0
>> +
>> diff --git 
>> a/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
>>  
>> b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
>> new file mode 100644
>> index 0..3b83ca57c
>> --- /dev/null
>> +++ 
>> b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
>> @@ -0,0 +1,33 @@
>> +From 0e89127cd02ecd5ea4506b935cb2b59eb94107d2 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj 
>> +Date: Tue, 6 Jun 2017 07:37:20 -0700
>> +Subject: [PATCH 2/3] Define __SWORD_TYPE if not defined by libc
>> +
>> +__SWORD_TYPE is internal to glibc, therefore
>> +check and define it if needed e.g. on musl
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Khem Raj 
>> +---
>> + src/lib/src/fwts_uefi.c | 4 
>> + 1 file changed, 4 insertions(+)
>> +
>> +diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c
>> +index 1f9d31fa..2d925f8d 100644
>> +--- a/src/lib/src/fwts_uefi.c
>>  b/src/lib/src/fwts_uefi.c
>> +@@ -59,6 +59,10 @@ typedef struct {
>> + #define UEFI_IFACE_SYSFS(2) /* sysfs */
>> + #define UEFI_IFACE_EFIVARS  (3) /* efivar fs */
>> +
>> ++#ifndef __SWORD_TYPE
>> ++typedef __typeof__( ((struct statfs *)0)->f_type )  __SWORD_TYPE;
>> ++#endif
>> ++
>> + /* File system magic numbers */
>> + #define PSTOREFS_MAGIC  ((__SWORD_TYPE)0x6165676C)
>> + #define EFIVARFS_MAGIC  ((__SWORD_TYPE)0xde5e81e4)
>> +--
>> +2.13.0
>> +
>> diff --git a/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch 
>> b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
>> new file mode 100644
>> index 0..f84fbffd8
>> --- /dev/null
>> +++ b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
>> @@ -0,0 +1,30 @@
>> +From 0857269d5a053b5b4c31cfa01b6501526b24035f Mon Sep 17 00:00:00 2001
>> +From: Khem Raj 
>> +Date: Tue, 6 Jun 2017 07:39:28 -0700
>> +Subject: [PATCH 3/3] Undefine PAGE_SIZE
>> +
>> +musl defines PAGE_SIZE and build complains
>> +of multiple definitions
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Khem Raj 
>> +---
>> + src/lib/src/fwts_acpi_tables.c | 1 +
>> + 1 file changed, 1 insertion(+)
>> +
>> +diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
>> +index

Re: [oe] [meta-oe][PATCH V3] fwts: Bump SRCREV to latest past 17.03.00 release

2017-06-08 Thread Koen Kooi 
Op 08-06-17 om 07:11 schreef Khem Raj:
> Helps fixing build issues with gcc7
> 
> Signed-off-by: Khem Raj 

Acked-by: Koen Kooi 

> ---
> v2 -> v3
> - move the LDFLAGS after CFLAGS
> 
>  ...e-poll.h-instead-of-deprecated-sys-poll.h.patch | 48 
> ++
>  ...efine-__SWORD_TYPE-if-not-defined-by-libc.patch | 33 +++
>  .../fwts/fwts/0003-Undefine-PAGE_SIZE.patch| 30 ++
>  meta-oe/recipes-test/fwts/fwts_git.bb  |  9 +++-
>  4 files changed, 118 insertions(+), 2 deletions(-)
>  create mode 100644 
> meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
>  create mode 100644 
> meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
>  create mode 100644 
> meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
> 
> diff --git 
> a/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
>  
> b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
> new file mode 100644
> index 0..8ad078936
> --- /dev/null
> +++ 
> b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
> @@ -0,0 +1,48 @@
> +From 100a107a53d5dc9b0554252ac5dbf2c9330615e9 Mon Sep 17 00:00:00 2001
> +From: Khem Raj 
> +Date: Tue, 6 Jun 2017 07:25:09 -0700
> +Subject: [PATCH 1/3] Include poll.h instead of deprecated sys/poll.h
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Khem Raj 
> +---
> + src/lib/src/fwts_ipmi.c   | 3 ++-
> + src/lib/src/fwts_pipeio.c | 2 +-
> + 2 files changed, 3 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c
> +index cbb27611..70d11cfa 100644
> +--- a/src/lib/src/fwts_ipmi.c
>  b/src/lib/src/fwts_ipmi.c
> +@@ -18,10 +18,11 @@
> +  *
> +  */
> + 
> ++#include 
> ++
> + #include 
> + #include 
> + #include 
> +-#include 
> + #include 
> + #include 
> + 
> +diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c
> +index fd719640..bdc5b2ea 100644
> +--- a/src/lib/src/fwts_pipeio.c
>  b/src/lib/src/fwts_pipeio.c
> +@@ -30,9 +30,9 @@
> + #include 
> + #include 
> + #include 
> ++#include 
> + 
> + #include 
> +-#include 
> + #include 
> + #include 
> + #include 
> +-- 
> +2.13.0
> +
> diff --git 
> a/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
>  
> b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
> new file mode 100644
> index 0..3b83ca57c
> --- /dev/null
> +++ 
> b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
> @@ -0,0 +1,33 @@
> +From 0e89127cd02ecd5ea4506b935cb2b59eb94107d2 Mon Sep 17 00:00:00 2001
> +From: Khem Raj 
> +Date: Tue, 6 Jun 2017 07:37:20 -0700
> +Subject: [PATCH 2/3] Define __SWORD_TYPE if not defined by libc
> +
> +__SWORD_TYPE is internal to glibc, therefore
> +check and define it if needed e.g. on musl
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Khem Raj 
> +---
> + src/lib/src/fwts_uefi.c | 4 
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c
> +index 1f9d31fa..2d925f8d 100644
> +--- a/src/lib/src/fwts_uefi.c
>  b/src/lib/src/fwts_uefi.c
> +@@ -59,6 +59,10 @@ typedef struct {
> + #define UEFI_IFACE_SYSFS(2) /* sysfs */
> + #define UEFI_IFACE_EFIVARS  (3) /* efivar fs */
> + 
> ++#ifndef __SWORD_TYPE
> ++typedef __typeof__( ((struct statfs *)0)->f_type )  __SWORD_TYPE;
> ++#endif
> ++
> + /* File system magic numbers */
> + #define PSTOREFS_MAGIC  ((__SWORD_TYPE)0x6165676C)
> + #define EFIVARFS_MAGIC  ((__SWORD_TYPE)0xde5e81e4)
> +-- 
> +2.13.0
> +
> diff --git a/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch 
> b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
> new file mode 100644
> index 0..f84fbffd8
> --- /dev/null
> +++ b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
> @@ -0,0 +1,30 @@
> +From 0857269d5a053b5b4c31cfa01b6501526b24035f Mon Sep 17 00:00:00 2001
> +From: Khem Raj 
> +Date: Tue, 6 Jun 2017 07:39:28 -0700
> +Subject: [PATCH 3/3] Undefine PAGE_SIZE
> +
> +musl defines PAGE_SIZE and build complains
> +of multiple definitions
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Khem Raj 
> +---
> + src/lib/src/fwts_acpi_tables.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
> +index 1d4fc705..71023ad2 100644
> +--- a/src/lib/src/fwts_acpi_tables.c
>  b/src/lib/src/fwts_acpi_tables.c
> +@@ -42,6 +42,7 @@
> + #define BIOS_START  (0x000e)/* Start of BIOS memory */
> + #define BIOS_END(0x000f)/* End of BIOS memory

[oe] [meta-oe][PATCH V3] fwts: Bump SRCREV to latest past 17.03.00 release

2017-06-07 Thread Khem Raj 
Helps fixing build issues with gcc7

Signed-off-by: Khem Raj 
---
v2 -> v3
- move the LDFLAGS after CFLAGS

 ...e-poll.h-instead-of-deprecated-sys-poll.h.patch | 48 ++
 ...efine-__SWORD_TYPE-if-not-defined-by-libc.patch | 33 +++
 .../fwts/fwts/0003-Undefine-PAGE_SIZE.patch| 30 ++
 meta-oe/recipes-test/fwts/fwts_git.bb  |  9 +++-
 4 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 
meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
 create mode 100644 
meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
 create mode 100644 meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch

diff --git 
a/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
 
b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
new file mode 100644
index 0..8ad078936
--- /dev/null
+++ 
b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
@@ -0,0 +1,48 @@
+From 100a107a53d5dc9b0554252ac5dbf2c9330615e9 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Tue, 6 Jun 2017 07:25:09 -0700
+Subject: [PATCH 1/3] Include poll.h instead of deprecated sys/poll.h
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj 
+---
+ src/lib/src/fwts_ipmi.c   | 3 ++-
+ src/lib/src/fwts_pipeio.c | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c
+index cbb27611..70d11cfa 100644
+--- a/src/lib/src/fwts_ipmi.c
 b/src/lib/src/fwts_ipmi.c
+@@ -18,10 +18,11 @@
+  *
+  */
+ 
++#include 
++
+ #include 
+ #include 
+ #include 
+-#include 
+ #include 
+ #include 
+ 
+diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c
+index fd719640..bdc5b2ea 100644
+--- a/src/lib/src/fwts_pipeio.c
 b/src/lib/src/fwts_pipeio.c
+@@ -30,9 +30,9 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.13.0
+
diff --git 
a/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
 
b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
new file mode 100644
index 0..3b83ca57c
--- /dev/null
+++ 
b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
@@ -0,0 +1,33 @@
+From 0e89127cd02ecd5ea4506b935cb2b59eb94107d2 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Tue, 6 Jun 2017 07:37:20 -0700
+Subject: [PATCH 2/3] Define __SWORD_TYPE if not defined by libc
+
+__SWORD_TYPE is internal to glibc, therefore
+check and define it if needed e.g. on musl
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj 
+---
+ src/lib/src/fwts_uefi.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c
+index 1f9d31fa..2d925f8d 100644
+--- a/src/lib/src/fwts_uefi.c
 b/src/lib/src/fwts_uefi.c
+@@ -59,6 +59,10 @@ typedef struct {
+ #define UEFI_IFACE_SYSFS  (2) /* sysfs */
+ #define UEFI_IFACE_EFIVARS(3) /* efivar fs */
+ 
++#ifndef __SWORD_TYPE
++typedef __typeof__( ((struct statfs *)0)->f_type )__SWORD_TYPE;
++#endif
++
+ /* File system magic numbers */
+ #define PSTOREFS_MAGIC  ((__SWORD_TYPE)0x6165676C)
+ #define EFIVARFS_MAGIC  ((__SWORD_TYPE)0xde5e81e4)
+-- 
+2.13.0
+
diff --git a/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch 
b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
new file mode 100644
index 0..f84fbffd8
--- /dev/null
+++ b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
@@ -0,0 +1,30 @@
+From 0857269d5a053b5b4c31cfa01b6501526b24035f Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Tue, 6 Jun 2017 07:39:28 -0700
+Subject: [PATCH 3/3] Undefine PAGE_SIZE
+
+musl defines PAGE_SIZE and build complains
+of multiple definitions
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj 
+---
+ src/lib/src/fwts_acpi_tables.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
+index 1d4fc705..71023ad2 100644
+--- a/src/lib/src/fwts_acpi_tables.c
 b/src/lib/src/fwts_acpi_tables.c
+@@ -42,6 +42,7 @@
+ #define BIOS_START(0x000e)/* Start of BIOS memory */
+ #define BIOS_END  (0x000f)/* End of BIOS memory */
+ #define BIOS_LENGTH   (BIOS_END - BIOS_START) /* Length of BIOS memory */
++#undef PAGE_SIZE
+ #define PAGE_SIZE (4096)
+ 
+ static fwts_acpi_table_info   tables[ACPI_MAX_TABLES];
+-- 
+2.13.0
+
diff --git a/meta-oe/recipes-test/fwts/fwts_git.bb 
b/meta-oe/recipes-test/fwts/fwts_git.bb
index 4c4ae66d6..d00aefbf8 100644
--- a/meta-oe/recipes-test/fwts/fwts_git.bb
+++