From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B23E01382C5 for ; Wed, 20 May 2020 03:42:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF2A3E084A; Wed, 20 May 2020 03:42:38 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E752AE084A for ; Wed, 20 May 2020 03:42:38 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id u35so811078pgk.6 for ; Tue, 19 May 2020 20:42:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bm91LZlvG+wyY+u2uEDU6tfWJRrOPTxsSmV7vUaDaxk=; b=XQi19ezpDe9/PWyxFEKoCtQJJ3vhjbBsF1akgz0cTkJ5uIxZmWNABBlbzl5pa9bi+9 nsQiYqwEjwEJU1B7tCuAQTalc1lzrnH1Ju4y4LTpZ/Z+wXq3uShT2MNS1qCKgZUC2fVj ofvI4ScdpBLt4AYtPRGmyYsTU40FQ2Z5vkscWkEncrCbstN/ghGV8mAJRCgSw0ccMRbK EB8jWOsUgD/nD6RGytWIaQmCdE8MwrNZA7wx0/vJVbLfJNy/DnYdIOQAerJJDMmNDA3t A5OUj+mtNO+z/7xBf+XdN4Cs6DbxCOhqeVah17jJhyNdJXw5jh6srfiCnl0ypjZqmGvt mZ1A== X-Gm-Message-State: AOAM533TlPwpDEH486I5mmMGMU/8yCM2eGzutuXyVxY3spX46cLYo9gp qFN7jROlv8YgQ4p6S7P9OCs+4JfO X-Google-Smtp-Source: ABdhPJzWQ6fhsnhjE/knCptH9qJXMtgGLf0wyZN0NLFsVzHMY0XsVZjDCA2SW3FhQzqnPXIgYWYHLQ== X-Received: by 2002:a63:ce14:: with SMTP id y20mr2198254pgf.186.1589946157627; Tue, 19 May 2020 20:42:37 -0700 (PDT) Received: from localhost ([134.134.137.77]) by smtp.gmail.com with ESMTPSA id b16sm769614pfi.74.2020.05.19.20.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 20:42:36 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 02/21] targets: Remove check_genkernel_version() function Date: Tue, 19 May 2020 20:42:07 -0700 Message-Id: <20200520034226.2870937-2-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200520034226.2870937-1-mattst88@gentoo.org> References: <20200520034226.2870937-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 4dd167c2-e299-4185-a95d-9e2c772989a7 X-Archives-Hash: e4a6bbd7b13a201fb4cde510e09b6247 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 --- 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