M gnu/local.mk => gnu/local.mk +0 -1
@@ 1206,7 1206,6 @@ dist_patch_DATA = \
%D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
%D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \
%D%/packages/patches/dstat-skip-devices-without-io.patch \
- %D%/packages/patches/dtc-meson-cell-overflow.patch \
%D%/packages/patches/duc-fix-test-sh.patch \
%D%/packages/patches/dune-common-skip-failing-tests.patch \
%D%/packages/patches/durden-shadow-arcan.patch \
M gnu/packages/bootloaders.scm => gnu/packages/bootloaders.scm +2 -4
@@ 684,7 684,7 @@ The SUBDIR argument defaults to \"efi/Guix\", as it is also the case for
(define-public dtc
(package
(name "dtc")
- (version "1.7.0")
+ (version "1.7.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ 692,9 692,7 @@ The SUBDIR argument defaults to \"efi/Guix\", as it is also the case for
"dtc-" version ".tar.gz"))
(sha256
(base32
- "0cij9399snpn672pdbda8qbxljdkfg068kvv3g5811rz6yslx124"))
- (patches
- (search-patches "dtc-meson-cell-overflow.patch"))))
+ "1x609axqpkw5d47pz3ag34ycy3w7y1d0i8q4715hvlmgszmya07j"))))
(build-system meson-build-system)
(arguments
(list
D gnu/packages/patches/dtc-meson-cell-overflow.patch => gnu/packages/patches/dtc-meson-cell-overflow.patch +0 -32
@@ 1,32 0,0 @@
-Taken from upstream:
-https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?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: [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