From patchwork Mon Feb 3 20:20:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1233000 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Cx2pulHc; dkim-atps=neutral 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 48BK2W6zWlz9s3x for ; Tue, 4 Feb 2020 07:20:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 89BE684AB2; Mon, 3 Feb 2020 20:20:33 +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 1flmvSTXs0-e; Mon, 3 Feb 2020 20:20:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2C33184540; Mon, 3 Feb 2020 20:20:29 +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 8DE451BF3D9 for ; Mon, 3 Feb 2020 20:20:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8A611844AB for ; Mon, 3 Feb 2020 20:20:26 +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 Dh7c5d0UOtKH for ; Mon, 3 Feb 2020 20:20:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2B83184481 for ; Mon, 3 Feb 2020 20:20:25 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id a9so849981wmj.3 for ; Mon, 03 Feb 2020 12:20:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xCmuwyFzqwCncwZleETWPNa73cMlMnW2rSzx0sSrh/M=; b=Cx2pulHc7W4WX5tqWM87pGdKARahE5Q0EfCQuJh+tevxl24UhTaOPRCw5xCrgQ4nXv ZSgHJivy0DGrJDZT7yTZw0P7zEMCcYbElLy58Du4i8DyIhCyscgQXJFMRJ3CIsRqBkao Pi5aDpOtiG0ffe8yeADPg10eh3hAk/BwQe4m+LhA9OxjoM9iVv0194PiCU2yZfeOEOOj Zj8rpz8CKN+sL05amkU4cyzDji7PEhbxiJYRw84bB6K2R2eyJItrMX3XbmTp9payLY7a lNZ+7w7guzqfHCrk9LLRiS4QegdvTThzIypAR7oGu5MKDguIL7PAWpu6/hQvfi6Z+ZPv 71Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xCmuwyFzqwCncwZleETWPNa73cMlMnW2rSzx0sSrh/M=; b=QNfxrqUKzlWj/8AZH93p9H+wmUMoZrj+o949xI6StgcgeXSCfXtHJO19i7R8Bz6kg/ GruIsAHdOj+u1cp8Gh5JubafwH7+z9mzraGCKPDqLDS6Zp1WNWTPmFm29CqhcBmvp4zK wKn9Px23dEUbheuGNtg7leySQKwi6jr+ydcR3GzeQ9dwMMxjKIaw/7RTnAHM1MQwGyBo zKdOdW38pD4c6/zQ2xTr4y2qgxKRbotiA+l2/wFnQcXE3s1GdtrEx1spTVhYs9CvFds0 CM3NsPVpwsNPXSSu9kKTxZCq8S5ySNgnYNXvGKWZnuujxdrI8hriYVvtmH2z4nfGts/5 HlCw== X-Gm-Message-State: APjAAAX13GIm6zxMlAtKd/IZHr77k5XGic2fQwuu2LA6LRMYj7dQrACi unVpJ54/2iX5kzHpUonloTOGJwxDkRo= X-Google-Smtp-Source: APXvYqyA4Z+Y4aPgQ/3rbVEO22WKIvIWNsw+RGQdnKj+Y8WHkerH/FqZHr0+SARPmYBKXWtvGPNhVw== X-Received: by 2002:a1c:9e89:: with SMTP id h131mr718848wme.161.1580761223512; Mon, 03 Feb 2020 12:20:23 -0800 (PST) Received: from scaer.voo.be ([2a02:2788:1038:bfe:4de1:f74c:99c5:ad3a]) by smtp.gmail.com with ESMTPSA id z19sm603664wmi.35.2020.02.03.12.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 12:20:23 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 3 Feb 2020 21:20:20 +0100 Message-Id: <214c0588eab33158185f6199444bd0b6dbc577ba.1580761209.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] boot/uboot: needs make >= 4.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Starting with 2020.01, uboot started using the 'undefine' make directive, which was only introduced with make 4.0. In the general case, we do not have a way to know if the uboot selected by the user is older or later than 2020.01, so we have no way to know before hand if make >= 4.0 is needed or not. As such, we have no other option than to always require it. So, use the existing $(BR2_MAKE_HOST_DEPENDENCY) and $(BR2_MAKE), both of each will ensure that we do use a make that is at least 4.0. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- boot/uboot/uboot.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index a4879bb8b2..19dfb08e81 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -12,6 +12,8 @@ UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt UBOOT_INSTALL_IMAGES = YES +UBOOT_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) + ifeq ($(UBOOT_VERSION),custom) # Handle custom U-Boot tarballs as specified by the configuration UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) @@ -242,7 +244,7 @@ UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) define UBOOT_CONFIGURE_CMDS $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ + $(BR2_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ $(UBOOT_BOARD_NAME)_config endef else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) @@ -279,7 +281,7 @@ define UBOOT_BUILD_CMDS cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/ ) $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ + $(BR2_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ $(UBOOT_MAKE_TARGET) $(if $(BR2_TARGET_UBOOT_FORMAT_SD), $(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd)