From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay06.ispgateway.de ([80.67.31.95]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Rnzem-0006Sw-Kq for ptxdist@pengutronix.de; Thu, 19 Jan 2012 22:36:30 +0100 Received: from [88.217.119.226] (helo=galilei.fritz.box) by smtprelay06.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1Rnzem-0002IC-2R for ptxdist@pengutronix.de; Thu, 19 Jan 2012 22:36:28 +0100 From: Bernhard Walle Date: Thu, 19 Jan 2012 22:36:21 +0100 Message-Id: <1327008981-10316-1-git-send-email-bernhard@bwalle.de> In-Reply-To: <20120119211425.GC4854@pengutronix.de> References: <20120119211425.GC4854@pengutronix.de> Subject: [ptxdist] [PATCH] host-e2fsprogs: Fix build on Darwin Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de 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 --- .../0003-Fix-compilation-on-Darwin.patch | 44 ++++++++++++++++++++ patches/e2fsprogs-1.41.14/series | 3 +- 2 files changed, 46 insertions(+), 1 deletions(-) create mode 100644 patches/e2fsprogs-1.41.14/0003-Fix-compilation-on-Darwin.patch diff --git a/patches/e2fsprogs-1.41.14/0003-Fix-compilation-on-Darwin.patch b/patches/e2fsprogs-1.41.14/0003-Fix-compilation-on-Darwin.patch new file mode 100644 index 0000000..cb58afd --- /dev/null +++ b/patches/e2fsprogs-1.41.14/0003-Fix-compilation-on-Darwin.patch @@ -0,0 +1,44 @@ +From: Bernhard Walle +Date: Thu, 19 Jan 2012 22:31:46 +0100 +Subject: [PATCH] Fix compilation on Darwin + +The patch is inspired by the patch at +http://sourceforge.net/tracker/?func=detail&aid=3140289&group_id=2406&atid=102406 +(bug tracker of the upstream project). + +Signed-off-by: Bernhard Walle +--- + lib/ext2fs/unix_io.c | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c +index 1df1fdd..cbd3d70 100644 +--- a/lib/ext2fs/unix_io.c ++++ b/lib/ext2fs/unix_io.c +@@ -463,8 +463,10 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel) + open_flags = (flags & IO_FLAG_RW) ? O_RDWR : O_RDONLY; + if (flags & IO_FLAG_EXCLUSIVE) + open_flags |= O_EXCL; ++#ifdef O_DIRECT + if (flags & IO_FLAG_DIRECT_IO) + open_flags |= O_DIRECT; ++#endif + data->flags = flags; + + #ifdef HAVE_OPEN64 +@@ -477,6 +479,15 @@ static errcode_t unix_open(const char *name, int flags, io_channel *channel) + goto cleanup; + } + ++#if !defined(O_DIRECT) && defined(F_NOCACHE) ++ if (flags & IO_FLAG_DIRECT_IO) { ++ if (fcntl(data->dev, F_NOCACHE, 1) < 0) { ++ retval = errno; ++ goto cleanup; ++ } ++ } ++#endif ++ + #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..44a543e 100644 --- a/patches/e2fsprogs-1.41.14/series +++ b/patches/e2fsprogs-1.41.14/series @@ -2,4 +2,5 @@ #tag:base --start-number 1 0001-Fixed-bitops.h-for-Coldfire-V4E.patch 0002-fix-linking-problem.patch -# ec0cc8b8677eb72a286f38e0e9ba63e9 - git-ptx-patches magic +0003-Fix-compilation-on-Darwin.patch +# b3f719def2b2e0004e2d9a830ebc59d0 - git-ptx-patches magic -- 1.7.7.4 -- ptxdist mailing list ptxdist@pengutronix.de