linux-kernel - [PATCH] fix blkid.h include

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 6 May 2009 13:35:50 +0200
From:	Robert Schwebel <r.schwebel@...gutronix.de>
To:	Karel Zak <kzak@...hat.com>
Cc:	linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org,
	util-linux-ng@...r.kernel.org
Subject: [PATCH] fix blkid.h include

When building util-linux-ng-2.15, I get this:

make[3]: Entering directory `/ptx/work/octopus/WORK_2_B/rsc/svn/oselas/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270.PCM990/build-target/util-linux-ng-2.15/mount'
arm-iwmmx-linux-gnueabi-gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I..  -include ../config.h -I../include -DLOCALEDIR=\"/usr/share/locale\" -isystem /home/rsc/svn/oselas/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270.PCM990/sysroot-target/include -isystem /home/rsc/svn/oselas/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270.PCM990/sysroot-target/usr/include  -fsigned-char  -I/home/rsc/svn/oselas/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270.PCM990/sysroot-target/usr/include    -g -O2 -MT mount-fsprobe.o -MD -MP -MF .deps/mount-fsprobe.Tpo -c -o mount-fsprobe.o `test -f '../lib/fsprobe.c' || echo './'`../lib/fsprobe.c
../lib/fsprobe.c:10:19: error: blkid.h: No such file or directory

The reason is that blkid.h comes from e2fsutils, which install the header file
into /usr/include/blkid/blkid.h; /usr/include is also what the .pc file
specifies for the include path for the CFLAGS. So IMHO the patch below must be
applied to make it work.

If this is not acceptable, a little bit more configure magic would be necessary.

Signed-off-by: Robert Schwebel <r.schwebel@...gutronix.de>

---
 lib/fsprobe.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: util-linux-ng-2.15/lib/fsprobe.c
===================================================================
--- util-linux-ng-2.15.orig/lib/fsprobe.c
+++ util-linux-ng-2.15/lib/fsprobe.c
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <stdlib.h>

-#include <blkid.h>
+#include <blkid/blkid.h>

 #include "blkdev.h"
 #include "canonicalize.h"

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/