Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Mon, 04 Sep 2017 05:54:37
Message-Id: 1504503755.4d7d4e146bbecf6cc039ce3e5cdf89a91b751f4e.robbat2@gentoo
1 commit: 4d7d4e146bbecf6cc039ce3e5cdf89a91b751f4e
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 4 05:42:35 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 4 05:42:35 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4d7d4e14
7
8 gen_initramfs: catch lddtree failure.
9
10 Fixes: https://bugs.gentoo.org/show_bug.cgi?id=618056
11 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
12
13 gen_initramfs.sh | 6 ++++--
14 1 file changed, 4 insertions(+), 2 deletions(-)
15
16 diff --git a/gen_initramfs.sh b/gen_initramfs.sh
17 index 62a88c8..2be35c4 100755
18 --- a/gen_initramfs.sh
19 +++ b/gen_initramfs.sh
20 @@ -39,11 +39,13 @@ copy_binaries() {
21 # lddtree does not have the -V (version) nor the -l (list) options prior to version 1.18
22 (
23 if lddtree -V > /dev/null 2>&1 ; then
24 - lddtree -l "$@"
25 + lddtree -l "$@" \
26 + || gen_die "Binary ${f} or some of its library dependencies could not be copied"
27 else
28 lddtree "$@" \
29 | tr ')(' '\n' \
30 - | awk '/=>/{ if($3 ~ /^\//){print $3}}'
31 + | awk '/=>/{ if($3 ~ /^\//){print $3}}' \
32 + || gen_die "Binary ${f} or some of its library dependencies could not be copied"
33 fi ) \
34 | sort \
35 | uniq \