Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/, sys-boot/elilo/files/
Date: Mon, 28 Dec 2015 19:14:04
Message-Id: 1451329647.b6344f771c7953a9cda0765ea27e701c117f2cd1.vapier@gentoo
1 commit: b6344f771c7953a9cda0765ea27e701c117f2cd1
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 28 19:07:27 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 28 19:07:27 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6344f77
7
8 sys-boot/elilo: fix elilo script error #299665
9
10 sys-boot/elilo/elilo-3.16.ebuild | 2 ++
11 sys-boot/elilo/files/elilo-3.16-elilo-loop.patch | 15 +++++++++++++++
12 2 files changed, 17 insertions(+)
13
14 diff --git a/sys-boot/elilo/elilo-3.16.ebuild b/sys-boot/elilo/elilo-3.16.ebuild
15 index cefd571..472488d 100644
16 --- a/sys-boot/elilo/elilo-3.16.ebuild
17 +++ b/sys-boot/elilo/elilo-3.16.ebuild
18 @@ -30,6 +30,8 @@ src_unpack() {
19 }
20
21 src_prepare() {
22 + epatch "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
23 +
24 # The patches Debian had were merged upstream.
25 #epatch debian/patches/*.diff
26
27
28 diff --git a/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
29 new file mode 100644
30 index 0000000..b574c29
31 --- /dev/null
32 +++ b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
33 @@ -0,0 +1,15 @@
34 +https://bugs.gentoo.org/299665
35 +
36 +patch by Dennis Schridde <devurandom@×××.net>
37 +
38 +--- a/debian/elilo.sh
39 ++++ b/debian/elilo.sh
40 +@@ -321,6 +321,8 @@
41 +
42 + mnt()
43 + {
44 ++ local loop
45 ++
46 + ## we can even create bootstrap filesystem images directly if you
47 + ## ever wanted too.
48 + if [ -f "$boot" ] ; then