Skip to contentSkip to conversation

e2fsprogs: fix missing fallocate64() on nios2

PATCH New Frank Bergmann 2 participants 4 messages Feb 20, 2014 – Feb 27, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 e2fsprogs: fix missing fallocate64() on nios2

(external) nios2 toolchain is currently missing the fallocate64 system call. Because of compiling the e2fsprogs package with _FILE_OFFSET_BITS=64, _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE the fallocate call is replaced by fallocate64 by the glibc. Therefore fallocate is entirely disabled while configuring the package.

Fixes http://autobuild.buildroot.org/results/70a/70a47bd7392560cbc1c64769c8357c0b4c91ca3b/

---
 package/e2fsprogs/e2fsprogs.mk |    4 ++++
 1 file changed, 4 insertions(+)
package/e2fsprogs/e2fsprogs.mk +4 -0
index 2eb59f5..76e2d4e 100644
@@ -25,6 +25,10 @@ E2FSPROGS_CONF_OPT = \
 	--disable-e2initrd-helper \
 	--disable-testio-debug
 
+ifeq ($(BR2_nios2),y)
+E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
+endif
+
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
 
 E2FSPROGS_MAKE_OPT = \
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 2/2 e2fsprogs: disable e4defrag for nios

e4defrag has to be disabled because of the (external) toolchain declares the fallocate64 call in the header files but don't implement it in the library. e4defrag defines its own fallocate64 function that throws an error because of the previous declaration in the toolchain header.

---
 package/e2fsprogs/Config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/e2fsprogs/Config.in +1 -1
index 7775e94..1e87aef 100644
@@ -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"
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v2 2/2 e2fsprogs: disable e4defrag for nios

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Frank" == Frank Bergmann <[email protected]> writes:

e4defrag has to be disabled because of the (external) toolchain declares the fallocate64 call in the header files but don't implement it in the library. e4defrag defines its own fallocate64 function that throws an error because of the previous declaration in the toolchain header.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v2 1/2 e2fsprogs: fix missing fallocate64() on nios2

In reply to Frank Bergmann
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Frank" == Frank Bergmann <[email protected]> writes:

(external) nios2 toolchain is currently missing the fallocate64 system call. Because of compiling the e2fsprogs package with _FILE_OFFSET_BITS=64, _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE the fallocate call is replaced by fallocate64 by the glibc. Therefore fallocate is entirely disabled while configuring the package.

Fixes http://autobuild.buildroot.org/results/70a/70a47bd7392560cbc1c64769c8357c0b4c91ca3b/

Ups, this was the one I committed, not v1.

Signature · 1 line
Bye, Peter Korsgaard