| 1 |
commit: 7f4db96b5089f251b2fcf4ae48b0055887d1549a |
| 2 |
Author: Guy Martin <gmsoft <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 5 10:40:04 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Mar 24 16:07:08 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7f4db96b |
| 7 |
|
| 8 |
Don't make cdtar mandatory. |
| 9 |
|
| 10 |
On hppa, we don't need cdtar. |
| 11 |
|
| 12 |
--- |
| 13 |
targets/support/functions.sh | 8 ++++++-- |
| 14 |
1 file changed, 6 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/targets/support/functions.sh b/targets/support/functions.sh |
| 17 |
index b4335a5..311ed7b 100644 |
| 18 |
--- a/targets/support/functions.sh |
| 19 |
+++ b/targets/support/functions.sh |
| 20 |
@@ -51,8 +51,12 @@ extract_cdtar() { |
| 21 |
# which will normally contains a pre-built binary |
| 22 |
# boot-loader/filesystem skeleton for the ISO. |
| 23 |
cdtar=${clst_cdtar} |
| 24 |
- [ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting" |
| 25 |
- tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}" |
| 26 |
+ if [ -z "${cdtar}" ] |
| 27 |
+ then |
| 28 |
+ echo "No cdtar specified. Skipping." |
| 29 |
+ else |
| 30 |
+ tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}" |
| 31 |
+ fi |
| 32 |
} |
| 33 |
|
| 34 |
extract_kernels() { |
Archives