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 E1F721382C5 for ; Thu, 21 May 2020 20:25:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01F6EE086E; Thu, 21 May 2020 20:25:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DBFF2E0957 for ; Thu, 21 May 2020 20:25:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4FFC34F287 for ; Thu, 21 May 2020 20:25:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D8BE253 for ; Thu, 21 May 2020 20:25:33 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589939377.b4941f10b5ab361c9dbee8a1ed4957cba564eccd.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b4941f10b5ab361c9dbee8a1ed4957cba564eccd X-VCS-Branch: master Date: Thu, 21 May 2020 20:25:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed7d6140-b22c-485b-9f39-a477a63f188d X-Archives-Hash: d8c249ea038d62f7683657b567cad919 commit: b4941f10b5ab361c9dbee8a1ed4957cba564eccd Author: Matt Turner gentoo org> AuthorDate: Wed May 20 01:24:58 2020 +0000 Commit: Matt Turner gentoo 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 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 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 911CD1382C5 for ; Wed, 20 May 2020 03:39:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5B11E0855; Wed, 20 May 2020 03:39:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 BB711E0855 for ; Wed, 20 May 2020 03:39:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCF3134F1DA for ; Wed, 20 May 2020 03:39:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A604254 for ; Wed, 20 May 2020 03:39:52 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589939377.b4941f10b5ab361c9dbee8a1ed4957cba564eccd.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b4941f10b5ab361c9dbee8a1ed4957cba564eccd X-VCS-Branch: pending/mattst88 Date: Wed, 20 May 2020 03:39:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1015453d-74ae-46c1-97fa-ef10399fccf4 X-Archives-Hash: 2829feca676f551378bc2bc3df064ca5 Message-ID: <20200520033952.zMmIIkuKuS0knX9a8TvTCSc3l6vJmc22fj4GotOXVis@z> commit: b4941f10b5ab361c9dbee8a1ed4957cba564eccd Author: Matt Turner gentoo org> AuthorDate: Wed May 20 01:24:58 2020 +0000 Commit: Matt Turner gentoo 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 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 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 3A24113835A for ; Wed, 20 May 2020 01:52:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27C45E0841; Wed, 20 May 2020 01:52:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0D013E0835 for ; Wed, 20 May 2020 01:52:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 388E534F16D for ; Wed, 20 May 2020 01:52:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1DDF253 for ; Wed, 20 May 2020 01:52:25 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589939377.b4941f10b5ab361c9dbee8a1ed4957cba564eccd.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b4941f10b5ab361c9dbee8a1ed4957cba564eccd X-VCS-Branch: wip/mattst88 Date: Wed, 20 May 2020 01:52:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0451a704-5f01-4bf0-94fd-e9c330eb6bf9 X-Archives-Hash: 850a2c275ceb695f76a2066de107996d Message-ID: <20200520015225.MwuqH6d1NFN-TkFSgCAUgcARk8f_A1MbzuOT5K6u5kA@z> commit: b4941f10b5ab361c9dbee8a1ed4957cba564eccd Author: Matt Turner gentoo org> AuthorDate: Wed May 20 01:24:58 2020 +0000 Commit: Matt Turner gentoo 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 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