From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6F376138821 for ; Wed, 1 Apr 2015 15:11:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B8F2E0AA3; Wed, 1 Apr 2015 15:11:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF282E0AA3 for ; Wed, 1 Apr 2015 15:11:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B58E3408E0 for ; Wed, 1 Apr 2015 15:11:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4C4114FE8 for ; Wed, 1 Apr 2015 15:11:27 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1427901068.26886f50a44e1d32b7d0697fa46c55a96dd8abe7.xmw@gentoo> Subject: [gentoo-commits] dev/xmw:master commit in: sys-boot/raspberrypi-firmware/ X-VCS-Repository: dev/xmw X-VCS-Files: sys-boot/raspberrypi-firmware/ChangeLog sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20150327.ebuild X-VCS-Directories: sys-boot/raspberrypi-firmware/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 26886f50a44e1d32b7d0697fa46c55a96dd8abe7 X-VCS-Branch: master Date: Wed, 1 Apr 2015 15:11:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d507edb8-8438-4770-aa1a-b25ebb6caed1 X-Archives-Hash: 469336fbcb5203e2b0b42aae4e2249c3 commit: 26886f50a44e1d32b7d0697fa46c55a96dd8abe7 Author: Michael Weber xmw de> AuthorDate: Wed Apr 1 15:11:08 2015 +0000 Commit: Michael Weber gentoo 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 + raspberrypi-firmware-1_pre20150327.ebuild: + Fix bug 520686 by Maxim Mikityanskiy. + *raspberrypi-firmware-1_pre20150327 (01 Apr 2015) 01 Apr 2015; Michael Weber 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