public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/
Date: Tue, 20 Oct 2020 02:50:17 +0000 (UTC)	[thread overview]
Message-ID: <1603162208.ad487bd196eb7bca1f6b0b6bf2e59151941a3111.mattst88@gentoo> (raw)

commit:     ad487bd196eb7bca1f6b0b6bf2e59151941a3111
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:38:06 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 02:50:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ad487bd1

targets: Rewrite hppa pre-kmerge check

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/pre-kmerge.sh | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index dd51ae9a..165dfd51 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -2,32 +2,23 @@
 
 source /tmp/chroot-functions.sh
 
-case ${clst_hostarch} in
-	hppa)
-		got_32=0
-		got_64=0
-		for i in ${clst_boot_kernel}
-		do
-			if [ "${i: -2}" == "32" ]
-			then
-				if [ $got_32 -eq 1 ]
-				then
-					die "Only one 32 bit kernel can be configured"
-				fi
-				got_32=1
-			elif [ "${i: -2}" == "64" ]
-			then
-				if [ $got_64 -eq 1 ]
-				then
-					die "Only one 64 bit kernel can be configured"
-				fi
-				got_64=1
-			else
-				die "Kernel names must end by either 32 or 64"
-			fi
-		done
-	;;
-esac
+if [[ ${clst_hostarch} == hppa ]]; then
+	for i in ${clst_boot_kernel}; do
+		case ${i} in
+			*32)
+				let num32++
+				;;
+			*64)
+				let num64++
+				;;
+			*)
+				die "Kernel names must end with either \"32\" or \"64\""
+				;;
+		esac
+	done
+	[[ $num32 > 1 ]] && die "Only one 32-bit kernel can be configured"
+	[[ $num64 > 1 ]] && die "Only one 64-bit kernel can be configured"
+fi
 
 run_merge --oneshot genkernel
 install -d /tmp/kerncache


             reply	other threads:[~2020-10-20  2:50 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-20  2:50 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/ Matt Turner
2021-01-18 19:53 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-22 18:06 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-22 18:06 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-22 18:06 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-22 18:06 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-29 21:00 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-10-20  8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-28 20:51 Matt Turner
2020-10-28 20:51 Matt Turner
2020-10-22 18:06 Matt Turner
2020-10-22 18:06 Matt Turner
2020-10-22 18:06 Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20  8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20  8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20  8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20  8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20  8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20  8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-21 17:58 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-10-20  8:30 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-10-20 23:20 Matt Turner
2020-10-20 23:20 Matt Turner
2020-10-20 23:20 Matt Turner
2020-10-20 23:20 Matt Turner
2020-10-20 19:59 Matt Turner
2020-10-20 19:59 Matt Turner
2020-10-20 19:59 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  8:30 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  4:31 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-10-20  2:50 Matt Turner
2020-05-21 20:25 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-05-20  3:39 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-05-20  3:39 Matt Turner
2020-05-17  3:26 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-05-16  6:54 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-05-16  6:54 Matt Turner
2020-05-03 22:58 Matt Turner
2020-05-03 22:58 Matt Turner
2020-05-03 22:58 Matt Turner
2020-05-03 22:04 Matt Turner
2020-05-03 22:04 Matt Turner
2020-05-03 22:04 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=1603162208.ad487bd196eb7bca1f6b0b6bf2e59151941a3111.mattst88@gentoo \
    --to=mattst88@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@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