Re: [Xen-devel] [PATCH] libfsimage: add ext4 support for CentOS 5.x

[Roger Pau Monne <roger.pau@xxxxxxxxxx>]

Ian Campbell wrote:
> On Wed, 2012-09-05 at 13:03 +0100, Roger Pau Monne wrote:
>> CentOS 5.x forked e2fs ext4 support into a different package called
>> e4fs, and so headers and library names changed from ext2fs to ext4fs.
>> Check if ext4fs/ext2fs.h and -lext4fs work, and use that instead of
>> ext2fs to build libfsimage. This patch assumes that if the ext4fs
>> library is present it should always be used instead of ext2fs.
>>
>> This patch includes a rework of the ext2fs check, a new ext4fs check
>> and a minor modification in libfsimage to use the correct library.
>>
>> Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>
>> ---
>> Please re-run autogen.sh after applying
> 
> Done & acked + applied. Thanks.
> 
>> diff --git a/tools/libfsimage/ext2fs-lib/Makefile 
>> b/tools/libfsimage/ext2fs-lib/Makefile
>> index 142207f..671fbff 100644
>> --- a/tools/libfsimage/ext2fs-lib/Makefile
>> +++ b/tools/libfsimage/ext2fs-lib/Makefile
>> @@ -4,7 +4,10 @@ LIB_SRCS-y = ext2fs-lib.c
>>  
>>  FS = ext2fs-lib
>>  
>> -FS_LIBDEPS = -lext2fs
>> +FS_LIBDEPS = $(EXTFS_LIBS)
>> +
>> +# Include configure output (config.h) to headers search path
>> +CFLAGS += -I$(XEN_ROOT)/tools
> 
> Is there any way to move config.h from tools to under tools/include
> somewhere? 

Yes, but config.h should then be renamed to xen_config.h or something
different from config.h, since a lot of utilities we pack with Xen
include their own config.h and also include the tools/include folder, so
we might have a collision there.

If renaming it to xen_config.h is fine I will send a patch.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel