From 23ca94ea42b5e428ffa0dd0bc76f2f7d8302adef Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 19 Dec 2024 11:37:07 +0100 Subject: [PATCH] build: Source build id from the correct repo, fix #872 INFIX_OEM_PATH is `""` by default (i.e., not empty in `make`'s eyes). So we called `git` with `-C ""`, which it interpreted as "from the current directory" and thus we sourced the autogenerated build id from _buildroot_ instead of Infix. Therefore, make sure to strip any quotes from the OEM path before determining the top directory. --- infix.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/infix.mk b/infix.mk index 1a91fb28f..dfed3a394 100644 --- a/infix.mk +++ b/infix.mk @@ -1,6 +1,7 @@ IXMSG = printf "\e[37;44m>>> $(call qstrip,$(1))\e[0m\n" -INFIX_TOPDIR = $(if $(INFIX_OEM_PATH),$(INFIX_OEM_PATH),$(BR2_EXTERNAL_INFIX_PATH)) +oem-dir := $(call qstrip,$(INFIX_OEM_PATH)) +INFIX_TOPDIR = $(if $(oem-dir),$(oem-dir),$(BR2_EXTERNAL_INFIX_PATH)) # Unless the user specifies an explicit build id, source it from git. # The build id also becomes the image version, unless an official