commit: 279da36e2dc5c1f36caf952117ebfd8d5030bf34 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> AuthorDate: Mon Jun 13 11:23:50 2016 +0000 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> CommitDate: Mon Jun 13 11:23:50 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=279da36e
sys-cluster/lustre: fix build with gcc-6.1 Package-Manager: portage-2.3.0_rc1 ...8056-libcfs-Support-for-linux-4.2-kernels.patch | 2 +- ...56-o2iblnd-ib_query_device-removed-in-4.5.patch | 2 +- ...klnd-NETIF_F_ALL_CSUM-renamed-to-NETIF_F_.patch | 2 +- ...56-llite-use-inode_lock-to-access-i_mutex.patch | 2 +- ...te-inode_operations-interface-changed-in-.patch | 2 +- ...te-POSIX_ACL_XATTR_-ACCESS-DEFAULT-remove.patch | 2 +- ...op-fix-bio_for_each_segment_all-for-newer.patch | 2 +- .../files/0008-Fix-build-error-with-gcc-6.1.patch | 31 ++++++++++++++++++++++ .../files/lustre-do-not-include-udef.h.patch | 12 --------- sys-cluster/lustre/lustre-2.8.54.ebuild | 4 +-- 10 files changed, 40 insertions(+), 21 deletions(-) diff --git a/sys-cluster/lustre/files/0001-LU-8056-libcfs-Support-for-linux-4.2-kernels.patch b/sys-cluster/lustre/files/0001-LU-8056-libcfs-Support-for-linux-4.2-kernels.patch index e16ec2e..4e07906 100644 --- a/sys-cluster/lustre/files/0001-LU-8056-libcfs-Support-for-linux-4.2-kernels.patch +++ b/sys-cluster/lustre/files/0001-LU-8056-libcfs-Support-for-linux-4.2-kernels.patch @@ -1,7 +1,7 @@ From 9b478d607922c9683663f8e317d93b840e528884 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin <[email protected]> Date: Thu, 5 May 2016 22:08:05 +0300 -Subject: [PATCH 1/7] LU-8056 libcfs: Support for linux 4.2 kernels +Subject: [PATCH 1/8] LU-8056 libcfs: Support for linux 4.2 kernels In kernel version 4.2 commit df6b35f409af0a8ff1ef62f552b8402f3fef8665 header file i387.h was renamed to fpu/api.h diff --git a/sys-cluster/lustre/files/0002-LU-8056-o2iblnd-ib_query_device-removed-in-4.5.patch b/sys-cluster/lustre/files/0002-LU-8056-o2iblnd-ib_query_device-removed-in-4.5.patch index 6ce8433..5c0fcf9 100644 --- a/sys-cluster/lustre/files/0002-LU-8056-o2iblnd-ib_query_device-removed-in-4.5.patch +++ b/sys-cluster/lustre/files/0002-LU-8056-o2iblnd-ib_query_device-removed-in-4.5.patch @@ -1,7 +1,7 @@ From 0242d060692573dcb6f09750a62db1fa0f6d36df Mon Sep 17 00:00:00 2001 From: Li Dongyang <[email protected]> Date: Mon, 16 May 2016 17:18:39 +1000 -Subject: [PATCH 2/7] LU-8056 o2iblnd: ib_query_device removed in 4.5 +Subject: [PATCH 2/8] LU-8056 o2iblnd: ib_query_device removed in 4.5 We should use the cached attributes in ib_device instead of calling ib_query_device since kernel 4.5 diff --git a/sys-cluster/lustre/files/0003-LU-8056-socklnd-NETIF_F_ALL_CSUM-renamed-to-NETIF_F_.patch b/sys-cluster/lustre/files/0003-LU-8056-socklnd-NETIF_F_ALL_CSUM-renamed-to-NETIF_F_.patch index 756c911..6101219 100644 --- a/sys-cluster/lustre/files/0003-LU-8056-socklnd-NETIF_F_ALL_CSUM-renamed-to-NETIF_F_.patch +++ b/sys-cluster/lustre/files/0003-LU-8056-socklnd-NETIF_F_ALL_CSUM-renamed-to-NETIF_F_.patch @@ -1,7 +1,7 @@ From 6c3f19ba5b6db287980241e4d20be9ac5d0c1293 Mon Sep 17 00:00:00 2001 From: Li Dongyang <[email protected]> Date: Mon, 16 May 2016 17:27:23 +1000 -Subject: [PATCH 3/7] LU-8056 socklnd: NETIF_F_ALL_CSUM renamed to +Subject: [PATCH 3/8] LU-8056 socklnd: NETIF_F_ALL_CSUM renamed to NETIF_F_CSUM_MASK In kernel 4.5 NETIF_F_CSUM_MASK got renamed to NETIF_F_CSUM_MASK. diff --git a/sys-cluster/lustre/files/0004-LU-8056-llite-use-inode_lock-to-access-i_mutex.patch b/sys-cluster/lustre/files/0004-LU-8056-llite-use-inode_lock-to-access-i_mutex.patch index e0aab10..361061f 100644 --- a/sys-cluster/lustre/files/0004-LU-8056-llite-use-inode_lock-to-access-i_mutex.patch +++ b/sys-cluster/lustre/files/0004-LU-8056-llite-use-inode_lock-to-access-i_mutex.patch @@ -1,7 +1,7 @@ From ab0006e3a3bf5b0ff63f0914a9e7246dfa1729f8 Mon Sep 17 00:00:00 2001 From: Li Dongyang <[email protected]> Date: Mon, 16 May 2016 17:40:55 +1000 -Subject: [PATCH 4/7] LU-8056 llite: use inode_lock to access i_mutex +Subject: [PATCH 4/8] LU-8056 llite: use inode_lock to access i_mutex Linux kernel 4.5 introduced wrappers for i_mutex as the type of i_mutex will be changed in the future. diff --git a/sys-cluster/lustre/files/0005-LU-8056-llite-inode_operations-interface-changed-in-.patch b/sys-cluster/lustre/files/0005-LU-8056-llite-inode_operations-interface-changed-in-.patch index 11f2de4..72af637 100644 --- a/sys-cluster/lustre/files/0005-LU-8056-llite-inode_operations-interface-changed-in-.patch +++ b/sys-cluster/lustre/files/0005-LU-8056-llite-inode_operations-interface-changed-in-.patch @@ -1,7 +1,7 @@ From 0ec0c36d7a0ec5636e19eece4d5df7615f656c23 Mon Sep 17 00:00:00 2001 From: Li Dongyang <[email protected]> Date: Mon, 16 May 2016 21:57:31 +1000 -Subject: [PATCH 5/7] LU-8056 llite: inode_operations interface changed in 4.5 +Subject: [PATCH 5/8] LU-8056 llite: inode_operations interface changed in 4.5 Linux kernel 4.5 replaced follow_link() with get_link() while put_link() is removed. diff --git a/sys-cluster/lustre/files/0006-LU-8056-llite-POSIX_ACL_XATTR_-ACCESS-DEFAULT-remove.patch b/sys-cluster/lustre/files/0006-LU-8056-llite-POSIX_ACL_XATTR_-ACCESS-DEFAULT-remove.patch index a564203..6879248 100644 --- a/sys-cluster/lustre/files/0006-LU-8056-llite-POSIX_ACL_XATTR_-ACCESS-DEFAULT-remove.patch +++ b/sys-cluster/lustre/files/0006-LU-8056-llite-POSIX_ACL_XATTR_-ACCESS-DEFAULT-remove.patch @@ -1,7 +1,7 @@ From 103a363fa53f691d2bdbb38280e44d1c830c7322 Mon Sep 17 00:00:00 2001 From: Li Dongyang <[email protected]> Date: Mon, 16 May 2016 22:07:54 +1000 -Subject: [PATCH 6/7] LU-8056 llite: POSIX_ACL_XATTR_{ACCESS,DEFAULT} removed +Subject: [PATCH 6/8] LU-8056 llite: POSIX_ACL_XATTR_{ACCESS,DEFAULT} removed in 4.5 POSIX_ACL_XATTR_{ACCESS,DEFAULT} are duplicate diff --git a/sys-cluster/lustre/files/0007-LU-8056-lloop-fix-bio_for_each_segment_all-for-newer.patch b/sys-cluster/lustre/files/0007-LU-8056-lloop-fix-bio_for_each_segment_all-for-newer.patch index 656f7f6..be495b9 100644 --- a/sys-cluster/lustre/files/0007-LU-8056-lloop-fix-bio_for_each_segment_all-for-newer.patch +++ b/sys-cluster/lustre/files/0007-LU-8056-lloop-fix-bio_for_each_segment_all-for-newer.patch @@ -1,7 +1,7 @@ From 028c4416216af21dcae53f7daa4f549d0c2bad4f Mon Sep 17 00:00:00 2001 From: James Simmons <[email protected]> Date: Fri, 3 Jun 2016 14:09:54 -0400 -Subject: [PATCH 7/7] LU-8056 lloop: fix bio_for_each_segment_all for newer +Subject: [PATCH 7/8] LU-8056 lloop: fix bio_for_each_segment_all for newer kernels Lustre patch http://review.whamcloud.com/20478 back ported diff --git a/sys-cluster/lustre/files/0008-Fix-build-error-with-gcc-6.1.patch b/sys-cluster/lustre/files/0008-Fix-build-error-with-gcc-6.1.patch new file mode 100644 index 0000000..a6e167f --- /dev/null +++ b/sys-cluster/lustre/files/0008-Fix-build-error-with-gcc-6.1.patch @@ -0,0 +1,31 @@ +From 476bd7023e01ab844bcdb81ca2f43e3a07f91b3d Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov <[email protected]> +Date: Mon, 13 Jun 2016 14:22:04 +0300 +Subject: [PATCH 8/8] Fix build error with gcc-6.1 + +Signed-off-by: Alexey Shvetsov <[email protected]> +--- + lustre/utils/liblustreapi_hsm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c +index 0b12f37..2f5b95d 100644 +--- a/lustre/utils/liblustreapi_hsm.c ++++ b/lustre/utils/liblustreapi_hsm.c +@@ -429,11 +429,12 @@ static int llapi_hsm_log_ct_progress(struct hsm_copyaction_private **phcp, + goto err; + } + +- if (progress_type == CT_RUNNING) ++ if (progress_type == CT_RUNNING) { + rc = llapi_json_add_item(&json_items, "current_bytes", + LLAPI_JSON_BIGNUM, ¤t); + if (rc < 0) + goto err; ++ } + + cancel: + rc = llapi_json_add_item(&json_items, "event_type", LLAPI_JSON_STRING, +-- +2.8.2 + diff --git a/sys-cluster/lustre/files/lustre-do-not-include-udef.h.patch b/sys-cluster/lustre/files/lustre-do-not-include-udef.h.patch deleted file mode 100644 index 4bb353c..0000000 --- a/sys-cluster/lustre/files/lustre-do-not-include-udef.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN lustre-2.8.0.orig/config/lustre-build.m4 lustre-2.8.0/config/lustre-build.m4 ---- lustre-2.8.0.orig/config/lustre-build.m4 2016-06-12 23:18:39.992712332 +0300 -+++ lustre-2.8.0/config/lustre-build.m4 2016-06-12 23:21:39.928433319 +0300 -@@ -266,7 +266,7 @@ - # - AC_DEFUN([LB_CONFIG_HEADERS], [ - AC_CONFIG_HEADERS([config.h]) --CPPFLAGS="-include $PWD/undef.h -include $PWD/config.h $CPPFLAGS" -+CPPFLAGS="-include $PWD/config.h $CPPFLAGS" - EXTRA_KCFLAGS="-include $PWD/undef.h -include $PWD/config.h $EXTRA_KCFLAGS" - AC_SUBST(EXTRA_KCFLAGS) - ]) # LB_CONFIG_HEADERS diff --git a/sys-cluster/lustre/lustre-2.8.54.ebuild b/sys-cluster/lustre/lustre-2.8.54.ebuild index 57f0f37..2a976b2 100644 --- a/sys-cluster/lustre/lustre-2.8.54.ebuild +++ b/sys-cluster/lustre/lustre-2.8.54.ebuild @@ -44,7 +44,6 @@ REQUIRED_USE=" server? ( modules )" PATCHES=( - "${FILESDIR}/lustre-do-not-include-udef.h.patch" "${FILESDIR}/0001-LU-8056-libcfs-Support-for-linux-4.2-kernels.patch" "${FILESDIR}/0002-LU-8056-o2iblnd-ib_query_device-removed-in-4.5.patch" "${FILESDIR}/0003-LU-8056-socklnd-NETIF_F_ALL_CSUM-renamed-to-NETIF_F_.patch" @@ -52,6 +51,7 @@ PATCHES=( "${FILESDIR}/0005-LU-8056-llite-inode_operations-interface-changed-in-.patch" "${FILESDIR}/0006-LU-8056-llite-POSIX_ACL_XATTR_-ACCESS-DEFAULT-remove.patch" "${FILESDIR}/0007-LU-8056-lloop-fix-bio_for_each_segment_all-for-newer.patch" + "${FILESDIR}/0008-Fix-build-error-with-gcc-6.1.patch" ) pkg_setup() { @@ -64,7 +64,7 @@ pkg_setup() { } src_prepare() { - if [ ! -z ${PATCHES[@]} ]; then + if [ ! -z ${#PATCHES[0]} ]; then epatch ${PATCHES[@]} fi eapply_user
