From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-801733-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 46F28138CD0
for <garchives@archives.gentoo.org>; Thu, 21 May 2015 23:53:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B7EC5E0921;
Thu, 21 May 2015 23:53:40 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2E533E091F
for <gentoo-commits@lists.gentoo.org>; Thu, 21 May 2015 23:53:35 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 88E2A341011
for <gentoo-commits@lists.gentoo.org>; Thu, 21 May 2015 23:53:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C9219A04
for <gentoo-commits@lists.gentoo.org>; Thu, 21 May 2015 23:53:30 +0000 (UTC)
From: "Brian Dolbec" <dolsen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" <dolsen@gentoo.org>
Message-ID: <1425002584.15b2b25bb9ace8a5155b493819428d026e621ce7.dolsen@gentoo>
Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/support/
X-VCS-Repository: proj/catalyst
X-VCS-Files: targets/support/functions.sh
X-VCS-Directories: targets/support/
X-VCS-Committer: dolsen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 15b2b25bb9ace8a5155b493819428d026e621ce7
X-VCS-Branch: pending
Date: Thu, 21 May 2015 23:53:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: e19ce7dc-2702-482f-b435-78fa4d184edc
X-Archives-Hash: d9c3e0089c5b757fc8375ff04129eb2e
Message-ID: <20150521235330.BplAma4CuRSIDsTu_VZwv_f6UH5oWGxJdu3fuHwalFs@z>
commit: 15b2b25bb9ace8a5155b493819428d026e621ce7
Author: Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 10:40:04 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=15b2b25b
Don't make cdtar mandatory.
On hppa, we don't need cdtar.
targets/support/functions.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index de37c19..f6faa61 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -52,8 +52,12 @@ extract_cdtar() {
# which will normally contains a pre-built binary
# boot-loader/filesystem skeleton for the ISO.
cdtar=${clst_cdtar}
- [ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"
- tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
+ if [ -z "${cdtar}" ]
+ then
+ echo "No cdtar specified. Skipping."
+ else
+ tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
+ fi
}
extract_kernels() {