Gentoo Archives: gentoo-commits

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