[Buildroot] [PATCH 1/1] e2fsprogs: fix missing fallocate64() on nios2

[Frank Bergmann <frank@frajasalo.de>]

Hello,

On 18.02.2014 22:19, Thomas Petazzoni wrote:
> Dear Frank Bergmann,
>
> Please send your patches with "git send-email". Thunderbird has badly
> replaces the tabs by spaces.

Sorry for that, next time using the right tool !

> On Sat, 15 Feb 2014 19:52:01 +0100, Frank Bergmann wrote:
>> Nios2 is currently missing the fallocate64 system call. Because of
>> compiling the e2fsprogs package with _FILE_OFFSET_BITS=64 the fallocate
>> call is replaced by fallocate64 by the glibc. Therefor fallocate is
>> entirely disbaled while configuring the package.
>
> Therefor -> Therefore
> disbaled -> disabled
>
>>
>> e4defrag have to be disabled because it declares the fallocate64 but
>> the library have its own defined.
>
> Not sure I understand this part.

Sorry for not being clear but the toolchain is a little bit messy:
In the toolchain headers fallocate64 is defined but it is not implemented in the library.
e4defrag declares its own fallocate64 function that throw an error because of the previous
declaration in the header.

>
>>
>> It fixes an autobuilder issue:
>> http://autobuild.buildroot.org/results/70a/70a47bd7392560cbc1c64769c8357c0b4c91ca3b/
>>
>> Signed-off-by: Frank Bergmann <frank@frajasalo.de>
>> ---
>>    package/e2fsprogs/Config.in    | 2 +-
>>    package/e2fsprogs/e2fsprogs.mk | 3 ++-
>>    2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
>> index 7775e94..1e87aef 100644
>> --- a/package/e2fsprogs/Config.in
>> +++ b/package/e2fsprogs/Config.in
>> @@ -49,7 +49,7 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO
>>
>>    config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
>>           bool "e4defrag"
>> -       depends on !BR2_avr32 # fallocate not implemented
>> +       depends on !BR2_avr32 && !BR2_nios2 # fallocate not implemented
>>
>>    config BR2_PACKAGE_E2FSPROGS_FILEFRAG
>>           bool "filefrag"
>> diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
>> index 2eb59f5..310f549 100644
>> --- a/package/e2fsprogs/e2fsprogs.mk
>> +++ b/package/e2fsprogs/e2fsprogs.mk
>> @@ -23,7 +23,8 @@ E2FSPROGS_CONF_OPT = \
>>           --disable-libuuid \
>>           --enable-fsck \
>>           --disable-e2initrd-helper \
>> -       --disable-testio-debug
>> +       --disable-testio-debug \
>> +       $(if $(BR2_nios2),ac_cv_func_fallocate=no,)
>
> Such variables are normally passed in <pkg>_CONF_ENV. Also, in
> Config.in, the fallocate problem seems to also apply for AVR32, while
> you only pass ac_cv_func_fallocate=no for NIOS II here. Could you
> explain why?

As written in the patch description fallocate is replaced by fallocate64 if using
_FILE_OFFSET_BITS=64 . fallocate64 is not available in nios2 toolchain library. So
if in that case we want to avoid fallocate64 then we have to avoid fallocate.

Not sure for the moment why it's working for AVR32 but fallocate is referenced in
lib/ext2fs/unix_io.c which builds libext2fs.so and therefore it's independent of
e4defrag. Only avoiding e4defrag does not work for nios2.

I missed that ac_cv_func_fallocate is normally passed in E2FSPROGS_CONF_ENV.

Regards,
Frank.