1 |
commit: 9ef2760a90d3676be2a47c98eed32f555924c044 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 8 10:44:42 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 8 10:44:57 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef2760a |
7 |
|
8 |
sys-libs/libhugetlbfs: Removed old |
9 |
|
10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-libs/libhugetlbfs/Manifest | 1 - |
14 |
sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild | 166 ------------------------- |
15 |
sys-libs/libhugetlbfs/metadata.xml | 3 - |
16 |
3 files changed, 170 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest |
19 |
index 24a91fd064f..4ded3f0740b 100644 |
20 |
--- a/sys-libs/libhugetlbfs/Manifest |
21 |
+++ b/sys-libs/libhugetlbfs/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST libhugetlbfs-2.20.tar.gz 186750 BLAKE2B 758482a41254d6d14795efdfb2959248af2ff00bc6cafbae9b2002b7eaa50921a72ef928910bc0d2061a414e9c73346848eead108af077c96429870c734495aa SHA512 817fca3f8e3b127b9b877e0a03d0a94bf0c3ec481d3becf995986ce6ae0532629c5460100eb9f2ef3452ed59a3b9d3ac8362df8f87b387803c36d35ab7af0902 |
24 |
DIST libhugetlbfs-2.21.tar.gz 173052 BLAKE2B a65fdeee3ed9ad8cb69f772847646befbf5deef0b82d6cb7338e5ff448d5c2461ceb1e381b9515e79f4243482589bb0203874cc52e5c8c6d98667df4eacffa8b SHA512 87fd95a826bedc2c53b1aa440f5db7ff3ece482d520545b597d4d1231cf84276103c312899b812166872444331bc7b6f1692f0d3b7cbff691efdcf9c2e99b1d0 |
25 |
DIST libhugetlbfs-2.22.tar.gz 175099 BLAKE2B e67a6a678065b10492d510b733b7c6e2926f4f01dd741d49f6e76cedde002fa81d7dad6a6fd8922443c6aacd527c9b3df35f84b8da7332c04e3fcf8c52e23084 SHA512 7f38f9fa576841f36c7cd5192a9ee3f79b275b7b64d7e2a838a43636489cf88627bdba3a045d6b3302a4a509cf64627972b569b4c2c3c4fe05d5aa4ae1d66fd8 |
26 |
|
27 |
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild |
28 |
deleted file mode 100644 |
29 |
index c3c800361c4..00000000000 |
30 |
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,166 +0,0 @@ |
33 |
-# Copyright 1999-2015 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI="5" |
37 |
- |
38 |
-PYTHON_COMPAT=( python2_7 ) |
39 |
- |
40 |
-inherit eutils multilib toolchain-funcs perl-functions python-any-r1 |
41 |
- |
42 |
-DESCRIPTION="easy hugepage access" |
43 |
-HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs" |
44 |
-SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="GPL-2" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86" |
49 |
-IUSE="perl static-libs test" |
50 |
- |
51 |
-DEPEND="test? ( ${PYTHON_DEPS} )" |
52 |
-RDEPEND="perl? ( dev-lang/perl:= )" |
53 |
- |
54 |
-src_prepare() { |
55 |
- perl_set_version |
56 |
- |
57 |
- epatch "${FILESDIR}"/${PN}-2.9-build.patch #332517 |
58 |
- epatch "${FILESDIR}"/${PN}-2.20-noexec-stack.patch |
59 |
- epatch "${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch |
60 |
- sed -i \ |
61 |
- -e '/^PREFIX/s:/local::' \ |
62 |
- -e '1iBUILDTYPE = NATIVEONLY' \ |
63 |
- -e '1iV = 1' \ |
64 |
- -e '/gzip.*MANDIR/d' \ |
65 |
- -e "/^LIB\(32\)/s:=.*:= $(get_libdir):" \ |
66 |
- -e '/^CC\(32\|64\)/s:=.*:= $(CC):' \ |
67 |
- -e "/^PMDIR = .*\/perl5\/TLBC/s::PMDIR = ${VENDOR_LIB}\/TLBC:" \ |
68 |
- Makefile || die "sed failed" |
69 |
- if [ "$(get_libdir)" == "lib64" ]; then |
70 |
- sed -i \ |
71 |
- -e "/^LIB\(32\)/s:=.*:= lib32:" \ |
72 |
- Makefile |
73 |
- fi |
74 |
- |
75 |
- # Tarballs from github don't have the version set. |
76 |
- # https://github.com/libhugetlbfs/libhugetlbfs/issues/7 |
77 |
- [[ -f version ]] || echo "${PV}" > version |
78 |
-} |
79 |
- |
80 |
-src_compile() { |
81 |
- tc-export AR |
82 |
- emake CC="$(tc-getCC)" libs tools |
83 |
-} |
84 |
- |
85 |
-src_install() { |
86 |
- default |
87 |
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a |
88 |
- rm "${ED}"/usr/bin/oprofile* || die |
89 |
- if ! use perl ; then |
90 |
- rm -r \ |
91 |
- "${ED}"/usr/bin/cpupcstat \ |
92 |
- "${ED}"/usr/share/man/man8/cpupcstat.8 \ |
93 |
- "${ED}/${VENDOR_LIB}" \ |
94 |
- || die |
95 |
- fi |
96 |
-} |
97 |
- |
98 |
-src_test_alloc_one() { |
99 |
- hugeadm="$1" |
100 |
- sign="$2" |
101 |
- pagesize="$3" |
102 |
- pagecount="$4" |
103 |
- ${hugeadm} \ |
104 |
- --pool-pages-max ${pagesize}:${sign}${pagecount} \ |
105 |
- && \ |
106 |
- ${hugeadm} \ |
107 |
- --pool-pages-min ${pagesize}:${sign}${pagecount} |
108 |
- return $? |
109 |
-} |
110 |
- |
111 |
-# die is NOT allowed in this src_test block after the marked point, so that we |
112 |
-# can clean up memory allocation. You'll leak at LEAST 64MiB per run otherwise. |
113 |
-src_test() { |
114 |
- [[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite" |
115 |
- einfo "Building testsuite" |
116 |
- emake -j1 tests || die "Failed to build tests" |
117 |
- |
118 |
- hugeadm='obj/hugeadm' |
119 |
- allocated='' |
120 |
- rc=0 |
121 |
- # the testcases need 64MiB per pagesize. |
122 |
- MIN_HUGEPAGE_RAM=$((64*1024*1024)) |
123 |
- |
124 |
- einfo "Planning allocation" |
125 |
- PAGESIZES="$(${hugeadm} --page-sizes-all)" |
126 |
- |
127 |
- # Need to do this before we can create the mountpoints. |
128 |
- for pagesize in ${PAGESIZES} ; do |
129 |
- # The kernel depends on the location :-( |
130 |
- mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize} |
131 |
- addwrite /var/lib/hugetlbfs/pagesize-${pagesize} |
132 |
- done |
133 |
- addwrite /proc/sys/vm/ |
134 |
- addwrite /proc/sys/kernel/shmall |
135 |
- addwrite /proc/sys/kernel/shmmax |
136 |
- addwrite /proc/sys/kernel/shmmni |
137 |
- |
138 |
- einfo "Checking HugeTLB mountpoints" |
139 |
- ${hugeadm} --create-mounts || die "Failed to set up hugetlb mountpoints." |
140 |
- |
141 |
- # ----------------------------------------------------- |
142 |
- # --------- die is unsafe after this point. ----------- |
143 |
- # ----------------------------------------------------- |
144 |
- |
145 |
- einfo "Starting allocation" |
146 |
- for pagesize in ${PAGESIZES} ; do |
147 |
- pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize})) |
148 |
- einfo " ${pagecount} @ ${pagesize}" |
149 |
- addwrite /var/lib/hugetlbfs/pagesize-${pagesize} |
150 |
- src_test_alloc_one "$hugeadm" "+" "${pagesize}" "${pagecount}" |
151 |
- rc=$? |
152 |
- if [[ $rc -eq 0 ]]; then |
153 |
- allocated="${allocated} ${pagesize}:${pagecount}" |
154 |
- else |
155 |
- eerror "Failed to add ${pagecount} pages of size ${pagesize}" |
156 |
- fi |
157 |
- done |
158 |
- |
159 |
- einfo "Allocation status" |
160 |
- ${hugeadm} --pool-list |
161 |
- |
162 |
- if [[ -n "${allocated}" ]]; then |
163 |
- # All our allocations worked, so time to run. |
164 |
- einfo "Starting tests" |
165 |
- cd "${S}"/tests |
166 |
- TESTOPTS="-t func" |
167 |
- case $ARCH in |
168 |
- amd64|ppc64) |
169 |
- TESTOPTS="${TESTOPTS} -b 64" |
170 |
- ;; |
171 |
- x86) |
172 |
- TESTOPTS="${TESTOPTS} -b 32" |
173 |
- ;; |
174 |
- esac |
175 |
- # This needs a bit of work to give a nice exit code still. |
176 |
- ./run_tests.py ${TESTOPTS} |
177 |
- rc=$? |
178 |
- else |
179 |
- eerror "Failed to make HugeTLB allocations." |
180 |
- rc=1 |
181 |
- fi |
182 |
- |
183 |
- einfo "Cleaning up memory" |
184 |
- cd "${S}" |
185 |
- # Cleanup memory allocation |
186 |
- for alloc in ${allocated} ; do |
187 |
- pagesize="${alloc/:*}" |
188 |
- pagecount="${alloc/*:}" |
189 |
- einfo " ${pagecount} @ ${pagesize}" |
190 |
- src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}" |
191 |
- done |
192 |
- |
193 |
- # --------------------------------------------------------- |
194 |
- # --------- die is safe again after this point. ----------- |
195 |
- # --------------------------------------------------------- |
196 |
- |
197 |
- return $rc |
198 |
-} |
199 |
|
200 |
diff --git a/sys-libs/libhugetlbfs/metadata.xml b/sys-libs/libhugetlbfs/metadata.xml |
201 |
index 534f22e29cc..bf4a9ce74b4 100644 |
202 |
--- a/sys-libs/libhugetlbfs/metadata.xml |
203 |
+++ b/sys-libs/libhugetlbfs/metadata.xml |
204 |
@@ -5,9 +5,6 @@ |
205 |
<email>base-system@g.o</email> |
206 |
<name>Gentoo Base System</name> |
207 |
</maintainer> |
208 |
-<use> |
209 |
- <flag name="perl">Install the cpupcstat tool and some perl modules</flag> |
210 |
-</use> |
211 |
<upstream> |
212 |
<remote-id type="github">libhugetlbfs/libhugetlbfs</remote-id> |
213 |
<remote-id type="sourceforge">libhugetlbfs</remote-id> |