mirror of
https://github.com/kernelkit/infix.git
synced 2026-07-22 01:13:00 +02:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user