From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 39548138350 for ; Sat, 15 Feb 2020 21:08:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06114E0880; Sat, 15 Feb 2020 21:08:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2335E0880 for ; Sat, 15 Feb 2020 21:08:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05CF334EB4D for ; Sat, 15 Feb 2020 21:08:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DE8E10B for ; Sat, 15 Feb 2020 21:08:14 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1581799090.9aa413c047bc6cb366746634c8a397d10207ba24.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: gkbuilds/ X-VCS-Repository: proj/genkernel X-VCS-Files: gkbuilds/util-linux.gkbuild X-VCS-Directories: gkbuilds/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 9aa413c047bc6cb366746634c8a397d10207ba24 X-VCS-Branch: master Date: Sat, 15 Feb 2020 21:08:14 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ce05247-94e5-49d8-a8ad-b28b5969218a X-Archives-Hash: eccabd2b8092060ee373565649add8cc commit: 9aa413c047bc6cb366746634c8a397d10207ba24 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Feb 15 18:58:02 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Feb 15 20:38:10 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9aa413c0 gkbuilds/util-linux: Use $D Signed-off-by: Thomas Deutschmann gentoo.org> gkbuilds/util-linux.gkbuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild index da09225..0c4377e 100644 --- a/gkbuilds/util-linux.gkbuild +++ b/gkbuilds/util-linux.gkbuild @@ -23,7 +23,7 @@ src_configure() { src_install() { local MYMAKEOPTS=( "V=1" ) - MYMAKEOPTS+=( "DESTDIR=${DESTDIR}" ) + MYMAKEOPTS+=( "DESTDIR=${D}" ) MYMAKEOPTS+=( "install-pkgconfigDATA" ) MYMAKEOPTS+=( "install-nodist_blkidincHEADERS" ) MYMAKEOPTS+=( "install-nodist_mountincHEADERS" ) @@ -33,9 +33,9 @@ src_install() { mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!" - cp -a blkid.static "${DESTDIR}"/sbin/blkid \ - || die "Failed to copy '${S}/blkid.static' to '${DESTDIR}/sbin/blkid'!" + cp -a blkid.static "${D}"/sbin/blkid \ + || die "Failed to copy '${S}/blkid.static' to '${D}/sbin/blkid'!" - "${STRIP}" --strip-all "${DESTDIR}"/sbin/blkid \ - || die "Failed to strip '${DESTDIR}/sbin/blkid'!" + "${STRIP}" --strip-all "${D}"/sbin/blkid \ + || die "Failed to strip '${D}/sbin/blkid'!" }