summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-10-13 10:26:42 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2024-11-11 20:25:55 +0100
commitb25d3af826ad3b3031ea9f14502a0b1a0c71f0ea (patch)
treef761786f06d985fd865ed77aeb722796817f21c1 /sys-apps/dtc/files
parentsys-libs/efivar: drop 38 (diff)
downloadgentoo-b25d3af826ad3b3031ea9f14502a0b1a0c71f0ea.tar.gz
gentoo-b25d3af826ad3b3031ea9f14502a0b1a0c71f0ea.tar.bz2
gentoo-b25d3af826ad3b3031ea9f14502a0b1a0c71f0ea.zip
sys-apps/dtc: drop 1.6.0, 1.7.0
Closes: https://bugs.gentoo.org/940100 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sys-apps/dtc/files')
-rw-r--r--sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch39
-rw-r--r--sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch27
-rw-r--r--sys-apps/dtc/files/fix-tests-for-Python3.12.patch43
3 files changed, 0 insertions, 109 deletions
diff --git a/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch b/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch
deleted file mode 100644
index 473cd9a29e1a..000000000000
--- a/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=71a8b8ef0adf01af4c78c739e04533a35c1dc89c
-
-From 71a8b8ef0adf01af4c78c739e04533a35c1dc89c Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Wed, 31 May 2023 11:41:42 -0300
-Subject: libfdt: meson: Fix linking on macOS linker
-
--undefined error is the equivalent of --no-undefined for the macOS
-linker, but -undefined would also be understood as a valid argument for
-GNU ld so we use the supported linker variant.
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---- a/libfdt/meson.build
-+++ b/libfdt/meson.build
-@@ -16,10 +16,20 @@ sources = files(
- 'fdt_wip.c',
- )
-
-+link_args = []
-+if cc.has_link_argument('-Wl,--no-undefined')
-+ link_args += '-Wl,--no-undefined'
-+else
-+ # -undefined error is the equivalent of --no-undefined for the macOS linker,
-+ # but -undefined would also be understood as a valid argument for GNU ld!
-+ link_args += cc.get_supported_link_arguments('-Wl,-undefined,error')
-+endif
-+
-+link_args += version_script
- libfdt = library(
- 'fdt', sources,
- version: '1.6.0',
-- link_args: ['-Wl,--no-undefined', version_script],
-+ link_args: link_args,
- link_depends: 'version.lds',
- install: true,
- )
---
-cgit
diff --git a/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch b/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch
deleted file mode 100644
index 0bc2d71aea1c..000000000000
--- a/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=32174a66efa4ad19fc6a2a6422e4af2ae4f055cb
-
-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: 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>
---- 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
---
-cgit
diff --git a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
deleted file mode 100644
index 7a08648f3835..000000000000
--- a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Python3.12 causes breakage for get_mem_rsv in pylibfdt.
-
- Author: Héctor Orón Martínez <zumbi@debian.org>
-
----
-
-Bug: https://github.com/dgibson/dtc/issues/123
-Bug-Debian: https://bugs.debian.org/1061318
-Bug-Ubuntu: https://launchpad.net/bugs/2051399
-Last-Update: 2024-01-30
-
---- device-tree-compiler-1.7.0.orig/tests/pylibfdt_tests.py
-+++ device-tree-compiler-1.7.0/tests/pylibfdt_tests.py
-@@ -418,9 +418,14 @@ class PyLibfdtBasicTests(unittest.TestCa
- def testReserveMap(self):
- """Test that we can access the memory reserve map"""
- self.assertEqual(2, self.fdt.num_mem_rsv())
-- self.assertEqual([ 0xdeadbeef00000000, 0x100000],
-- self.fdt.get_mem_rsv(0))
-- self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
-+ if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
-+ self.assertEqual([0, 0xdeadbeef00000000, 0x100000],
-+ self.fdt.get_mem_rsv(0))
-+ self.assertEqual([0, 123456789, 0o10000], self.fdt.get_mem_rsv(1))
-+ else:
-+ self.assertEqual([0xdeadbeef00000000, 0x100000],
-+ self.fdt.get_mem_rsv(0))
-+ self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
-
- def testEmpty(self):
- """Test that we can create an empty tree"""
-@@ -615,7 +620,10 @@ class PyLibfdtSwTests(unittest.TestCase)
-
- fdt = sw.as_fdt()
- self.assertEqual(2, fdt.num_mem_rsv())
-- self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
-+ if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
-+ self.assertEqual([0, TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
-+ else:
-+ self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
-
- # Make sure we can add a few more things
- with sw.add_node('another'):