Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 02/21] targets: Remove check_genkernel_version() function
Date: Wed, 20 May 2020 03:42:39
Message-Id: 20200520034226.2870937-2-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/21] targets: Remove copy_{file,symlink,lib} functions by Matt Turner
1 Existed to ensure a minimum genkernel version, and was last updated in
2 2005. genkernel is emerged during the catalyst build now, so we will
3 always have an updated version.
4
5 Signed-off-by: Matt Turner <mattst88@g.o>
6 ---
7 targets/support/chroot-functions.sh | 23 -----------------------
8 targets/support/kmerge.sh | 2 --
9 2 files changed, 25 deletions(-)
10
11 diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
12 index d63e4918..b6e221af 100755
13 --- a/targets/support/chroot-functions.sh
14 +++ b/targets/support/chroot-functions.sh
15 @@ -29,29 +29,6 @@ if [[ -z "${clst_CHOST}" ]] ; then
16 fi
17 fi
18
19 -check_genkernel_version() {
20 - local version parts=() major minor
21 -
22 - version=$(genkernel --version)
23 - if [[ -z ${version} ]] ; then
24 - echo "ERROR: Could not detect genkernel version!"
25 - exit 1
26 - fi
27 - printf 'Genkernel version '%s' found ... ' "${version}"
28 -
29 - IFS='.' read -a parts <<<"${version}"
30 - major=${parts[0]}
31 - minor=${parts[1]}
32 - if [[ ${major} -gt 3 || ( ${major} -eq 3 && ${minor} -ge 3 ) ]] ; then
33 - echo "OK"
34 - else
35 - echo "FAIL"
36 - echo "ERROR: Your genkernel version is too low in your seed stage."
37 - echo " genkernel version 3.3.0 or greater is required."
38 - exit 1
39 - fi
40 -}
41 -
42 get_libdir() {
43 ABI=$(portageq envvar ABI)
44 DEFAULT_ABI=$(portageq envvar DEFAULT_ABI)
45 diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
46 index 1a432293..6b589493 100755
47 --- a/targets/support/kmerge.sh
48 +++ b/targets/support/kmerge.sh
49 @@ -2,8 +2,6 @@
50
51 source /tmp/chroot-functions.sh
52
53 -check_genkernel_version
54 -
55 install -d /tmp/kerncache
56 PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds
57
58 --
59 2.26.2