From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Harald Seiler <hws@denx.de>
Subject: [PATCH] u-boot: Use new makefile target for u-boot-initial-env where available
Date: Mon, 21 Jun 2021 18:00:51 +0200 [thread overview]
Message-ID: <c1951d98-f0b4-4522-137b-2a4cbc88d61c@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
Since 2019.07, u-boot-initial-env is available as build target. Latest
U-Boot has troubles running the get_default_envs.sh script, so better
switch to the official target where available.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/recipes-bsp/u-boot/files/debian/rules | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules
index 85bda91..a5c2cd2 100755
--- a/meta/recipes-bsp/u-boot/files/debian/rules
+++ b/meta/recipes-bsp/u-boot/files/debian/rules
@@ -3,7 +3,7 @@
# Debian rules for custom U-Boot build
#
# This software is a part of ISAR.
-# Copyright (c) Siemens AG, 2018
+# Copyright (c) Siemens AG, 2018-2021
#
# SPDX-License-Identifier: MIT
@@ -15,7 +15,11 @@ endif
override_dh_auto_build:
$(MAKE) $(PARALLEL_MAKE) $(U_BOOT_CONFIG)
$(MAKE) $(PARALLEL_MAKE) ${U_BOOT_BIN}
- ./scripts/get_default_envs.sh >u-boot-initial-env
+ $(MAKE) -n u-boot-initial-env >/dev/null 2>&1; if [ $$? -ne 2 ]; then \
+ $(MAKE) $(PARALLEL_MAKE) u-boot-initial-env; \
+ else \
+ ./scripts/get_default_envs.sh >u-boot-initial-env; \
+ fi
$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools
override_dh_auto_install:
--
2.26.2
next reply other threads:[~2021-06-21 16:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 16:00 Jan Kiszka [this message]
2021-06-22 8:26 ` Jan Kiszka
2021-06-22 12:09 ` Harald Seiler
2021-07-26 14:56 ` Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c1951d98-f0b4-4522-137b-2a4cbc88d61c@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=hws@denx.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox