The 0001-Do-not-include-sysctrl.h-with-glibc.patch is no longer needed, and is thus removed. The 0001-bitbang-Make-bitbang_swd-extern-definition.patch was fixed upstream in c60252ac2b636c4d99b766a574b9df0966151696 and is thus removed.
Signed-off-by: Marc Reilly <[email protected]> --- ...-Do-not-include-syscrtl.h-with-glibc.patch | 33 --------------- ...g-Make-bitbang_swd-extern-definition.patch | 42 ------------------- .../recipes-devtools/openocd/openocd_git.bb | 8 ++-- 3 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-Do-not-include-syscrtl.h-with-glibc.patch delete mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Do-not-include-syscrtl.h-with-glibc.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Do-not-include-syscrtl.h-with-glibc.patch deleted file mode 100644 index 618ce2689..000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0001-Do-not-include-syscrtl.h-with-glibc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a763610719e7d7f6cdc45569b6fbfdb91bb7c87b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 27 Jul 2019 14:30:08 -0700 -Subject: [PATCH] Do not include syscrtl.h with glibc - -glibc 2.30 has deprecated it see [1] -Fixes -sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and will be removed." [-Werror,-W#warnings] - -[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - src/helper/options.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/helper/options.c b/src/helper/options.c -index 12755e010..4007e37f6 100644 ---- a/src/helper/options.c -+++ b/src/helper/options.c -@@ -34,7 +34,7 @@ - #if IS_DARWIN - #include <libproc.h> - #endif --#ifdef HAVE_SYS_SYSCTL_H -+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) - #include <sys/sysctl.h> - #endif - #if IS_WIN32 && !IS_CYGWIN --- -2.22.0 - diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch deleted file mode 100644 index d42b628da..000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 428f9f3c4a5be973e4c7fc1325ae9dbe41040df2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 13 Aug 2020 17:47:35 -0700 -Subject: [PATCH] bitbang: Make bitbang_swd extern definition - -Fixes build with gcc10+ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - src/jtag/drivers/bitbang.c | 1 + - src/jtag/drivers/bitbang.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/bitbang.c b/src/jtag/drivers/bitbang.c -index b5078c080..f8612aade 100644 ---- a/src/jtag/drivers/bitbang.c -+++ b/src/jtag/drivers/bitbang.c -@@ -43,6 +43,7 @@ static int bitbang_stableclocks(int num_cycles); - static void bitbang_swd_write_reg(uint8_t cmd, uint32_t value, uint32_t ap_delay_clk); - - struct bitbang_interface *bitbang_interface; -+const struct swd_driver bitbang_swd; - - /* DANGER!!!! clock absolutely *MUST* be 0 in idle or reset won't work! - * -diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h -index 577717ebd..0faf5d9ae 100644 ---- a/src/jtag/drivers/bitbang.h -+++ b/src/jtag/drivers/bitbang.h -@@ -57,7 +57,7 @@ struct bitbang_interface { - void (*swdio_drive)(bool on); - }; - --const struct swd_driver bitbang_swd; -+extern const struct swd_driver bitbang_swd; - - extern bool swd_mode; - --- -2.28.0 - diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index c7d754fdb..4f6aaa8a6 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,15 +9,13 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ - file://0001-Do-not-include-syscrtl.h-with-glibc.patch \ - file://0001-bitbang-Make-bitbang_swd-extern-definition.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "ded67990255cc1e63c77832ffd6e6bef9120873d" +SRCREV_openocd = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" -SRCREV_jimtcl = "dc4ba7770d580800634f90b67a24e077b4a26d98" -SRCREV_libjaylink = "3322dfa5e7aa56f5b12b7f2197e3e6b850b7b66e" +SRCREV_jimtcl = "0aa0fb4e3a38d38a49de9eb585d93d63a370dcf6" +SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" PV = "0.10+gitr${SRCPV}" S = "${WORKDIR}/git" -- 2.26.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#86660): https://lists.openembedded.org/g/openembedded-devel/message/86660 Mute This Topic: https://lists.openembedded.org/mt/76462819/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
