Selaa lähdekoodia

Remove cpio patch 0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch

Remove the cpio CRC patch and .bbappend to fix error applying the same
patch twice.

Stefano's cpio patch has been duplicated and applied to the Yocto
poky/meta layer (master branch)  with this commit:

    commit c9f2486c527596a0c2657538a32de3fc3d43fe79
    Author: Marek Vasut <marex@denx.de>
    Date:   Wed Apr 5 23:33:58 2023 +0200

    cpio: Fix wrong CRC with ASCII CRC for large files

    Due to signedness, the checksum is not computed when filesize is bigger
    a 2GB. Pick a fix for this problem from CPIO ML, where the fix has been
    posted for 5 years. Since CPIO upstream is effectively unresponsive and
    any and all attempts to communicate with the maintainer and get the fix
    applied upstream failed, add the fix here instead.

    (From OE-Core rev: bfff138af4bdd356ac66571e6ad91c1a5599b935)

    Signed-off-by: Marek Vasut <marex@denx.de>
    Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Builds that include meta-swupdate have this error:

    ERROR: cpio-native-2.13-r0 do_patch: Applying patch '0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch'
    ... Patch 0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch is already applied; check your series file

Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com>
Geoff Parker 2 vuotta sitten
vanhempi
commit
2073a7e398

+ 0 - 4
recipes-extended/cpio/cpio_%.bbappend

@@ -1,4 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch"
-

+ 0 - 38
recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch

@@ -1,38 +0,0 @@
-From 77ff5f1be394eb2c786df561ff37dde7f982ec76 Mon Sep 17 00:00:00 2001
-From: Stefano Babic <sbabic@denx.de>
-Date: Fri, 28 Jul 2017 13:20:52 +0200
-Subject: [PATCH] Wrong CRC with ASCII CRC for large files
-
-Due to signedness, the checksum is not computed when filesize is bigger
-a 2GB.
-
-Signed-off-by: Stefano Babic <sbabic@denx.de>
----
- src/copyout.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/copyout.c b/src/copyout.c
-index 1f0987a..727aeca 100644
---- a/src/copyout.c
-+++ b/src/copyout.c
-@@ -34,13 +34,13 @@
-    compute and return a checksum for them.  */
- 
- static uint32_t
--read_for_checksum (int in_file_des, int file_size, char *file_name)
-+read_for_checksum (int in_file_des, unsigned int file_size, char *file_name)
- {
-   uint32_t crc;
-   char buf[BUFSIZ];
--  int bytes_left;
--  int bytes_read;
--  int i;
-+  unsigned int bytes_left;
-+  unsigned int bytes_read;
-+  unsigned int i;
- 
-   crc = 0;
- 
--- 
-2.7.4
-