Gentoo Archives: gentoo-catalyst

From: Guy Martin <gmsoft@g.o>
To: gentoo-catalyst@l.g.o
Subject: [gentoo-catalyst] [PATCH 09/11] Don't make cdtar mandatory.
Date: Wed, 05 Feb 2014 10:40:44
Message-Id: 1391596806-14955-10-git-send-email-gmsoft@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 00/11] Livecd updates for catalyst 3.0 by Guy Martin
1 On hppa, we don't need cdtar.
2
3 ---
4 targets/support/functions.sh | 8 ++++++--
5 1 file changed, 6 insertions(+), 2 deletions(-)
6
7 diff --git a/targets/support/functions.sh b/targets/support/functions.sh
8 index 7face15..8c59033 100755
9 --- a/targets/support/functions.sh
10 +++ b/targets/support/functions.sh
11 @@ -51,8 +51,12 @@ extract_cdtar() {
12 # which will normally contains a pre-built binary
13 # boot-loader/filesystem skeleton for the ISO.
14 cdtar=${clst_cdtar}
15 - [ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"
16 - tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
17 + if [ -z "${cdtar}" ]
18 + then
19 + echo "No cdtar specified. Skipping."
20 + else
21 + tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
22 + fi
23 }
24
25 extract_kernels() {
26 --
27 1.8.3.2