From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0FD81198005 for ; Mon, 18 Mar 2013 12:13:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C16BE0262; Mon, 18 Mar 2013 12:13:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08E36E0262 for ; Mon, 18 Mar 2013 12:13:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D65233C1EE for ; Mon, 18 Mar 2013 12:13:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 16CB5E4073 for ; Mon, 18 Mar 2013 12:13:31 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1363608789.8bf621a051b09547c78c80bf5736cb35480d3f72.alexxy@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/, sys-cluster/lustre/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/lustre/ChangeLog sys-cluster/lustre/files/LU-2982.patch sys-cluster/lustre/lustre-9999.ebuild X-VCS-Directories: sys-cluster/lustre/ sys-cluster/lustre/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 8bf621a051b09547c78c80bf5736cb35480d3f72 X-VCS-Branch: master Date: Mon, 18 Mar 2013 12:13:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 58c30e2f-41f0-4ce6-8756-529e229a866a X-Archives-Hash: fc4a8e3a0f81f5c724c5b27b9194bb03 commit: 8bf621a051b09547c78c80bf5736cb35480d3f72 Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Mar 18 12:13:09 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Mar 18 12:13:09 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8bf621a0 Fix sandbox violation during configure Package-Manager: portage-2.2.0_alpha166 RepoMan-Options: --force --- sys-cluster/lustre/ChangeLog | 4 ++ sys-cluster/lustre/files/LU-2982.patch | 50 ++++++++++++++++++++++++++++++++ sys-cluster/lustre/lustre-9999.ebuild | 1 + 3 files changed, 55 insertions(+), 0 deletions(-) diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog index 458f162..35c3d06 100644 --- a/sys-cluster/lustre/ChangeLog +++ b/sys-cluster/lustre/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 Mar 2013; Alexey Shvetsov +files/LU-2982.patch, + lustre-9999.ebuild: + Fix sandbox violation during configure + 18 Mar 2013; Alexey Shvetsov files/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch, files/0002-LU-2850-kernel-3.7-kernel-posix-acl-needs-userns.patch, diff --git a/sys-cluster/lustre/files/LU-2982.patch b/sys-cluster/lustre/files/LU-2982.patch new file mode 100644 index 0000000..f8f8bd0 --- /dev/null +++ b/sys-cluster/lustre/files/LU-2982.patch @@ -0,0 +1,50 @@ +diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 +index 4c0a581..1ea0d12 100644 +--- a/build/autoconf/lustre-build-linux.m4 ++++ b/build/autoconf/lustre-build-linux.m4 +@@ -363,14 +363,37 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest. + # Determine the kernel's idea of the current architecture + # + AC_DEFUN([LB_LINUX_ARCH], +- [AC_MSG_CHECKING([Linux kernel architecture]) +- AS_IF([rm -f $PWD/build/arch +- make -s --no-print-directory echoarch -f $PWD/build/Makefile \ +- LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -C $LINUX \ +- ARCHFILE=$PWD/build/arch && LINUX_ARCH=`cat $PWD/build/arch`], +- [AC_MSG_RESULT([$LINUX_ARCH])], +- [AC_MSG_ERROR([Could not determine the kernel architecture.])]) +- rm -f build/arch]) ++ [LINUXARCH= ++ rm -f build/conftest.i ++ AC_MSG_CHECKING([Linux kernel architecture]) ++ if test -s $LINUX_OBJ/include/$AUTOCONF_HDIR/compile.h ; then ++ LINUXARCHHEADER=$AUTOCONF_HDIR/compile.h ++ else ++ LINUXARCHHEADER=linux/version.h ++ fi ++ LB_LINUX_TRY_MAKE([ ++ #include <$LINUXARCHHEADER> ++ ],[ ++ char *LINUXARCH; ++ LINUXARCH=UTS_MACHINE; ++ ],[ ++ $makerule LUSTRE_KERNEL_TEST=conftest.i ++ ],[ ++ test -s build/conftest.i ++ ],[ ++ # LINUXARCH="UTS_MACHINE" ++ eval $(grep "LINUXARCH=" build/conftest.i) ++ ],[ ++ AC_MSG_RESULT([unknown]) ++ AC_MSG_ERROR([Could not preprocess test program. Consult config.log for details.]) ++ ]) ++ rm -f build/conftest.i ++ if test x$LINUXARCH = x ; then ++ AC_MSG_RESULT([unknown]) ++ AC_MSG_ERROR([Could not determine Linux architecture from linux/version.h.]) ++ fi ++AC_MSG_RESULT([$LINUXARCH]) ++AC_SUBST(LINUXARCH) + + # + # LB_LINUX_TRY_COMPILE diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild index 405cb70..48804f4 100644 --- a/sys-cluster/lustre/lustre-9999.ebuild +++ b/sys-cluster/lustre/lustre-9999.ebuild @@ -32,6 +32,7 @@ RDEPEND="${DEPEND}" BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S}" PATCHES=( + "${FILESDIR}/LU-2982.patch" "${FILESDIR}/0001-LU-2850-build-check-header-files-in-generated-uapi-d.patch" "${FILESDIR}/0002-LU-2850-kernel-3.7-kernel-posix-acl-needs-userns.patch" "${FILESDIR}/0003-LU-2850-kernel-3.7-uneports-sock_map_fd.patch"