Gentoo Archives: gentoo-catalyst

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