The O_DIRECT flag in e2fsprogs is relatively new. MacPorts is still using the old version of e2fsprogs. However, this patch from the upstream bug tracker fixes the build of e2fsprogs.
Strictly direct I/O is not required for ptxdist because we're working on images only. So removing O_DIRECT here would also work, but this solution is cleaner. Signed-off-by: Bernhard Walle <bernh...@bwalle.de> --- .../0003-darwin_directio_fix.patch | 46 ++++++++++++++++++++ patches/e2fsprogs-1.41.14/series | 1 + 2 files changed, 47 insertions(+), 0 deletions(-) create mode 100644 patches/e2fsprogs-1.41.14/0003-darwin_directio_fix.patch diff --git a/patches/e2fsprogs-1.41.14/0003-darwin_directio_fix.patch b/patches/e2fsprogs-1.41.14/0003-darwin_directio_fix.patch new file mode 100644 index 0000000..1e00c04 --- /dev/null +++ b/patches/e2fsprogs-1.41.14/0003-darwin_directio_fix.patch @@ -0,0 +1,46 @@ +Fix compilation on Darwin + +The patch is from upstream bug tracker [1]. However, it's not (yet) in the +upstream repository. + +[1] http://sourceforge.net/tracker/?func=detail&aid=3140289&group_id=2406&atid=102406 +--- + lib/ext2fs/unix_io.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/lib/ext2fs/unix_io.c ++++ b/lib/ext2fs/unix_io.c +@@ -428,6 +428,7 @@ static errcode_t unix_open(const char *n + struct unix_private_data *data = NULL; + errcode_t retval; + int open_flags; ++ int f_nocache = 0; + struct stat st; + #ifdef __linux__ + struct utsname ut; +@@ -464,7 +465,11 @@ static errcode_t unix_open(const char *n + if (flags & IO_FLAG_EXCLUSIVE) + open_flags |= O_EXCL; + if (flags & IO_FLAG_DIRECT_IO) ++#if !defined(O_DIRECT) && defined(F_NOCACHE) ++ f_nocache = F_NOCACHE; ++#else + open_flags |= O_DIRECT; ++#endif + data->flags = flags; + + #ifdef HAVE_OPEN64 +@@ -477,6 +482,13 @@ static errcode_t unix_open(const char *n + goto cleanup; + } + ++ if (f_nocache) { ++ if (fcntl(data->dev, f_nocache, 1) < 0) { ++ retval = errno; ++ goto cleanup; ++ } ++ } ++ + #ifdef BLKSSZGET + if (flags & IO_FLAG_DIRECT_IO) { + if (ioctl(data->dev, BLKSSZGET, &data->align) != 0) diff --git a/patches/e2fsprogs-1.41.14/series b/patches/e2fsprogs-1.41.14/series index fac473a..26e2c33 100644 --- a/patches/e2fsprogs-1.41.14/series +++ b/patches/e2fsprogs-1.41.14/series @@ -3,3 +3,4 @@ 0001-Fixed-bitops.h-for-Coldfire-V4E.patch 0002-fix-linking-problem.patch # ec0cc8b8677eb72a286f38e0e9ba63e9 - git-ptx-patches magic +0003-darwin_directio_fix.patch -- 1.7.7.4 -- ptxdist mailing list ptxdist@pengutronix.de
