From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-687397-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 4F67D138A1F
	for <garchives@archives.gentoo.org>; Fri, 18 Apr 2014 16:52:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DFFEEE0B0A;
	Fri, 18 Apr 2014 16:52:30 +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 10F13E0AC3
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Apr 2014 16:52:29 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 428D634039A
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Apr 2014 16:52:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by spoonbill.gentoo.org (Postfix) with ESMTP id B1F4F181E7
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Apr 2014 16:52:25 +0000 (UTC)
From: "Brian Dolbec" <brian.dolbec@gmail.com>
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" <brian.dolbec@gmail.com>
Message-ID: <1397839837.fc7214ad8f2277dfa729800f5c68a5c0018ae2c9.dol-sen@gentoo>
Subject: [gentoo-commits] proj/catalyst:3.0 commit in: targets/support/
X-VCS-Repository: proj/catalyst
X-VCS-Files: targets/support/functions.sh
X-VCS-Directories: targets/support/
X-VCS-Committer: dol-sen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: fc7214ad8f2277dfa729800f5c68a5c0018ae2c9
X-VCS-Branch: 3.0
Date: Fri, 18 Apr 2014 16:52:25 +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: 7b067193-8b5b-499e-825c-f4ed6a738a53
X-Archives-Hash: f1ceafcefb9490f75d4a757c3af05446

commit:     fc7214ad8f2277dfa729800f5c68a5c0018ae2c9
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:04 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Apr 18 16:50:37 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=fc7214ad

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 7face15..8c59033 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -51,8 +51,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() {