From 1eef518daa92d81ee5368ae1ed6262936d93426e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Tue, 13 Feb 2024 17:29:46 +0100 Subject: [PATCH] modules/coreboot: don't touch DMI vendor name if unspecified MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Kopeć Signed-off-by: Thierry Laurion --- modules/coreboot | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/coreboot b/modules/coreboot index 21579c7f..3f11e772 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -113,7 +113,6 @@ $(coreboot_module)_depends += $(if $(CONFIG_PURISM_BLOBS), purism-blobs) CONFIG_COREBOOT_CONFIG ?= config/coreboot-$(BOARD).config CONFIG_COREBOOT_LOCALVERSION ?= $(BRAND_NAME)-$(HEADS_GIT_VERSION) CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME ?= $(BOARD) -CONFIG_COREBOOT_SMBIOS_MANUFACTURER ?= $(BRAND_NAME) # Ensure that touching the config file will force a rebuild $(build)/$(coreboot_dir)/.configured: $(CONFIG_COREBOOT_CONFIG) @@ -136,12 +135,14 @@ else endif $(coreboot_module)_configure := \ - mkdir -p "$(build)/$(coreboot_dir)" \ - && $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config) \ - && echo 'CONFIG_LOCALVERSION="$(CONFIG_COREBOOT_LOCALVERSION)"' >> $(build)/$(coreboot_dir)/.config \ - && echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME)"' >> $(build)/$(coreboot_dir)/.config \ - && echo 'CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)"' >> $(build)/$(coreboot_dir)/.config \ - && $(MAKE) olddefconfig \ + mkdir -p "$(build)/$(coreboot_dir)"; \ + $(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config); \ + echo 'CONFIG_LOCALVERSION="$(CONFIG_COREBOOT_LOCALVERSION)"' >> $(build)/$(coreboot_dir)/.config; \ + echo 'CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="$(CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME)"' >> $(build)/$(coreboot_dir)/.config; \ + if [ ! -z "$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)" ]; then \ + echo 'CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="$(CONFIG_COREBOOT_SMBIOS_MANUFACTURER)"' >> $(build)/$(coreboot_dir)/.config; \ + fi; \ + $(MAKE) olddefconfig \ -C "$(build)/$(coreboot_base_dir)" \ obj="$(build)/$(coreboot_dir)" \ DOTCONFIG="$(build)/$(coreboot_dir)/.config" \