[oe-commits] Khem Raj : tgt_1.0.12.bb: Update the posix_fallocate fix patch for uclibc
git version control
git at git.openembedded.org
Tue Jan 18 02:15:52 UTC 2011
Module: openembedded.git
Branch: master
Commit: e6b476e6725727d56781612da2bac6a16771e660
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e6b476e6725727d56781612da2bac6a16771e660
Author: Khem Raj <raj.khem at gmail.com>
Date: Mon Jan 17 18:06:26 2011 -0800
tgt_1.0.12.bb: Update the posix_fallocate fix patch for uclibc
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
.../stub-out-posix-fallocate-uclibc.patch | 89 ++++++++++++++++++++
.../tgt/tgt-1.0.12/use-ftruncate-on-uclibc.patch | 18 ----
recipes/tgt/tgt_1.0.12.bb | 4 +-
3 files changed, 91 insertions(+), 20 deletions(-)
diff --git a/recipes/tgt/tgt-1.0.12/stub-out-posix-fallocate-uclibc.patch b/recipes/tgt/tgt-1.0.12/stub-out-posix-fallocate-uclibc.patch
new file mode 100644
index 0000000..35b0071
--- /dev/null
+++ b/recipes/tgt/tgt-1.0.12/stub-out-posix-fallocate-uclibc.patch
@@ -0,0 +1,89 @@
+Delivered-To: raj.khem at gmail.com
+Received: by 10.90.55.10 with SMTP id d10cs170645aga;
+ Sun, 16 Jan 2011 19:40:57 -0800 (PST)
+Received: by 10.42.167.73 with SMTP id r9mr3888746icy.26.1295235656555;
+ Sun, 16 Jan 2011 19:40:56 -0800 (PST)
+Return-Path: <fujita.tomonori at lab.ntt.co.jp>
+Received: from sh.osrg.net (sh.osrg.net [192.16.179.4])
+ by mx.google.com with ESMTPS id i2si10061956icv.26.2011.01.16.19.40.55
+ (version=TLSv1/SSLv3 cipher=RC4-MD5);
+ Sun, 16 Jan 2011 19:40:56 -0800 (PST)
+Received-SPF: neutral (google.com: 192.16.179.4 is neither permitted nor denied by best guess record for domain of fujita.tomonori at lab.ntt.co.jp) client-ip=192.16.179.4;
+Authentication-Results: mx.google.com; spf=neutral (google.com: 192.16.179.4 is neither permitted nor denied by best guess record for domain of fujita.tomonori at lab.ntt.co.jp) smtp.mail=fujita.tomonori at lab.ntt.co.jp
+Received: from localhost (rose.osrg.net [10.76.0.1])
+ by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id p0H3erYQ001827;
+ Mon, 17 Jan 2011 12:40:53 +0900
+Date: Mon, 17 Jan 2011 12:40:53 +0900
+To: paulepanter at users.sourceforge.net
+Cc: stgt at vger.kernel.org, raj.khem at gmail.com
+Subject: Re: [PATCH] usr/tgtimg.c: use `ftruncate` to fix build with uClibc
+From: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
+In-Reply-To: <1295181691.5847.39.camel at mattotaupa>
+References: <1295181691.5847.39.camel at mattotaupa>
+Mime-Version: 1.0
+Content-Type: Text/Plain; charset=us-ascii
+Content-Transfer-Encoding: 7bit
+Message-Id: <20110117122804H.fujita.tomonori at lab.ntt.co.jp>
+Lines: 58
+X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Mon, 17 Jan 2011 12:40:54 +0900 (JST)
+X-Virus-Scanned: clamav-milter 0.96.5 at sh
+X-Virus-Status: Clean
+
+On Sun, 16 Jan 2011 13:41:31 +0100
+Paul Menzel <paulepanter at users.sourceforge.net> wrote:
+
+> From: Khem Raj <raj.khem at gmail.com>
+> Date: Sat Jan 15 16:37:19 2011 -0800
+>
+> uClibc does not provide `posix_fallocate` so use `ftruncate`.
+
+Hmm, what posix_fallocate does is identical to what ftruncate does in
+this situation?
+
+We avoid to adding #ifdef to *.c like linux kernel coding
+style. Please add #ifdef to *.h instead.
+
+You can do something like this:
+
+diff --git a/usr/tgtimg.c b/usr/tgtimg.c
+index 169207a..8ca2a4d 100644
+--- a/usr/tgtimg.c
++++ b/usr/tgtimg.c
+@@ -38,6 +38,7 @@
+ #include "ssc.h"
+ #include "libssc.h"
+ #include "scsi.h"
++#include "util.h"
+
+ #define NO_LOGGING
+ #include "log.h"
+@@ -438,7 +439,7 @@ static int sbc_new(int op, char *path, char *capacity, char *media_type)
+ perror("Failed creating file");
+ exit(2);
+ }
+- if (posix_fallocate(fd, 0, size*1024*1024LL) == -1) {
++ if (__fallocate(fd, 0, size*1024*1024LL) == -1) {
+ perror("posix_fallocate failed.");
+ exit(3);
+ }
+diff --git a/usr/util.h b/usr/util.h
+index 9530d2a..4a0e303 100644
+--- a/usr/util.h
++++ b/usr/util.h
+@@ -159,4 +159,16 @@ struct signalfd_siginfo {
+ };
+ #endif
+
++#ifndef __UCLIBC__
++static inline int __fallocate(int fd, off_t offset, off_t len)
++{
++ return posix_fallocate(fd, offset, len);
++}
++#else
++static inline int __fallocate(int fd, off_t offset, off_t len)
++{
++ return 0
++}
++#endif
++
+ #endif
diff --git a/recipes/tgt/tgt-1.0.12/use-ftruncate-on-uclibc.patch b/recipes/tgt/tgt-1.0.12/use-ftruncate-on-uclibc.patch
deleted file mode 100644
index e9b6e38..0000000
--- a/recipes/tgt/tgt-1.0.12/use-ftruncate-on-uclibc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: tgt-1.0.12/usr/tgtimg.c
-===================================================================
---- tgt-1.0.12.orig/usr/tgtimg.c 2011-01-15 16:28:30.488656000 -0800
-+++ tgt-1.0.12/usr/tgtimg.c 2011-01-15 16:35:14.958656001 -0800
-@@ -438,8 +438,13 @@
- perror("Failed creating file");
- exit(2);
- }
-+#ifndef __UCLIBC__
- if (posix_fallocate(fd, 0, size*1024*1024LL) == -1) {
- perror("posix_fallocate failed.");
-+#else
-+ if (ftruncate (fd, size*1024*1024LL) == -1) {
-+ perror("ftruncate failed.");
-+#endif
- exit(3);
- }
-
diff --git a/recipes/tgt/tgt_1.0.12.bb b/recipes/tgt/tgt_1.0.12.bb
index 0288b16..c9e90fe 100644
--- a/recipes/tgt/tgt_1.0.12.bb
+++ b/recipes/tgt/tgt_1.0.12.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "http://stgt.berlios.de/"
LICENSE = "GPLv2"
DEPENDS = "openssl"
RDEPENDS_${PN} = "iscsi-target"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://stgt.berlios.de/releases/tgt-${PV}.tar.gz \
- file://use-ftruncate-on-uclibc.patch \
+ file://stub-out-posix-fallocate-uclibc.patch \
"
SRC_URI[md5sum] = "d3bc4098d0ec6f4418e574ea7fdd18eb"
SRC_URI[sha256sum] = "4d90567997e16194b86cc3ab0a55c7aa5c5054681176b60c6635b20a1feaffe2"
More information about the Openembedded-commits
mailing list