[gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/, sys-cluster/lustre/files/

[Alexey Shvetsov]

commit:     a140ebab5df4d5b6ad839cf8b46ee294cbee450c
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 11:28:41 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 11:28:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a140ebab

Add patch to fix as-needed issue

Package-Manager: portage-2.2.0_alpha170
RepoMan-Options: --force

---
 sys-cluster/lustre/ChangeLog                       |   12 ++++
 ...ld-make-AC-check-for-linux-arch-sandbox-f.patch |    2 +-
 ...cfs-use-sock_alloc_file-instead-of-sock_m.patch |    2 +-
 ...pat-posix_acl_-to-from-_xattr-take-user_n.patch |    2 +-
 ...004-LU-2800-llite-introduce-local-getname.patch |    2 +-
 ...ld-check-header-files-in-generated-uapi-d.patch |    2 +-
 ...50-kernel-3.8-upstream-removes-vmtruncate.patch |    2 +-
 ...-2850-kernel-3.8-upstream-kills-daemonize.patch |    2 +-
 .../files/0008-LU-2987-llite-rcu-free-inode.patch  |    2 +-
 ...ubuntu-Fix-build-failures-on-Ubuntu-12.04.patch |   58 ++++++++++++++++++++
 sys-cluster/lustre/lustre-9999.ebuild              |    1 +
 11 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog
index 16471dd..4452f88 100644
--- a/sys-cluster/lustre/ChangeLog
+++ b/sys-cluster/lustre/ChangeLog
@@ -3,6 +3,18 @@
 # $Header: $
 
   31 Mar 2013; Alexey Shvetsov <alexxy@g.o>
+  +files/0009-LU-3011-ubuntu-Fix-build-failures-on-Ubuntu-12.04.patch,
+  files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
+  files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch,
+  files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch,
+  files/0004-LU-2800-llite-introduce-local-getname.patch,
+  files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch,
+  files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch,
+  files/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch,
+  files/0008-LU-2987-llite-rcu-free-inode.patch, lustre-9999.ebuild:
+  Add patch to fix as-needed issue
+
+  31 Mar 2013; Alexey Shvetsov <alexxy@g.o>
   +files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch,
   +files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch,
   +files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch,

diff --git a/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch b/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
index 3f372ac..487c99b 100644
--- a/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
+++ b/sys-cluster/lustre/files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch
@@ -1,7 +1,7 @@
 From d0169772fa2ebda3ed5c619d5e5cd6339973b0a0 Mon Sep 17 00:00:00 2001
 From: Alexey Shvetsov <alexxy@g.o>
 Date: Mon, 18 Mar 2013 16:22:27 +0400
-Subject: [PATCH 1/8] LU-2982 build: make AC check for linux arch sandbox
+Subject: [PATCH 1/9] LU-2982 build: make AC check for linux arch sandbox
  friendly
 
 this commit makes AC check for linux kernel arch sandbox friendly

diff --git a/sys-cluster/lustre/files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch b/sys-cluster/lustre/files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
index fe43064..68450f5 100644
--- a/sys-cluster/lustre/files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
+++ b/sys-cluster/lustre/files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch
@@ -1,7 +1,7 @@
 From 8258deb14e38559bf5ef37bd50a0918cdf473c00 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Wed, 13 Feb 2013 02:45:16 -0500
-Subject: [PATCH 2/8] LU-2800 libcfs: use sock_alloc_file instead of
+Subject: [PATCH 2/9] LU-2800 libcfs: use sock_alloc_file instead of
  sock_map_fd
 
 v2.6.27 added a second argument to sock_map_fd. Earlier versions are

diff --git a/sys-cluster/lustre/files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch b/sys-cluster/lustre/files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
index 9f05db0..5f96a81 100644
--- a/sys-cluster/lustre/files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
+++ b/sys-cluster/lustre/files/0003-LU-2850-compat-posix_acl_-to-from-_xattr-take-user_n.patch
@@ -1,7 +1,7 @@
 From 3050d2c9cccb51ce521bdbecd471cb6ce18f77b8 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Wed, 20 Mar 2013 17:33:17 -0400
-Subject: [PATCH 3/8] LU-2850 compat: posix_acl_{to,from}_xattr take
+Subject: [PATCH 3/9] LU-2850 compat: posix_acl_{to,from}_xattr take
  user_namespace
 
 Commit 5f3a4a28 (v3.7) added a struct user_namespace argument to

diff --git a/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch b/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch
index e194dfd..7218853 100644
--- a/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch
+++ b/sys-cluster/lustre/files/0004-LU-2800-llite-introduce-local-getname.patch
@@ -1,7 +1,7 @@
 From 4f1bc5cb857ebba89b84d27ed5ed6531b8a59058 Mon Sep 17 00:00:00 2001
 From: Jeff Mahoney <jeffm@××××.com>
 Date: Tue, 19 Mar 2013 21:18:32 -0400
-Subject: [PATCH 4/8] LU-2800 llite: introduce local getname()
+Subject: [PATCH 4/9] LU-2800 llite: introduce local getname()
 
 Commit 8e377d15 (v3.7) unexported getname and putname. Although
 getname was re-exported, putname was not. All we really need is

diff --git a/sys-cluster/lustre/files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch b/sys-cluster/lustre/files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch
index a802215..0c36aa6 100644
--- a/sys-cluster/lustre/files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch
+++ b/sys-cluster/lustre/files/0005-LU-2850-build-check-header-files-in-generated-uapi-d.patch
@@ -1,7 +1,7 @@
 From 60c775330c663b7ecd32f314ab156ad0ba0ea072 Mon Sep 17 00:00:00 2001
 From: Peng Tao <tao.peng@×××.com>
 Date: Wed, 27 Feb 2013 18:29:34 +0800
-Subject: [PATCH 5/8] LU-2850 build: check header files in generated uapi dir
+Subject: [PATCH 5/9] LU-2850 build: check header files in generated uapi dir
 
 Upstream moved UAPI headers into generated/uapi directory since
 v3.7. We need to check/include necessary header files there.

diff --git a/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch b/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
index 380597d..d9444a7 100644
--- a/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
+++ b/sys-cluster/lustre/files/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch
@@ -1,7 +1,7 @@
 From 19491f9e67e43ae10ae1f71e38730606e2c518a8 Mon Sep 17 00:00:00 2001
 From: Alexey Shvetsov <alexxy@g.o>
 Date: Wed, 27 Mar 2013 08:49:01 +0400
-Subject: [PATCH 6/8] LU-2850 kernel: 3.8 upstream removes vmtruncate()
+Subject: [PATCH 6/9] LU-2850 kernel: 3.8 upstream removes vmtruncate()
 
 vmtruncate() is removed since upstream commit b9f61c3.
 We can open code is for llite though.

diff --git a/sys-cluster/lustre/files/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch b/sys-cluster/lustre/files/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
index b6d2434..2092458 100644
--- a/sys-cluster/lustre/files/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
+++ b/sys-cluster/lustre/files/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch
@@ -1,7 +1,7 @@
 From fc013881dd3b551e8fb8a5f6722a359c56c7bf63 Mon Sep 17 00:00:00 2001
 From: Peng Tao <tao.peng@×××.com>
 Date: Mon, 18 Mar 2013 10:47:57 +0800
-Subject: [PATCH 7/8] LU-2850 kernel: 3.8 upstream kills daemonize()
+Subject: [PATCH 7/9] LU-2850 kernel: 3.8 upstream kills daemonize()
 
 kernel_thread() is a low level kernel function.
 Instead of calling kernel_thread() and relying on daemonize()

diff --git a/sys-cluster/lustre/files/0008-LU-2987-llite-rcu-free-inode.patch b/sys-cluster/lustre/files/0008-LU-2987-llite-rcu-free-inode.patch
index 35d281d..3960fe0 100644
--- a/sys-cluster/lustre/files/0008-LU-2987-llite-rcu-free-inode.patch
+++ b/sys-cluster/lustre/files/0008-LU-2987-llite-rcu-free-inode.patch
@@ -1,7 +1,7 @@
 From 77ae599340fc509002f2875257c2e024fb1b44fb Mon Sep 17 00:00:00 2001
 From: Peng Tao <tao.peng@×××.com>
 Date: Tue, 19 Mar 2013 14:04:47 +0800
-Subject: [PATCH 8/8] LU-2987 llite: rcu-free inode
+Subject: [PATCH 8/9] LU-2987 llite: rcu-free inode
 
 Since 2.6.38, inode.i_rcu was added and file system .destory_inode
 should rcu-free inodes.

diff --git a/sys-cluster/lustre/files/0009-LU-3011-ubuntu-Fix-build-failures-on-Ubuntu-12.04.patch b/sys-cluster/lustre/files/0009-LU-3011-ubuntu-Fix-build-failures-on-Ubuntu-12.04.patch
new file mode 100644
index 0000000..2542cf4
--- /dev/null
+++ b/sys-cluster/lustre/files/0009-LU-3011-ubuntu-Fix-build-failures-on-Ubuntu-12.04.patch
@@ -0,0 +1,58 @@
+From 84010884ffc614cc0d5cf06e5416dadc2693a86a Mon Sep 17 00:00:00 2001
+From: Robert Read <robert.read@×××××.com>
+Date: Fri, 22 Mar 2013 11:32:13 -0700
+Subject: [PATCH 9/9] LU-3011 ubuntu: Fix build failures on Ubuntu 12.04
+
+Fix "set-but-unused" warning by using the variable,
+and move -lreadline to end of link command line.
+
+Signed-off-by: Robert Read <robert.read.@×××××.com>
+Change-Id: I676e319ed81dbb6ba41d039e7b075b02d5122b48
+---
+ libcfs/autoconf/lustre-libcfs.m4 | 1 +
+ lustre/utils/Makefile.am         | 8 ++++----
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
+index 5789166..72ae7b4 100644
+--- a/libcfs/autoconf/lustre-libcfs.m4
++++ b/libcfs/autoconf/lustre-libcfs.m4
+@@ -918,6 +918,7 @@ AC_COMPILE_IFELSE([
+ 		__u64 *data2 = NULL;
+ 
+ 		data1 = data2;
++		data2 = data1;
+ 		return 0;
+ 	}
+ ],[
+diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
+index 1309376..bc8d716 100644
+--- a/lustre/utils/Makefile.am
++++ b/lustre/utils/Makefile.am
+@@ -42,19 +42,19 @@ endif
+ noinst_LIBRARIES = liblustreapitmp.a
+ 
+ lctl_SOURCES = lustre_lfsck.c obd.c lustre_cfg.c lctl.c obdctl.h
+-lctl_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
++lctl_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
+ lctl_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+ 
+ lfs_SOURCES = lfs.c obd.c lustre_cfg.c
+-lfs_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
++lfs_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
+ lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+ 
+ loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c
+-loadgen_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
++loadgen_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
+ loadgen_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+ 
+ lustre_rsync_SOURCES = lustre_rsync.c obd.c lustre_cfg.c lustre_rsync.h
+-lustre_rsync_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
++lustre_rsync_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE)
+ lustre_rsync_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+ 
+ ll_recover_lost_found_objs_SOURCES = ll_recover_lost_found_objs.c
+-- 
+1.8.1.5
+

diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild
index 3457fbf..a25e2a5 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}/0006-LU-2850-kernel-3.8-upstream-removes-vmtruncate.patch"
 	"${FILESDIR}/0007-LU-2850-kernel-3.8-upstream-kills-daemonize.patch"
 	"${FILESDIR}/0008-LU-2987-llite-rcu-free-inode.patch"
+	"${FILESDIR}/0009-LU-3011-ubuntu-Fix-build-failures-on-Ubuntu-12.04.patch"
 )
 
 pkg_setup() {