python3 rebuild

2023-11-03 17:32:56 +03:00
parent b2ef403227
commit 1ae8b0f41f
5 changed files with 99 additions and 0 deletions
@@ -0,0 +1,29 @@
+From 32174a66efa4ad19fc6a2a6422e4af2ae4f055cb Mon Sep 17 00:00:00 2001
+From: David Gibson <david@gibson.dropbear.id.au>
+Date: Tue, 28 Feb 2023 10:33:58 +1100
+Subject: [PATCH] meson: Fix cell overflow tests when running from meson
+
+Because meson always builds out-of-tree we need to reference things in the
+original source tree via $SRCDIR from run_tests.sh.  We forgot a couple of
+cases for the cell overflow tests.  Fix them.
+
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ tests/run_tests.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/run_tests.sh b/tests/run_tests.sh
+index 91350ad3..f899d8cb 100755
+--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
+@@ -519,8 +519,8 @@ libfdt_tests () {
+     check_tests "$SRCDIR/phandle-args-overflow.dts" clocks_property
+ 
+     ## https://github.com/dgibson/dtc/issues/74
+-    run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb cell-overflow-results.dts
+-    run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb cell-overflow.dts
+    run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb "$SRCDIR/cell-overflow-results.dts"
+    run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb "$SRCDIR/cell-overflow.dts"
+     run_test dtbs_equal_ordered cell-overflow.test.dtb cell-overflow-results.test.dtb
+ 
+     # check full tests
@@ -0,0 +1,23 @@
+From 64a907f08b9bedd89833c1eee674148cff2343c6 Mon Sep 17 00:00:00 2001
+From: Nikolay Letov <letov.nikolay@gmail.com>
+Date: Wed, 22 Feb 2023 13:36:07 +0300
+Subject: [PATCH] meson.build: bump version to 1.7.0
+
+[This was botched in the actual 1.7.0 release :( - David Gibson]
+
+Signed-off-by: Nikolay Letov <letov.nikolay@gmail.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index f50cf1e6..b2c53b96 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1,5 +1,5 @@
+ project('dtc', 'c',
+-  version: '1.6.0',
+  version: '1.7.0',
+   license: ['GPL2+', 'BSD-2'],
+   default_options: 'werror=true',
+ )
@@ -0,0 +1,23 @@
+From 723545ebe9933b90ea58dc125e4987c6bcb04ade Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date: Tue, 2 May 2023 13:34:24 -0700
+Subject: [PATCH] Fix version in libfdt/meson.build
+
+Currently meson generates file /usr/lib/libfdt.so.1.6.0 that does not match Makefile build version.
+---
+ libfdt/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libfdt/meson.build b/libfdt/meson.build
+index 240bdf41..240dab9e 100644
+--- a/libfdt/meson.build
+++ b/libfdt/meson.build
+@@ -18,7 +18,7 @@ sources = files(
+ 
+ libfdt = library(
+   'fdt', sources,
+-  version: '1.6.0',
+  version: '1.7.0',
+   link_args: ['-Wl,--no-undefined', version_script],
+   link_depends: 'version.lds',
+   install: true,
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index e82a832..da01efd 100755
+--- a/setup.py
+++ b/setup.py
+@@ -49,11 +49,8 @@ class build_py(_build_py):
+ 
+ setup(
+     name='libfdt',
+-    use_scm_version={
+-        "root": srcdir,
+-    },
+     cmdclass = {'build_py' : build_py},
+-    setup_requires = ['setuptools_scm'],
+    version="@VERSION@",
+     author='Simon Glass',
+     author_email='sjg@chromium.org',
+     description='Python binding for libfdt',
+
@@ -20,6 +20,12 @@
            <Dependency>python3-devel</Dependency>
            <Dependency>valgrind-devel</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch level="1">32174a.patch</Patch>
+            <Patch level="1">64a907.patch</Patch>
+            <Patch level="1">95.patch</Patch>
+            <Patch level="1">pyscm.patch</Patch>
+        </Patches>
    </Source>

    <Package>