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 diefsdg20230625
Leah Rowe
parent
6290f999e2
commit
3da0ee4f73
|
|
@ -1,36 +0,0 @@
|
||||||
From 52acb9071bda297e9520107a0d0f996e9cba28fb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Leah Rowe <leah@libreboot.org>
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
From 9a65c1e4ca8a0f0089fd8e8ee9c8690aefce2133 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Leah Rowe <leah@libreboot.org>
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
From d30654becf183e14e5c5c8d8216ee52a6437f233 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Leah Rowe <leah@libreboot.org>
|
|
||||||
Date: Sun, 13 Mar 2022 18:08:57 +0000
|
|
||||||
Subject: [PATCH 3/3] specifically use python3 in gentpl.py
|
|
||||||
|
|
||||||
---
|
|
||||||
gentpl.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/gentpl.py b/gentpl.py
|
|
||||||
index 9f51e4fb6..22cf4439c 100644
|
|
||||||
--- a/gentpl.py
|
|
||||||
+++ b/gentpl.py
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#! /usr/bin/python
|
|
||||||
+#! /usr/bin/python3
|
|
||||||
# GRUB -- GRand Unified Bootloader
|
|
||||||
# Copyright (C) 2010,2011,2012,2013 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
From 8d613d45f6fc0f9464bc5f6e5893b5945500c286 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Leah Rowe <leah@libreboot.org>
|
|
||||||
Date: Sun, 13 Mar 2022 18:48:29 +0000
|
|
||||||
Subject: [PATCH 1/1] specifically call python3 in me_cleaner
|
|
||||||
|
|
||||||
it was referencing "python" which is ambiguous. this causes
|
|
||||||
problems on some setups
|
|
||||||
---
|
|
||||||
me_cleaner.py | 2 +-
|
|
||||||
setup.py | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/me_cleaner.py b/me_cleaner.py
|
|
||||||
index c2adf0e..d74b16b 100755
|
|
||||||
--- a/me_cleaner.py
|
|
||||||
+++ b/me_cleaner.py
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/python
|
|
||||||
+#!/usr/bin/env python3
|
|
||||||
|
|
||||||
# me_cleaner - Tool for partial deblobbing of Intel ME/TXE firmware images
|
|
||||||
# Copyright (C) 2016-2018 Nicola Corna <nicola@corna.info>
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index 9928e5d..f04e336 100755
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/python
|
|
||||||
+#!/usr/bin/env python3
|
|
||||||
|
|
||||||
from setuptools import setup
|
|
||||||
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
From a21f175947d7186e0b5554826e1ae51880a6cfb8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Leah Rowe <leah@libreboot.org>
|
|
||||||
Date: Sun, 13 Mar 2022 18:02:26 +0000
|
|
||||||
Subject: [PATCH 1/1] use python3 specifically, in scripts
|
|
||||||
|
|
||||||
some systems don't have a python binary anymore, only python2 and
|
|
||||||
python3 binaries, without creating a symlink to either of them
|
|
||||||
---
|
|
||||||
scripts/acpi_extract.py | 2 +-
|
|
||||||
scripts/acpi_extract_preprocess.py | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/scripts/acpi_extract.py b/scripts/acpi_extract.py
|
|
||||||
index 3ed863b..eb910f3 100755
|
|
||||||
--- a/scripts/acpi_extract.py
|
|
||||||
+++ b/scripts/acpi_extract.py
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/python
|
|
||||||
+#!/usr/bin/python3
|
|
||||||
# Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <mst@redhat.com>
|
|
||||||
#
|
|
||||||
# This file may be distributed under the terms of the GNU GPLv3 license.
|
|
||||||
diff --git a/scripts/acpi_extract_preprocess.py b/scripts/acpi_extract_preprocess.py
|
|
||||||
index 2698118..6963847 100755
|
|
||||||
--- a/scripts/acpi_extract_preprocess.py
|
|
||||||
+++ b/scripts/acpi_extract_preprocess.py
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/python
|
|
||||||
+#!/usr/bin/python3
|
|
||||||
# Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin <mst@redhat.com>
|
|
||||||
#
|
|
||||||
# This file may be distributed under the terms of the GNU GPLv3 license.
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue