diff mbox

ubifs: fix inclusion of uuid.h

Message ID 1870262.xSbmLmMA2F@devpool21
State Accepted
Delegated to: David Oberhollenzer
Headers show

Commit Message

Rolf Eike Beer July 10, 2017, 11:54 a.m. UTC 
From de17ee444ad4d523131806e4afe07c41a4c310d1 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eb@emlix.com>
Date: Mon, 10 Jul 2017 13:43:06 +0200
Subject: [PATCH] ubifs: fix inclusion of uuid.h

The include directory exported by uuid.pc is */include/uuid, so uuid.h must be
included without any directory in the path. This usually works out because uuid
is installed in the normal prefix, so the parent directory of what uuid has as
include dir ends up in the include path anyway. In case one uses a custom uuid
outside of the regular include path this breaks.

Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 ubifs-utils/mkfs.ubifs/mkfs.ubifs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Oberhollenzer July 10, 2017, 12:10 p.m. UTC | #1 
Applied to mtd-utils.git

Please prefix future patches for mkfs-ubifs with "mkfs-ubifs:"
or simply use "mtd-utils:" for patches that go into mtd-utils.

"ubifs:" would imply that it is a kernel UBIFS patch.


Thanks,

David
diff mbox

Patch

diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
index 944a159..1321191 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
@@ -43,7 +43,7 @@ 
 #include <errno.h>
 #include <libgen.h>
 #include <ctype.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
 #include <sys/file.h>
 
 #include <mtd/ubifs-media.h>