From 3da0ee4f73117edc1daaca6cb1ed9cb9484996a2 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 11 May 2023 10:21:48 +0100 Subject: remove python3 patches python 3 is default now, in all the distros specifically calling "python3" often doesn't work anymore python2 is obsolete let python2 die --- .../0013-specifically-use-python3-in-scripts.patch | 36 ---------------------- .../0026-specifically-use-python3-in-scripts.patch | 36 ---------------------- 2 files changed, 72 deletions(-) delete mode 100644 resources/coreboot/default/patches/0013-specifically-use-python3-in-scripts.patch delete mode 100644 resources/coreboot/haswell/patches/0026-specifically-use-python3-in-scripts.patch (limited to 'resources/coreboot') diff --git a/resources/coreboot/default/patches/0013-specifically-use-python3-in-scripts.patch b/resources/coreboot/default/patches/0013-specifically-use-python3-in-scripts.patch deleted file mode 100644 index 2197de36..00000000 --- a/resources/coreboot/default/patches/0013-specifically-use-python3-in-scripts.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 52acb9071bda297e9520107a0d0f996e9cba28fb Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 13 Mar 2022 18:04:55 +0000 -Subject: [PATCH 13/18] 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 f11ebee102..e4b151b524 100644 ---- a/src/drivers/intel/fsp2_0/Makefile.inc -+++ b/src/drivers/intel/fsp2_0/Makefile.inc -@@ -88,7 +88,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.39.2 - diff --git a/resources/coreboot/haswell/patches/0026-specifically-use-python3-in-scripts.patch b/resources/coreboot/haswell/patches/0026-specifically-use-python3-in-scripts.patch deleted file mode 100644 index 8f957cb9..00000000 --- a/resources/coreboot/haswell/patches/0026-specifically-use-python3-in-scripts.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9a65c1e4ca8a0f0089fd8e8ee9c8690aefce2133 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 13 Mar 2022 18:04:55 +0000 -Subject: [PATCH 26/26] 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 f5641ac182..d807320f29 100644 ---- a/src/drivers/intel/fsp2_0/Makefile.inc -+++ b/src/drivers/intel/fsp2_0/Makefile.inc -@@ -87,7 +87,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.39.2 - -- cgit v1.2.1