From patchwork Wed Apr 12 09:39:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 749892 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w2zYn5wzPz9sNJ for ; Wed, 12 Apr 2017 19:45:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BAFE3882C1; Wed, 12 Apr 2017 09:45:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nO0cABVjo6-N; Wed, 12 Apr 2017 09:45:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7C2CB88426; Wed, 12 Apr 2017 09:42:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 40AC21C3EF4 for ; Wed, 12 Apr 2017 09:40:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 06DCB86C06 for ; Wed, 12 Apr 2017 09:40:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NtI61bOr3quK for ; Wed, 12 Apr 2017 09:40:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from exchange.essensium.com (220.77.144.195.ipv4.evonet.be [195.144.77.220]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B2F6587358 for ; Wed, 12 Apr 2017 09:40:11 +0000 (UTC) Received: from vandecaa-laptop.local.ess-mail.com (10.3.4.128) by beleexch01.local.ess-mail.com (10.3.7.8) with Microsoft SMTP Server (TLS) id 15.0.847.32; Wed, 12 Apr 2017 11:39:56 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: Date: Wed, 12 Apr 2017 11:39:22 +0200 Message-ID: <20170412093928.1006-49-arnout@mind.be> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170412093928.1006-1-arnout@mind.be> References: <20170412093928.1006-1-arnout@mind.be> MIME-Version: 1.0 X-Originating-IP: [10.3.4.128] X-ClientProxiedBy: beleexch01.local.ess-mail.com (10.3.7.8) To beleexch01.local.ess-mail.com (10.3.7.8) Subject: [Buildroot] [PATCH 48/53] grub2: install in $(HOST_DIR) instead of $(HOST_DIR)/usr X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" grub2 builds for the target but installs with DESTDIR=$(HOST_DIR). Since we set prefix to /usr in TARGET_CONF_OPTS, this results in installing things in $(HOST_DIR)/usr. To make sure we don't install in $(HOST_DIR)/usr, override --prefix and --exec-prefix. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/grub2/grub2.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 80f06c7f02..1b1ca105fe 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -63,6 +63,8 @@ GRUB2_CONF_ENV = \ GRUB2_CONF_OPTS = \ --target=$(GRUB2_TARGET) \ --with-platform=$(GRUB2_PLATFORM) \ + --prefix=/ \ + --exec-prefix=/ \ --disable-grub-mkfont \ --enable-efiemu=no \ ac_cv_lib_lzma_lzma_code=no \