From 7da8ffb20bcdaf1cb7d5845ab483046353ad2b56 Mon Sep 17 00:00:00 2001 From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:33:46 +0200 Subject: [PATCH] uboot: Use semantic versioning for 2022.04 and 2022.07 Setuptools >66 only allows for semantic versioning, but old U-Boot versions don't use semver yet. This makes compilation fail with an error. --- .../general-fix-use-semantic-versioning.patch | 27 ++++++++++++++++ .../general-fix-use-semantic-versioning.patch | 27 ++++++++++++++++ .../general-fix-use-semantic-versioning.patch | 31 +++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 patch/u-boot/u-boot-rockchip64-v2022.04/general-fix-use-semantic-versioning.patch create mode 100644 patch/u-boot/u-boot-rockchip64/general-fix-use-semantic-versioning.patch create mode 100644 patch/u-boot/v2022.07/general-fix-use-semantic-versioning.patch diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/general-fix-use-semantic-versioning.patch b/patch/u-boot/u-boot-rockchip64-v2022.04/general-fix-use-semantic-versioning.patch new file mode 100644 index 000000000..7a906e4c9 --- /dev/null +++ b/patch/u-boot/u-boot-rockchip64-v2022.04/general-fix-use-semantic-versioning.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: ColorfulRhino +Date: Tue, 2 Jul 2024 13:37:16 +0200 +Subject: Use semantic versioning for pylibfdt + +Setuptools >66 only allows for semantic versioning which old U-Boot +versions don't yet use. +--- + scripts/dtc/pylibfdt/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py +index 111111111111..222222222222 100755 +--- a/scripts/dtc/pylibfdt/setup.py ++++ b/scripts/dtc/pylibfdt/setup.py +@@ -114,7 +114,7 @@ libfdt_module = Extension( + + setup( + name='libfdt', +- version= version, ++ version='2022.04', + author='Simon Glass ', + description='Python binding for libfdt', + ext_modules=[libfdt_module], +-- +Armbian + diff --git a/patch/u-boot/u-boot-rockchip64/general-fix-use-semantic-versioning.patch b/patch/u-boot/u-boot-rockchip64/general-fix-use-semantic-versioning.patch new file mode 100644 index 000000000..d7b448453 --- /dev/null +++ b/patch/u-boot/u-boot-rockchip64/general-fix-use-semantic-versioning.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: ColorfulRhino +Date: Tue, 2 Jul 2024 13:37:16 +0200 +Subject: Use semantic versioning for pylibfdt + +Setuptools >66 only allows for semantic versioning which old U-Boot +versions don't yet use. +--- + scripts/dtc/pylibfdt/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py +index 111111111111..222222222222 100755 +--- a/scripts/dtc/pylibfdt/setup.py ++++ b/scripts/dtc/pylibfdt/setup.py +@@ -114,7 +114,7 @@ libfdt_module = Extension( + + setup( + name='libfdt', +- version= version, ++ version='2022.07', + author='Simon Glass ', + description='Python binding for libfdt', + ext_modules=[libfdt_module], +-- +Armbian + diff --git a/patch/u-boot/v2022.07/general-fix-use-semantic-versioning.patch b/patch/u-boot/v2022.07/general-fix-use-semantic-versioning.patch new file mode 100644 index 000000000..07f727d69 --- /dev/null +++ b/patch/u-boot/v2022.07/general-fix-use-semantic-versioning.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: ColorfulRhino +Date: Tue, 2 Jul 2024 13:37:16 +0200 +Subject: Use semantic versioning for pylibfdt + +Setuptools >66 only allows for semantic versioning which old U-Boot +versions don't yet use. +--- + scripts/dtc/pylibfdt/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py +index 992cdec30f5..66614c4cd4d 100755 +--- a/scripts/dtc/pylibfdt/setup.py ++++ b/scripts/dtc/pylibfdt/setup.py +@@ -112,11 +112,11 @@ libfdt_module = Extension( + swig_opts = swig_opts, + ) + + setup( + name='libfdt', +- version= version, ++ version='2022.07', + author='Simon Glass ', + description='Python binding for libfdt', + ext_modules=[libfdt_module], + package_dir={'': objdir}, + py_modules=['pylibfdt/libfdt'], +-- +Armbian +