| 1 |
commit: 596207ca6a24358be8bba0121b7b4c35239aa860 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> omrb <DOT> pnpi <DOT> spb <DOT> ru> |
| 3 |
AuthorDate: Mon Dec 11 18:31:15 2017 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 11 18:35:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=596207ca |
| 7 |
|
| 8 |
sys-cluster/lustre: Version bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../{lustre-9999.ebuild => lustre-2.10.1.ebuild} | 36 ++++++++++++---------- |
| 13 |
sys-cluster/lustre/lustre-9999.ebuild | 14 +++++---- |
| 14 |
2 files changed, 28 insertions(+), 22 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-2.10.1.ebuild |
| 17 |
similarity index 79% |
| 18 |
copy from sys-cluster/lustre/lustre-9999.ebuild |
| 19 |
copy to sys-cluster/lustre/lustre-2.10.1.ebuild |
| 20 |
index 3cf01dd73..b2b1d1b35 100644 |
| 21 |
--- a/sys-cluster/lustre/lustre-9999.ebuild |
| 22 |
+++ b/sys-cluster/lustre/lustre-2.10.1.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2016 Gentoo Foundation |
| 25 |
+# Copyright 1999-2017 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -8,22 +8,24 @@ WANT_AUTOMAKE="1.15" |
| 30 |
WANT_LIBTOOL="latest" |
| 31 |
|
| 32 |
if [[ $PV = *9999* ]]; then |
| 33 |
+ scm="git-r3" |
| 34 |
+ SRC_URI="" |
| 35 |
+ EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git" |
| 36 |
KEYWORDS="" |
| 37 |
EGIT_BRANCH="master" |
| 38 |
else |
| 39 |
+ scm="" |
| 40 |
+ SRC_URI="https://dev.gentoo.org/~alexxy/distfiles/${P}.tar.gz" |
| 41 |
KEYWORDS="~amd64" |
| 42 |
- EGIT_COMMIT="${PV}" |
| 43 |
fi |
| 44 |
|
| 45 |
SUPPORTED_KV_MAJOR=4 |
| 46 |
-SUPPORTED_KV_MINOR=1 |
| 47 |
+SUPPORTED_KV_MINOR=9 |
| 48 |
|
| 49 |
-inherit git-r3 autotools linux-info linux-mod toolchain-funcs udev flag-o-matic |
| 50 |
+inherit ${scm} autotools linux-info linux-mod toolchain-funcs udev flag-o-matic |
| 51 |
|
| 52 |
DESCRIPTION="Lustre is a parallel distributed file system" |
| 53 |
HOMEPAGE="http://wiki.whamcloud.com/" |
| 54 |
-SRC_URI="" |
| 55 |
-EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git" |
| 56 |
|
| 57 |
LICENSE="GPL-2" |
| 58 |
SLOT="0" |
| 59 |
@@ -69,17 +71,19 @@ src_prepare() { |
| 60 |
epatch ${PATCHES[@]} |
| 61 |
fi |
| 62 |
eapply_user |
| 63 |
+ if [[ ${PV} == "9999" ]]; then |
| 64 |
# replace upstream autogen.sh by our src_prepare() |
| 65 |
- local DIRS="libcfs lnet lustre snmp" |
| 66 |
- local ACLOCAL_FLAGS |
| 67 |
- for dir in $DIRS ; do |
| 68 |
- ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir/autoconf" |
| 69 |
- done |
| 70 |
- _elibtoolize -q |
| 71 |
- eaclocal -I config $ACLOCAL_FLAGS |
| 72 |
- eautoheader |
| 73 |
- eautomake |
| 74 |
- eautoconf |
| 75 |
+ local DIRS="libcfs lnet lustre snmp" |
| 76 |
+ local ACLOCAL_FLAGS |
| 77 |
+ for dir in $DIRS ; do |
| 78 |
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir/autoconf" |
| 79 |
+ done |
| 80 |
+ _elibtoolize -q |
| 81 |
+ eaclocal -I config $ACLOCAL_FLAGS |
| 82 |
+ eautoheader |
| 83 |
+ eautomake |
| 84 |
+ eautoconf |
| 85 |
+ fi |
| 86 |
} |
| 87 |
|
| 88 |
src_configure() { |
| 89 |
|
| 90 |
diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild |
| 91 |
index 3cf01dd73..1f17955bb 100644 |
| 92 |
--- a/sys-cluster/lustre/lustre-9999.ebuild |
| 93 |
+++ b/sys-cluster/lustre/lustre-9999.ebuild |
| 94 |
@@ -1,4 +1,4 @@ |
| 95 |
-# Copyright 1999-2016 Gentoo Foundation |
| 96 |
+# Copyright 1999-2017 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
|
| 99 |
EAPI=6 |
| 100 |
@@ -8,22 +8,24 @@ WANT_AUTOMAKE="1.15" |
| 101 |
WANT_LIBTOOL="latest" |
| 102 |
|
| 103 |
if [[ $PV = *9999* ]]; then |
| 104 |
+ scm="git-r3" |
| 105 |
+ SRC_URI="" |
| 106 |
+ EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git" |
| 107 |
KEYWORDS="" |
| 108 |
EGIT_BRANCH="master" |
| 109 |
else |
| 110 |
+ scm="" |
| 111 |
+ SRC_URI="https://dev.gentoo.org/~alexxy/distfiles/${P}.tar.gz" |
| 112 |
KEYWORDS="~amd64" |
| 113 |
- EGIT_COMMIT="${PV}" |
| 114 |
fi |
| 115 |
|
| 116 |
SUPPORTED_KV_MAJOR=4 |
| 117 |
-SUPPORTED_KV_MINOR=1 |
| 118 |
+SUPPORTED_KV_MINOR=9 |
| 119 |
|
| 120 |
-inherit git-r3 autotools linux-info linux-mod toolchain-funcs udev flag-o-matic |
| 121 |
+inherit ${scm} autotools linux-info linux-mod toolchain-funcs udev flag-o-matic |
| 122 |
|
| 123 |
DESCRIPTION="Lustre is a parallel distributed file system" |
| 124 |
HOMEPAGE="http://wiki.whamcloud.com/" |
| 125 |
-SRC_URI="" |
| 126 |
-EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git" |
| 127 |
|
| 128 |
LICENSE="GPL-2" |
| 129 |
SLOT="0" |
Archives