commit: b4941f10b5ab361c9dbee8a1ed4957cba564eccd Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed May 20 01:24:58 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed May 20 01:49:37 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b4941f10
targets: Remove check_genkernel_version() function 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 <AT> 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