[PATCH 1/2] diffoscope: Upgrade 178 -> 179

[PATCH 1/2] diffoscope: Upgrade 178 -> 179

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../diffoscope/{diffoscope_178.bb => diffoscope_179.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/diffoscope/{diffoscope_178.bb => diffoscope_179.bb} (92%)

diff --git a/meta/recipes-support/diffoscope/diffoscope_178.bb b/meta/recipes-support/diffoscope/diffoscope_179.bb
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_178.bb
rename to meta/recipes-support/diffoscope/diffoscope_179.bb
index 7d685210b7c..dcd2698ee51 100644
--- a/meta/recipes-support/diffoscope/diffoscope_178.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_179.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137"
+SRC_URI[sha256sum] = "17790d463b757b6d05e0734db06ba5e79ac63fb64bf9b834dc7440477582a38a"
 
 RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
 
-- 
2.30.2

[PATCH 2/2] strace: Upgrade 5.12 -> 5.13

[Richard Purdie]

This includes changes to work with glibc 2.34.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../strace/strace/Makefile-ptest.patch                 | 10 +++++-----
 .../strace/{strace_5.12.bb => strace_5.13.bb}          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-devtools/strace/{strace_5.12.bb => strace_5.13.bb} (96%)

diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index 4cef0c0127f..9af77376626 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -1,4 +1,4 @@
-From 205e7661822987825c7149ada4eefdc5368828ce Mon Sep 17 00:00:00 2001
+From 1f50e0a09d828be8f5b1f28db9af0b12492a1553 Mon Sep 17 00:00:00 2001
 From: Gabriel Barbu <gabriel.barbu@enea.com>
 Date: Thu, 25 Jul 2013 15:28:33 +0200
 Subject: [PATCH] strace: Add ptest
@@ -14,7 +14,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index b8efce8..fa9a1af 100644
+index 55566ee..a7ae6f9 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
 @@ -16,6 +16,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -23,9 +23,9 @@ index b8efce8..fa9a1af 100644
  ARCH_MFLAGS =
 +TEST_SUITE_LOG = test-suite.log
  AM_CFLAGS = $(WARN_CFLAGS)
- AM_CPPFLAGS = $(ARCH_MFLAGS) \
- 	      -I$(builddir) \
-@@ -692,3 +693,22 @@ BUILT_SOURCES = ksysent.h
+ bundled_CPPFLAGS =
+ if USE_BUNDLED_HEADERS
+@@ -703,3 +704,22 @@ BUILT_SOURCES = ksysent.h
  CLEANFILES = ksysent.h
  
  include ../src/scno.am
diff --git a/meta/recipes-devtools/strace/strace_5.12.bb b/meta/recipes-devtools/strace/strace_5.13.bb
similarity index 96%
rename from meta/recipes-devtools/strace/strace_5.12.bb
rename to meta/recipes-devtools/strace/strace_5.13.bb
index 24021f866d8..7d93f2da98d 100644
--- a/meta/recipes-devtools/strace/strace_5.12.bb
+++ b/meta/recipes-devtools/strace/strace_5.13.bb
@@ -15,7 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://uintptr_t.patch \
            file://0001-strace-fix-reproducibilty-issues.patch \
            "
-SRC_URI[sha256sum] = "29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4"
+SRC_URI[sha256sum] = "5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656"
 
 inherit autotools ptest
 
-- 
2.30.2