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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C43F158020 for ; Mon, 28 Nov 2022 20:38:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8455EE086C; Mon, 28 Nov 2022 20:38:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 687A5E086A for ; Mon, 28 Nov 2022 20:38:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A935E34106B for ; Mon, 28 Nov 2022 20:38:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30658764 for ; Mon, 28 Nov 2022 20:38:01 +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: <1669151943.2324a630a7c650187edd0ce7b1343a6f3e40423d.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/pre-kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 2324a630a7c650187edd0ce7b1343a6f3e40423d X-VCS-Branch: wip/mattst88 Date: Mon, 28 Nov 2022 20:38:01 +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: 5e2a05ab-6ddd-4d00-9d50-ecd75c339f36 X-Archives-Hash: b649e9ad01d680282d2b991cfca33f3f commit: 2324a630a7c650187edd0ce7b1343a6f3e40423d Author: Sam James gentoo org> AuthorDate: Mon Nov 21 07:37:00 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Nov 22 21:19:03 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2324a630 targets: fix comparison operator '<' and '>' work lexicographically in bash. Signed-off-by: Sam James gentoo.org> Signed-off-by: Matt Turner gentoo.org> targets/support/pre-kmerge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh index 0dfc835e..ed825f5f 100755 --- a/targets/support/pre-kmerge.sh +++ b/targets/support/pre-kmerge.sh @@ -18,8 +18,8 @@ if [[ ${clst_hostarch} == hppa ]]; then ;; esac done - [[ $num32 > 1 ]] && die "Only one 32-bit kernel can be configured" - [[ $num64 > 1 ]] && die "Only one 64-bit kernel can be configured" + [[ $num32 -gt 1 ]] && die "Only one 32-bit kernel can be configured" + [[ $num64 -gt 1 ]] && die "Only one 64-bit kernel can be configured" fi run_merge --oneshot sys-kernel/genkernel 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1FA9D158020 for ; Tue, 22 Nov 2022 21:19:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6541EE0C07; Tue, 22 Nov 2022 21:19:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F7B8E0C07 for ; Tue, 22 Nov 2022 21:19:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D867341382 for ; Tue, 22 Nov 2022 21:19:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E2CF755 for ; Tue, 22 Nov 2022 21:19:22 +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: <1669151943.2324a630a7c650187edd0ce7b1343a6f3e40423d.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/pre-kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 2324a630a7c650187edd0ce7b1343a6f3e40423d X-VCS-Branch: master Date: Tue, 22 Nov 2022 21:19:22 +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: 94e8c250-8530-4435-81b5-68170e362786 X-Archives-Hash: c0bca2546a11a9b161a56a1727737b7c Message-ID: <20221122211922.JffyXE3-fBpDpZ-D_myDX0bJgPQoHYWnyISwK45nVzM@z> commit: 2324a630a7c650187edd0ce7b1343a6f3e40423d Author: Sam James gentoo org> AuthorDate: Mon Nov 21 07:37:00 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Nov 22 21:19:03 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2324a630 targets: fix comparison operator '<' and '>' work lexicographically in bash. Signed-off-by: Sam James gentoo.org> Signed-off-by: Matt Turner gentoo.org> targets/support/pre-kmerge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh index 0dfc835e..ed825f5f 100755 --- a/targets/support/pre-kmerge.sh +++ b/targets/support/pre-kmerge.sh @@ -18,8 +18,8 @@ if [[ ${clst_hostarch} == hppa ]]; then ;; esac done - [[ $num32 > 1 ]] && die "Only one 32-bit kernel can be configured" - [[ $num64 > 1 ]] && die "Only one 64-bit kernel can be configured" + [[ $num32 -gt 1 ]] && die "Only one 32-bit kernel can be configured" + [[ $num64 -gt 1 ]] && die "Only one 64-bit kernel can be configured" fi run_merge --oneshot sys-kernel/genkernel