From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 02/21] targets: Remove check_genkernel_version() function
Date: Tue, 19 May 2020 20:42:07 -0700 [thread overview]
Message-ID: <20200520034226.2870937-2-mattst88@gentoo.org> (raw)
In-Reply-To: <20200520034226.2870937-1-mattst88@gentoo.org>
Existed to ensure a minimum genkernel version, and was last updated in
2005. genkernel is emerged during the catalyst build now, so we will
always have an updated version.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/support/chroot-functions.sh | 23 -----------------------
targets/support/kmerge.sh | 2 --
2 files changed, 25 deletions(-)
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index d63e4918..b6e221af 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -29,29 +29,6 @@ if [[ -z "${clst_CHOST}" ]] ; then
fi
fi
-check_genkernel_version() {
- local version parts=() major minor
-
- version=$(genkernel --version)
- if [[ -z ${version} ]] ; then
- echo "ERROR: Could not detect genkernel version!"
- exit 1
- fi
- printf 'Genkernel version '%s' found ... ' "${version}"
-
- IFS='.' read -a parts <<<"${version}"
- major=${parts[0]}
- minor=${parts[1]}
- if [[ ${major} -gt 3 || ( ${major} -eq 3 && ${minor} -ge 3 ) ]] ; then
- echo "OK"
- else
- echo "FAIL"
- echo "ERROR: Your genkernel version is too low in your seed stage."
- echo " genkernel version 3.3.0 or greater is required."
- exit 1
- fi
-}
-
get_libdir() {
ABI=$(portageq envvar ABI)
DEFAULT_ABI=$(portageq envvar DEFAULT_ABI)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 1a432293..6b589493 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -2,8 +2,6 @@
source /tmp/chroot-functions.sh
-check_genkernel_version
-
install -d /tmp/kerncache
PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds
--
2.26.2
next prev parent reply other threads:[~2020-05-20 3:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 3:42 [gentoo-catalyst] [PATCH 01/21] targets: Remove copy_{file,symlink,lib} functions Matt Turner
2020-05-20 3:42 ` Matt Turner [this message]
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 03/21] catalyst: Drop --cli option Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 04/21] catalyst: Remove PythonDir setting Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 05/21] catalyst: Switch internal snapshot option parsing to SpecParser Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 06/21] catalyst: Remove unused decompression_mode spec option Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 07/21] catalyst: Delete unused {required,valid}_build_targets Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 08/21] catalyst: Disallow DEBUG and VERBOSE in spec files Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 09/21] catalyst: Add decompressor_search_order as valid spec option Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 10/21] catalyst: Remove spec file options from valid_config_file_values Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 11/21] catalyst: Add a missing options to valid_config_file_values Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 12/21] catalyst: Disallow config file options in spec files Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 13/21] catalyst: Remove support for source_matching="loose" Matt Turner
2020-05-20 22:47 ` Brian Dolbec
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 14/21] catalyst: Convert catalyst.conf to TOML Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 15/21] catalyst: Verify config options against valid_config_file_values Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 16/21] catalyst: Don't even try to make envars from dicts Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 17/21] catalyst: Only emit true boolean envars Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 18/21] catalyst: Support emitting int/float envars Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 19/21] catalyst: Set jobs/load-average via catalyst.conf Matt Turner
[not found] ` <94424974-cfe8-9766-8712-ae6fa8bbf825@veremit.xyz>
2020-05-21 0:18 ` Matt Turner
[not found] ` <9d529c77-14b3-cb7b-f2ee-32b4bbc2f464@veremit.xyz>
2020-05-21 1:19 ` Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 20/21] catalyst: Configure distcc_hosts in the config file Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 21/21] catalyst: Drop ConfigParser Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200520034226.2870937-2-mattst88@gentoo.org \
--to=mattst88@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox