Gentoo Archives: gentoo-commits

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