[gentoo-commits] dev/xmw:master commit in: sys-boot/raspberrypi-firmware/

[Michael Weber]

commit:     26886f50a44e1d32b7d0697fa46c55a96dd8abe7
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed Apr  1 15:11:08 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 15:11:08 2015 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=26886f50

Fix bug 520686 by Maxim Mikityanskiy.

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 62EEF090

 sys-boot/raspberrypi-firmware/ChangeLog                               | 4 ++++
 .../raspberrypi-firmware/raspberrypi-firmware-1_pre20150327.ebuild    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-boot/raspberrypi-firmware/ChangeLog b/sys-boot/raspberrypi-firmware/ChangeLog
index 9ebdcf3..8645770 100644
--- a/sys-boot/raspberrypi-firmware/ChangeLog
+++ b/sys-boot/raspberrypi-firmware/ChangeLog
@@ -1,3 +1,7 @@
+  01 Apr 2015; Michael Weber <xmw@g.o>
+  raspberrypi-firmware-1_pre20150327.ebuild:
+  Fix bug 520686 by Maxim Mikityanskiy.
+
 *raspberrypi-firmware-1_pre20150327 (01 Apr 2015)
 
   01 Apr 2015; Michael Weber <xmw@g.o>

diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20150327.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20150327.ebuild
index 2c2d0bc..1b46d8b 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20150327.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20150327.ebuild
@@ -31,10 +31,10 @@ src_unpack() { :; }
 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
 		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+		if [ -e "${D}"/boot/cmdline.txt -a -e "${ROOT}"/boot/cmdline.txt ] ; then
 			msg+="/boot/cmdline.txt "
 		fi
-		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+		if [ -e "${D}"/boot/config.txt -a -e "${ROOT}"/boot/config.txt ] ; then
 			msg+="/boot/config.txt "
 		fi
 		if [ -n "${msg}" ] ; then