From 567adab3394dea4a9a696a6b776923a0279735b8 Mon Sep 17 00:00:00 2001
From: Ikey Doherty <michael.i.doherty@intel.com>
Date: Tue, 2 May 2017 18:26:40 +0100
Subject: [PATCH] Ensure to include sysmacros.h for major/minor usage

As of glibc 2.25, warnings will be emitted at compile time to state
that you must explicitly include the header now, due to libraries
tending to have their own definitions.

Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>
---
 src/lib/blkid_stub.c            | 1 +
 src/lib/files.c                 | 1 +
 src/lib/probe.c                 | 1 +
 src/lib/system_stub.c           | 1 +
 tests/check-legacy.c            | 1 +
 tests/check-probe.c             | 1 +
 tests/check-select-bootloader.c | 1 +
 7 files changed, 7 insertions(+)

diff --git a/src/lib/blkid_stub.c b/src/lib/blkid_stub.c
index 9f087d0..6f34ea8 100644
--- a/src/lib/blkid_stub.c
+++ b/src/lib/blkid_stub.c
@@ -14,6 +14,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/sysmacros.h>
 
 /**
  * Ensure we check here for the blkid device being correct.
diff --git a/src/lib/files.c b/src/lib/files.c
index cdc9ef8..7fe7010 100644
--- a/src/lib/files.c
+++ b/src/lib/files.c
@@ -26,6 +26,7 @@
 #include <sys/mman.h>
 #include <sys/sendfile.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <unistd.h>
 
 #include "blkid_stub.h"
diff --git a/src/lib/probe.c b/src/lib/probe.c
index 8d13238..503cf00 100644
--- a/src/lib/probe.c
+++ b/src/lib/probe.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <unistd.h>
 
 #include "blkid_stub.h"
diff --git a/src/lib/system_stub.c b/src/lib/system_stub.c
index 511056e..7a4878c 100644
--- a/src/lib/system_stub.c
+++ b/src/lib/system_stub.c
@@ -14,6 +14,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/mount.h>
+#include <sys/sysmacros.h>
 
 #include "files.h"
 #include "log.h"
diff --git a/tests/check-legacy.c b/tests/check-legacy.c
index 0d1b56a..e780fad 100644
--- a/tests/check-legacy.c
+++ b/tests/check-legacy.c
@@ -15,6 +15,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/sysmacros.h>
 
 #include "bootman.h"
 #include "config.h"
diff --git a/tests/check-probe.c b/tests/check-probe.c
index a0ce4d6..2aea5a3 100644
--- a/tests/check-probe.c
+++ b/tests/check-probe.c
@@ -31,6 +31,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/sysmacros.h>
 
 #include "blkid_stub.h"
 #include "bootloader.h"
diff --git a/tests/check-select-bootloader.c b/tests/check-select-bootloader.c
index 6b7860f..96db3d9 100644
--- a/tests/check-select-bootloader.c
+++ b/tests/check-select-bootloader.c
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/sysmacros.h>
 
 #include "bootloader.h"
 #include "bootman.h"