From patchwork Sat Oct 3 09:59:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1376233 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=JU8fUd7Q; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C3MlS5dZxz9ryj for ; Sat, 3 Oct 2020 19:59:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 985E8864C4; Sat, 3 Oct 2020 09:59:13 +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 qrasc946S3eI; Sat, 3 Oct 2020 09:59:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 44D0B85540; Sat, 3 Oct 2020 09:59:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E573A1BF20D for ; Sat, 3 Oct 2020 09:59:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E266C86816 for ; Sat, 3 Oct 2020 09:59:09 +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 Pp3VpUK5Rc0y for ; Sat, 3 Oct 2020 09:59:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by whitealder.osuosl.org (Postfix) with ESMTPS id 65C1086786 for ; Sat, 3 Oct 2020 09:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601719143; bh=wQ92mdhoP9R9LAhEZZ8UqMXHlht2Wwp01caMTyNuunU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=JU8fUd7Qgg57wsqkpjuNq/Ix8gQ1hSgK6GH3Yy2HqcehHgH07KbzRvuN30IsK14da aPOD9mJLn1rcWO8QGjCe7ffmQbVw+jx63Md2hgAD8D/Au9Q2nlquRWJjY7fvhz67q3 mIT/qda5mvI63+0VLeb+Sohyi33iudMkLxby5OI0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.137]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N5VD8-1kRVc50EeI-0170HF; Sat, 03 Oct 2020 11:59:03 +0200 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 3 Oct 2020 11:59:02 +0200 Message-Id: <20201003095902.16248-1-ps.report@gmx.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:XLDtxgqX6Z4cg24W5uuV345wq//I3gYj2xsRDXSMqKkZdYxlYTz mc/ucg7lOeAIiIZFfHN5wDICTj5UFN+QQt2AxBeAw38zQd8kf+64sz3Hcha0KCsMWBSFHoa CsfLD+FohZUv3K82mAmgbFN6mzRUYhjLKU+WfNJ27KlnaAPjtB9yTzW5mvXlEiTdKrvWDVA zY5/lyPwwZaTzB748Ravg== X-UI-Out-Filterresults: notjunk:1;V03:K0:mymihdDSEWA=:Tml9YuuZnEThzinNsIUaRH cS9kVRvq66JYr5o8AIfVrrzmu8BqR/aJ1DWvWj0++OpmwJyNr4TGGQQxswWU8P6IvLFVVasGY L474Z2RjPKW4JN3L/cuqGWJe6ymBjAS4KIg/RCC9GWWrkXHZrNavsLwjXEyoRWQksGVKJopqE tehF2g+J4spIlCFl4JFULgn0ddNSVRSDmwwYeKjEMUepi4shuieNa6KdPQ8AxghfsNb8VKV6/ wwdXbR33bIAVoBQ5YBf35aqXWO4ojE1vzglFN9VLYKDRBOLeFOmCEDZmyca2U7gZWRooouvPT 2QWR6gjIqkOvr4vqEgCEbXdaKvpTj+Bzd5wQliJRjPedvZrK8HHZMDwi8reNmzhdVMhrxcc21 cWDYVYzf9lWgncho6tmLyfUGyjuPgxQnluiVdNXpkDtbumX2MD2dAd/ju+OkfEpNODsdZFDny 7S2Vt+FL5CxdnGrX6mLYstc8mjbsGcb91kFaQ5qAhAV79DHt2gIkw+HtgYVoiL+WKgjA/X1Lj zv7KgsQLhVhvuNFjZCO54vM5AD1ZWaGux+MLmFelCBVGnjCOjEz+GaosxrkoAfegCATmZzA+H +cXcUqddq14aiEDMJ5s+uaISz1CJRMTZmP4iulq0QsJPJAXojtBP0L4D0h6p7ycbdYQEiI09W X0m2Yc+wEADo6VvRJvIQbbKIr9UkEwJJ/c7ihZ1DSnWHIkX7/QC9rLzDDFlo1EeAtUkCYcksi ZyrZ+LcuGmPxjhzgOlR3IAfOouy3fdqICpKZWahAo3BIwJzF4onkoh0Snjd5U5yhkZjQAPBpT 11ltcqX7Cvox390lsMAAfnFBcxcQmXAoGDNjS14KMaj6fv3vbnBl0PEHpSa323BnPCmbFI+jF dufC06JerH6kg6U7Z63RosgQgMImLg/nDPF6L7e4qhELJUnHv46DQSdUNuV9RCTq4tA24xqNV 84RJP5lv8pPa52yBHlUaDzE9naEF75UY011TN3iNvzRRaC62lqNVFD5mdW28xXq3VcjuTylaR D8CPbDEIhn8efBROA/30icODU94OCVcnNc7JDCxwsckGSJMjN+jujUm9iz5Db5B6BdvV6cMM6 D73qsaV+5of+Nf1mIdZV9FFZHjCdSLQft8g/5iWmaxOupdRRAp12TB/KeVFX0tqEgGPa8Z/r9 4ysrnUk3AJO403m4vqR58NmvcfvTp0UC+mce18OxdM5A/H5T6gmRXd64OVMh/7Q5EIpnbAtZx JTIg7mv/GPFQdDFmD++hNOEJpeuSCUfYH/V2xfQ== Subject: [Buildroot] [PATCH v2] boot/barebox: fix target bareboxenv command compile 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: Frederick Gotham , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The buildroot custom bareboxenv compile command misses the additional include path 'scripts/include' to gain access to the local copy of the kernel header files (which leads to compile error when using an older toolchain). This could be fixed by enhancing the custom bareboxenv compile command (see [1]) or by using the barebox build system by simply enabling the CONFIG_BAREBOXENV_TARGET option (available since April 2012, see [2]) instead (as suggested by Yann E. MORIN). Fixes (with BR2_TARGET_BAREBOX_BAREBOXENV enabled): build/barebox-2019.12.0/scripts/bareboxenv.c:100:10: fatal error: linux/list.h: No such file or directory [1] http://lists.busybox.net/pipermail/buildroot/2020-January/270942.html [2] https://git.pengutronix.de/cgit/barebox/commit/?id=afb03d7a554a2911a3742e316f011319fcb416f1 Reported-by: Frederick Gotham Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - change to barebox CONFIG_BAREBOXENV_TARGET config option (suggested by Yann E. MORIN) --- boot/barebox/barebox.mk | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 422f27312d..d47a47966c 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -88,13 +88,6 @@ $(1)_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) -ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) -define $(1)_BUILD_BAREBOXENV_CMDS - $$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \ - $$(@D)/scripts/bareboxenv.c -endef -endif - ifeq ($$(BR2_TARGET_$(1)_CUSTOM_ENV),y) $(1)_ENV_NAME = $$(notdir $$(call qstrip,\ $$(BR2_TARGET_$(1)_CUSTOM_ENV_PATH))) @@ -109,12 +102,23 @@ endef endif ifneq ($$($(1)_CUSTOM_EMBEDDED_ENV_PATH),) -define $(1)_KCONFIG_FIXUP_CMDS +define $(1)_KCONFIG_FIXUP_CUSTOM_EMBEDDED_ENV_PATH $$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_ENVIRONMENT) $$(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,"$$($(1)_CUSTOM_EMBEDDED_ENV_PATH)") endef endif +ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) +define $(1)_KCONFIG_FIXUP_BAREBOXENV + $$(call KCONFIG_ENABLE_OPT,CONFIG_BAREBOXENV_TARGET) +endef +endif + +define $(1)_KCONFIG_FIXUP_CMDS + $$($(1)_KCONFIG_FIXUP_CUSTOM_EMBEDDED_ENV_PATH) + $$($(1)_KCONFIG_FIXUP_BAREBOXENV) +endef + define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) @@ -136,7 +140,7 @@ endef ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y) define $(1)_INSTALL_TARGET_CMDS - cp $$(@D)/bareboxenv $$(TARGET_DIR)/usr/bin + cp $$(@D)/scripts/bareboxenv-target $$(TARGET_DIR)/usr/bin/bareboxenv endef endif