From 8ca0761fb0651d064a4994be70ab85efffee6e48 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 13 Mar 2022 18:14:54 +0000 Subject: specifically call python3, in scripts with this change, it's unlikely we'll hit errors again. previously, some projects used were calling "python" which in context was python3, but on some setups, the user only has python2 and python3 but no symlink for "python" (which if exists, we assumed linked to python3) now it's unambiguous. docs/build/ can probably be updated now, as a result of this change, to remove the advice about that --- .../default/patches/0015-python-patch.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 resources/coreboot/default/patches/0015-python-patch.patch (limited to 'resources/coreboot') diff --git a/resources/coreboot/default/patches/0015-python-patch.patch b/resources/coreboot/default/patches/0015-python-patch.patch new file mode 100644 index 00000000..0f2abc14 --- /dev/null +++ b/resources/coreboot/default/patches/0015-python-patch.patch @@ -0,0 +1,36 @@ +From cb3b04a3849952d8c0fa90616f45cfe5e613a286 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Sun, 13 Mar 2022 18:04:55 +0000 +Subject: [PATCH 1/1] specifically use python3, in scripts + +--- + src/drivers/intel/fsp2_0/Makefile.inc | 2 +- + util/spdtool/spdtool.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc +index eaf99d1492..9e82172c9e 100644 +--- a/src/drivers/intel/fsp2_0/Makefile.inc ++++ b/src/drivers/intel/fsp2_0/Makefile.inc +@@ -84,7 +84,7 @@ endif + + ifeq ($(CONFIG_FSP_FULL_FD),y) + $(obj)/Fsp_M.fd: $(call strip_quotes,$(CONFIG_FSP_FD_PATH)) $(DOTCONFIG) +- python 3rdparty/fsp/Tools/SplitFspBin.py split -f $(CONFIG_FSP_FD_PATH) -o "$(obj)" -n "Fsp.fd" ++ python3 3rdparty/fsp/Tools/SplitFspBin.py split -f $(CONFIG_FSP_FD_PATH) -o "$(obj)" -n "Fsp.fd" + + $(obj)/Fsp_S.fd: $(call strip_quotes,$(CONFIG_FSP_FD_PATH)) $(obj)/Fsp_M.fd + true +diff --git a/util/spdtool/spdtool.py b/util/spdtool/spdtool.py +index 89976eac59..2cd7027377 100644 +--- a/util/spdtool/spdtool.py ++++ b/util/spdtool/spdtool.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # spdtool - Tool for partial deblobbing of UEFI firmware images + # SPDX-License-Identifier: GPL-3.0-or-later + # +-- +2.25.1 + -- cgit v1.2.1