From patchwork Wed Sep 5 09:49:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preston X-Patchwork-Id: 966302 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=codethink.co.uk Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4250Q34k03z9s7T for ; Wed, 5 Sep 2018 20:32:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1D7CB8815F; Wed, 5 Sep 2018 10:32:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dyS55R7SRKwL; Wed, 5 Sep 2018 10:32:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2100E87B31; Wed, 5 Sep 2018 10:32:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 97A831C2DCA for ; Wed, 5 Sep 2018 10:32:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9565E886A3 for ; Wed, 5 Sep 2018 10:32:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4-4+0N3kVBYT for ; Wed, 5 Sep 2018 10:32:17 +0000 (UTC) X-Greylist: delayed 00:42:34 by SQLgrey-1.7.6 Received: from imap1.codethink.co.uk (imap1.codethink.co.uk [176.9.8.82]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9B9A18862C for ; Wed, 5 Sep 2018 10:32:17 +0000 (UTC) Received: from [148.252.241.226] (helo=ct-lt-1124) by imap1.codethink.co.uk with esmtpsa (Exim 4.84_2 #1 (Debian)) id 1fxURQ-0007YI-Jd for ; Wed, 05 Sep 2018 10:49:40 +0100 Received: from tpreston by ct-lt-1124 with local (Exim 4.89) (envelope-from ) id 1fxURQ-0006NF-8b for buildroot@buildroot.org; Wed, 05 Sep 2018 10:49:40 +0100 From: Thomas Preston To: buildroot@buildroot.org Date: Wed, 5 Sep 2018 10:49:40 +0100 Message-Id: <20180905094940.24461-1-thomas.preston@codethink.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH 1/1] boot/uboot: Set MAKE_ENV for kconfig build system X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" U-Boot fails to build in gitlab CI context because the kconfig-package build stage is unable to find bison for flex even though they are installed in BR_BINARIES_DIR. To fix this, set UBOOT_MAKE_ENV so that UBOOT_KCONFIG_MAKE uses the correct PATH. Signed-off-by: Thomas Preston --- boot/uboot/uboot.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index bddafe234d..36428e65fe 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -449,6 +449,9 @@ endif # BR2_TARGET_UBOOT && BR_BUILDING ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) $(eval $(generic-package)) else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) +UBOOT_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + BR_BINARIES_DIR=$(BINARIES_DIR) UBOOT_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY)