Skip to contentSkip to conversation

diffoscope: upgrade 175 -> 177

PATCH New wangmy 1 participant 2 messages Jun 10, 2021

lore
Share & tools
lore

wangmy

author
#0 lore raw

PATCH 1/1 diffoscope: upgrade 175 -> 177

---
 .../diffoscope/{diffoscope_175.bb => diffoscope_177.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/diffoscope/{diffoscope_175.bb => diffoscope_177.bb} (92%)
meta/recipes-support/diffoscope/diffoscope_177.bb renamed from meta/recipes-support/diffoscope/diffoscope_175.bb +1 -1
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_175.bb
rename to meta/recipes-support/diffoscope/diffoscope_177.bb
index 853f8dd3a0..0d9061dda0 100644
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "b87481752815140e35088647ccdea13297e41a2d72772e842590360b662f7533"
+SRC_URI[sha256sum] = "8ac0cad150914bab2a53caa3f21876a78b092f3d2a36b9134874cd5c04a26b2e"
 
 RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/1 dtc: upgrade 1.6.0 -> 1.6.1

0001-fdtdump-Fix-gcc11-warning.patch
removed since it is included in 1.6.1

---
 .../dtc/0001-fdtdump-Fix-gcc11-warning.patch  | 35 -------------------
 .../dtc/{dtc_1.6.0.bb => dtc_1.6.1.bb}        |  4 +--
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch
 rename meta/recipes-kernel/dtc/{dtc_1.6.0.bb => dtc_1.6.1.bb} (68%)
meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch deleted +0 -35
deleted file mode 100644
index ec825cbf7b..0000000000
@@ -1,35 +0,0 @@
-From 4827e0db6c4f7dea7f4094f49d3bb48ef6dfdc2d Mon Sep 17 00:00:00 2001
-From: David Gibson <[email protected]>
-Date: Wed, 6 Jan 2021 14:52:26 +1100
-Subject: [PATCH] fdtdump: Fix gcc11 warning
-
-In one place, fdtdump abuses fdt_set_magic(), passing it just a small char
-array instead of the full fdt header it expects.  That's relying on the
-fact that in fact fdt_set_magic() will only actually access the first 4
-bytes of the buffer.
-
-This trips a new warning in GCC 11 - and it's entirely possible it was
-always UB.  So, don't do that.
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=ca16a723fa9dde9c5da80dba567f48715000e77c]
-Signed-off-by: David Gibson <[email protected]>
----
- fdtdump.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fdtdump.c b/fdtdump.c
-index 9613bef..d9fb374 100644
---- a/fdtdump.c
-+++ b/fdtdump.c
-@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
- 		char *p = buf;
- 		char *endp = buf + len;
- 
--		fdt_set_magic(smagic, FDT_MAGIC);
-+		fdt32_st(smagic, FDT_MAGIC);
- 
- 		/* poor man's memmem */
- 		while ((endp - p) >= FDT_MAGIC_SIZE) {
--- 
-2.30.1
-
meta/recipes-kernel/dtc/dtc_1.6.1.bb renamed from meta/recipes-kernel/dtc/dtc_1.6.0.bb +1 -3
similarity index 68%
rename from meta/recipes-kernel/dtc/dtc_1.6.0.bb
rename to meta/recipes-kernel/dtc/dtc_1.6.1.bb
index a407137859..de9a46d3ef 100644
@@ -3,9 +3,7 @@ require dtc.inc
 LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 		    file://libfdt/libfdt.h;beginline=4;endline=7;md5=05bb357cfb75cae7d2b01d2ee8d76407"
 
-SRCREV = "2525da3dba9beceb96651dc2986581871dbeca30"
-
-SRC_URI += "file://0001-fdtdump-Fix-gcc11-warning.patch"
+SRCREV = "b6910bec11614980a21e46fbccc35934b671bd81"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.25.1