From: Thomas Petazzoni Date: Tue, 16 Feb 2021 21:23:21 +0100 Subject: [Buildroot] [PATCH] package/uboot-tools: depend on u-boot when selected In-Reply-To: <20210216142007.24983-1-patrickdepinguin@gmail.com> References: <20210216142007.24983-1-patrickdepinguin@gmail.com> Message-ID: <20210216212321.0da56ad2@windsurf.home> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On Tue, 16 Feb 2021 15:20:07 +0100 Thomas De Schampheleire wrote: > From: Thomas De Schampheleire > > The envimage creation logic only depended on u-boot when the user did not > specify a custom envimage source via > BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE . This assumes that a > user-provided envimage source is never coming from the u-boot source > tree. > > But especially given the fact that the envimage creation logic used to be > part of the u-boot package, this is a realistic scenario: users may have > provided a value of BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE based on > $(UBOOT_DIR), e.g.: > > $(UBOOT_DIR)/board/foo-vendor/bar-board/env.txt > > Therefore, always add the u-boot dependency if u-boot is selected, for > either case of custom or default envimage source. > > Signed-off-by: Thomas De Schampheleire > --- > package/uboot-tools/uboot-tools.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) I've applied to master, after slightly reworking the logic. Indeed you had this: ifeq ($(env):$(uboot),:y) ... endif ifeq ($(uboot),y) ... endif Which I modified to: ifeq ($(uboot),y) ... ifeq ($env),) ... endif endif Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com