diff mbox

[2/3] uefi: esrt: don't build UEFI specific code for s390x

Message ID 1457074591-24175-2-git-send-email-ivan.hu@canonical.com
State Accepted
Headers show

Commit Message

Ivan Hu March 4, 2016, 6:56 a.m. UTC 
Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
---
 src/uefi/esrt/esrt.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Colin Ian King March 4, 2016, 7:51 a.m. UTC | #1 
On 04/03/16 06:56, Ivan Hu wrote:
> Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
> ---
>  src/uefi/esrt/esrt.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/src/uefi/esrt/esrt.c b/src/uefi/esrt/esrt.c
> index 897bd6b..9272c72 100644
> --- a/src/uefi/esrt/esrt.c
> +++ b/src/uefi/esrt/esrt.c
> @@ -17,11 +17,14 @@
>   *
>   */
>  
> +#include "fwts.h"
> +
> +#if defined(FWTS_HAS_UEFI)
> +
>  #include <errno.h>
>  #include <sys/types.h>
>  #include <dirent.h>
>  
> -#include "fwts.h"
>  #include "fwts_uefi.h"
>  
>  #define FWTS_ESRT_DIR_PATH		"/sys/firmware/efi/esrt"
> @@ -259,3 +262,5 @@ static fwts_framework_ops esrt_ops = {
>  };
>  
>  FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
Alex Hung March 7, 2016, 10:19 a.m. UTC | #2 
On 03/03/2016 10:56 PM, Ivan Hu wrote:
> Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
> ---
>   src/uefi/esrt/esrt.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/uefi/esrt/esrt.c b/src/uefi/esrt/esrt.c
> index 897bd6b..9272c72 100644
> --- a/src/uefi/esrt/esrt.c
> +++ b/src/uefi/esrt/esrt.c
> @@ -17,11 +17,14 @@
>    *
>    */
>
> +#include "fwts.h"
> +
> +#if defined(FWTS_HAS_UEFI)
> +
>   #include <errno.h>
>   #include <sys/types.h>
>   #include <dirent.h>
>
> -#include "fwts.h"
>   #include "fwts_uefi.h"
>
>   #define FWTS_ESRT_DIR_PATH		"/sys/firmware/efi/esrt"
> @@ -259,3 +262,5 @@ static fwts_framework_ops esrt_ops = {
>   };
>
>   FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_ROOT_PRIV)
> +
> +#endif
>

Acked-by: Alex Hung <alex.hung@canonical.com>
diff mbox

Patch

diff --git a/src/uefi/esrt/esrt.c b/src/uefi/esrt/esrt.c
index 897bd6b..9272c72 100644
--- a/src/uefi/esrt/esrt.c
+++ b/src/uefi/esrt/esrt.c
@@ -17,11 +17,14 @@ 
  *
  */
 
+#include "fwts.h"
+
+#if defined(FWTS_HAS_UEFI)
+
 #include <errno.h>
 #include <sys/types.h>
 #include <dirent.h>
 
-#include "fwts.h"
 #include "fwts_uefi.h"
 
 #define FWTS_ESRT_DIR_PATH		"/sys/firmware/efi/esrt"
@@ -259,3 +262,5 @@  static fwts_framework_ops esrt_ops = {
 };
 
 FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_ROOT_PRIV)
+
+#endif