[oe-commits] Frans Meulenbroeks : Revert "udev: set DP to -1 for nios2"
git version control
git at git.openembedded.org
Wed Mar 2 21:49:40 UTC 2011
Module: openembedded.git
Branch: master
Commit: 699268ed3c5df7701d757aaebbed651eceb84d71
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=699268ed3c5df7701d757aaebbed651eceb84d71
Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date: Wed Mar 2 22:47:53 2011 +0100
Revert "udev: set DP to -1 for nios2"
This reverts commit aec02dd6427497cf6d216659c5192d8d4fc5d5a7.
accidently added some crap to the commit, sorry
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
---
.../stub-out-posix-fallocate-uclibc.patch | 93 --------------------
recipes/tgt/tgt_1.0.13.bb | 20 ----
recipes/udev/udev_162.bb | 1 -
3 files changed, 0 insertions(+), 114 deletions(-)
diff --git a/recipes/tgt/tgt-1.0.13/stub-out-posix-fallocate-uclibc.patch b/recipes/tgt/tgt-1.0.13/stub-out-posix-fallocate-uclibc.patch
deleted file mode 100644
index abb29fe..0000000
--- a/recipes/tgt/tgt-1.0.13/stub-out-posix-fallocate-uclibc.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From fujita.tomonori at lab.ntt.co.jp Sun Jan 16 19:40:56 2011
-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>
-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
-Status: RO
-Content-Length: 1415
-Lines: 58
-
-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.13.bb b/recipes/tgt/tgt_1.0.13.bb
deleted file mode 100644
index f856fba..0000000
--- a/recipes/tgt/tgt_1.0.13.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Linux target framework (tgt) aims to simplify various SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation and maintenance"
-HOMEPAGE = "http://stgt.berlios.de/"
-LICENSE = "GPLv2"
-DEPENDS = "openssl"
-RDEPENDS_${PN} = "iscsi-target"
-PR = "r2"
-
-SRC_URI = "http://stgt.berlios.de/releases/tgt-${PV}.tar.gz \
- file://stub-out-posix-fallocate-uclibc.patch \
- "
-SRC_URI[md5sum] = "e8363decf721a2993121e1071dbf04b1"
-SRC_URI[sha256sum] = "7221dbddf4744593ea75ad9365205dab90c01b2f1a568f4b7d5276dcbef520e6"
-
-EXTRA_OEMAKE += "ISCSI=1"
-
-do_install() {
- oe_runmake DESTDIR="${D}" install
-}
-
-TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes/udev/udev_162.bb b/recipes/udev/udev_162.bb
index 40104be..2991b28 100644
--- a/recipes/udev/udev_162.bb
+++ b/recipes/udev/udev_162.bb
@@ -7,7 +7,6 @@ PR = "r12"
# Untested
#DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_nios2 = "-1"
# Needed for udev-extras
DEPENDS = "gperf-native usbutils acl glib-2.0"
More information about the Openembedded-commits
mailing list