public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/vboot-utils/
Date: Tue, 15 Sep 2015 04:22:39 +0000 (UTC)	[thread overview]
Message-ID: <1442290936.677fe97fc7adb186a371971c8f3c2d3d2fd07f8e.zmedico@gentoo> (raw)

commit:     677fe97fc7adb186a371971c8f3c2d3d2fd07f8e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 04:21:47 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 04:22:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677fe97f

sys-boot/vboot-utils: fix 42_p20150219 /usr/usr prefix for bug 553924

Package-Manager: portage-2.2.20.1

 sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
index de2fbd2..2a6b0cd 100644
--- a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
+++ b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
@@ -37,6 +37,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-cgpt-static.patch
 	sed -i \
 		-e 's: -Werror : :g' \
+		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
+		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
 		Makefile || die
 }
 
@@ -64,10 +66,7 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}/usr" install
-	if ! use minimal ; then
-		rm -r "${ED}"/usr/default || die
-	fi
+	_emake DESTDIR="${ED}" install
 
 	insinto /usr/share/vboot/devkeys
 	doins tests/devkeys/*


             reply	other threads:[~2015-09-15  4:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-15  4:22 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-31 23:37 [gentoo-commits] repo/gentoo:master commit in: sys-boot/vboot-utils/ Sam James
2023-09-04 18:54 Andreas Sturmlechner
2022-08-26 10:46 Sam James
2021-05-02 19:35 Mikle Kolyada
2020-01-13  1:12 Zac Medico
2019-06-14 13:25 Jory Pratt
2019-06-13  1:56 Jory Pratt
2019-01-05  1:35 Zac Medico
2019-01-03 23:50 Zac Medico
2019-01-03 23:50 Zac Medico
2017-04-22  4:14 Zac Medico
2016-07-31 20:34 Anthony G. Basile
2016-05-11 20:23 Mike Frysinger
2016-05-02  0:46 Zac Medico
2015-08-14  3:40 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442290936.677fe97fc7adb186a371971c8f3c2d3d2fd07f8e.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox