From: Roger Pau Monne <roger.pau@citrix.com>
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: xen-devel <xen-devel@lists.xen.org>
Subject: Re: [PATCH] libfsimage: add ext4 support for CentOS 5.x
Date: Fri, 14 Sep 2012 11:19:14 +0100 [thread overview]
Message-ID: <505304A2.7020901@citrix.com> (raw)
In-Reply-To: <1347613534.24226.167.camel@zakaz.uk.xensource.com>
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@citrix.com>
>> ---
>> 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.
next prev parent reply other threads:[~2012-09-14 10:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 3:02 Xen 4.2 (missing) pygrub support for ext4 on rhel5/centos5 e4fsprogs Pasi Kärkkäinen
2012-09-05 9:05 ` Andrew Cooper
2012-09-05 12:03 ` [PATCH] libfsimage: add ext4 support for CentOS 5.x Roger Pau Monne
2012-09-05 18:04 ` Ian Campbell
2012-09-05 20:55 ` Pasi Kärkkäinen
2012-09-06 7:23 ` Ian Campbell
2012-09-06 14:39 ` Pasi Kärkkäinen
2012-09-14 9:05 ` Ian Campbell
2012-09-14 10:19 ` Roger Pau Monne [this message]
2012-09-14 10:21 ` Ian Campbell
2012-10-14 11:10 ` [PATCH] libfsimage: add ext4 support for CentOS 5.x / Xen 4.2.1 backport Pasi Kärkkäinen
2012-10-14 11:26 ` Steven Haigh
2012-10-15 7:52 ` Ian Campbell
2012-10-15 13:12 ` Pasi Kärkkäinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=505304A2.7020901@citrix.com \
--to=roger.pau@citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).