From: Alexander Kanavin <[email protected]> Remove 0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch as the issues were fixed upstream.
Signed-off-by: Alexander Kanavin <[email protected]> --- .../{debugedit_5.0.bb => debugedit_5.1.bb} | 8 +-- ...ugcrcfix.c-do-not-use-64bit-variants.patch | 56 ------------------- ...003-Makefile.am-do-not-update-manual.patch | 13 ++--- 3 files changed, 9 insertions(+), 68 deletions(-) rename meta/recipes-devtools/debugedit/{debugedit_5.0.bb => debugedit_5.1.bb} (82%) delete mode 100644 meta/recipes-devtools/debugedit/files/0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch diff --git a/meta/recipes-devtools/debugedit/debugedit_5.0.bb b/meta/recipes-devtools/debugedit/debugedit_5.1.bb similarity index 82% rename from meta/recipes-devtools/debugedit/debugedit_5.0.bb rename to meta/recipes-devtools/debugedit/debugedit_5.1.bb index 63ad7babd9a..5dc103f6438 100644 --- a/meta/recipes-devtools/debugedit/debugedit_5.0.bb +++ b/meta/recipes-devtools/debugedit/debugedit_5.1.bb @@ -9,16 +9,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "https://sourceware.org/ftp/debugedit/${PV}/debugedit-${PV}.tar.xz"; +SRC_URI = "https://sourceware.org/ftp/debugedit/${PV}/debugedit-${PV}.tar.xz \ + " SRC_URI:append:libc-musl = "\ - file://0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch \ file://0003-Makefile.am-do-not-update-manual.patch \ " -SRC_URI[sha256sum] = "e9ecd7d350bebae1f178ce6776ca19a648b6fe8fa22f5b3044b38d7899aa553e" +SRC_URI[sha256sum] = "ee9b688b2ed8fa62551c54cb5dc31aaa05853e7dedbd9e1237c77894ea5e3626" -DEPENDS = "elfutils" +DEPENDS = "elfutils xxhash" DEPENDS:append:libc-musl = " musl-legacy-error" inherit pkgconfig autotools diff --git a/meta/recipes-devtools/debugedit/files/0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch b/meta/recipes-devtools/debugedit/files/0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch deleted file mode 100644 index 4463bd2324a..00000000000 --- a/meta/recipes-devtools/debugedit/files/0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 3e05bbc1f7909ab6f529e66f0d0f70fb1e60583a Mon Sep 17 00:00:00 2001 -From: Chen Qi <[email protected]> -Date: Thu, 23 Mar 2023 11:55:53 +0800 -Subject: [PATCH 2/2] sepdebugcrcfix.c: do not use 64bit variants - -configure.ac checks for largefile support via AC_SYS_LARGEFILE -already, therefore use off_t, open and lseek instead of 64bit -variants. Musl e.g. does not define them without _LARGEFILE64_SOURCE -and error is not seen on glibc because _GNU_SOURCE defines -_LARGEFILE64_SOURCE. - -This patch is marked as inappropriate as debugedit obviously only -wants to support glibc or some glibc compatible libcs. We can see -this from the error() usage. And this patch is only for musl. - -Upstream-Status: Inappropriate [OE Specific] - -Signed-off-by: Chen Qi <[email protected]> ---- - tools/sepdebugcrcfix.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c -index c4a9d56..882e5f5 100644 ---- a/tools/sepdebugcrcfix.c -+++ b/tools/sepdebugcrcfix.c -@@ -144,7 +144,7 @@ crc32 (const char *fname, const char *base_fname, uint32_t *crcp) - error (0, errno, _("cannot open \"%s\""), debugname); - return false; - } -- off64_t size = lseek64 (fd, 0, SEEK_END); -+ off_t size = lseek (fd, 0, SEEK_END); - if (size == -1) - { - error (0, errno, _("cannot get size of \"%s\""), debugname); -@@ -289,7 +289,7 @@ process (Elf *elf, int fd, const char *fname) - return true; - } - updated_count++; -- off64_t seekto = (shdr->sh_offset + data->d_off -+ off_t seekto = (shdr->sh_offset + data->d_off - + (crcp - (const uint8_t *) data->d_buf)); - uint32_t crc_targetendian = (ehdr->e_ident[EI_DATA] == ELFDATA2LSB - ? htole32 (crc) : htobe32 (crc)); -@@ -361,7 +361,7 @@ main (int argc, char **argv) - error (0, errno, _("cannot chmod \"%s\" to make sure we can read and write"), fname); - - bool failed = false; -- int fd = open64 (fname, O_RDWR); -+ int fd = open (fname, O_RDWR); - if (fd == -1) - { - error (0, errno, _("cannot open \"%s\""), fname); --- -2.17.1 - diff --git a/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch b/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch index de467f5365c..d0414f739a7 100644 --- a/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch +++ b/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch @@ -1,7 +1,7 @@ -From 4f0d7d2f4900ce8555e09854dc681278b7a3d9a9 Mon Sep 17 00:00:00 2001 +From b2715c3f4d28fab1c238086d9b5435e269b06301 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 23 Mar 2023 13:09:23 +0800 -Subject: [PATCH 3/3] Makefile.am: do not update manual +Subject: [PATCH] Makefile.am: do not update manual The tarball ships these manuals, no need to re-generate them. We have local patches for debugedit.c and sepdebugcrcfix.c, @@ -20,7 +20,7 @@ Signed-off-by: Chen Qi <[email protected]> 1 file changed, 30 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 98b2f20..f91deea 100644 +index c590edf..692e016 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,36 +52,6 @@ sepdebugcrcfix_LDADD = @LIBELF_LIBS@ @@ -58,8 +58,5 @@ index 98b2f20..f91deea 100644 - esac - noinst_HEADERS= tools/ansidecl.h \ - tools/hashtab.h \ - tools/md5.h \ --- -2.17.1 - + tools/hashtab.h + -- 2.39.5
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#208238): https://lists.openembedded.org/g/openembedded-core/message/208238 Mute This Topic: https://lists.openembedded.org/mt/109915739/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
