Skip to contentSkip to conversation

ubifs: fix inclusion of uuid.h

PATCH Applied Rolf Eike Beer 2 participants 2 messages Jul 10, 2017 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ubifs: fix inclusion of uuid.h

From de17ee444ad4d523131806e4afe07c41a4c310d1 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <[email protected]>
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.

---
 ubifs-utils/mkfs.ubifs/mkfs.ubifs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ubifs-utils/mkfs.ubifs/mkfs.ubifs.h +1 -1
index 944a159..1321191 100644
@@ -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>
Signature · 11 lines
2.13.2


-- 
Rolf Eike Beer, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax +49 551 30664-11
Bertha-von-Suttner-Str. 9, 37085 Göttingen, Germany
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160
Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055

emlix – smart embedded open source
#1 lore raw

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