| Message ID | 20230531145220.2752344-1-gauthier.dewulf@momagroup.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [meta-swupdate] Removing cpio patch (now applied directly in poky, having a conflict) | expand |
Hi Gauthier, On 31.05.23 16:52, gdf wrote: > Signed-off-by: gdf <gauthier.dewulf@momagroup.com> > --- > recipes-extended/cpio/cpio_%.bbappend | 4 -- > ...g-CRC-with-ASCII-CRC-for-large-files.patch | 38 ------------------- > 2 files changed, 42 deletions(-) > delete mode 100644 recipes-extended/cpio/cpio_%.bbappend > delete mode 100644 recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > > diff --git a/recipes-extended/cpio/cpio_%.bbappend b/recipes-extended/cpio/cpio_%.bbappend > deleted file mode 100644 > index 421d6b1..0000000 > --- a/recipes-extended/cpio/cpio_%.bbappend > +++ /dev/null > @@ -1,4 +0,0 @@ > -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" > - > -SRC_URI += "file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch" > - > diff --git a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch b/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > deleted file mode 100644 > index c973dc6..0000000 > --- a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > +++ /dev/null > @@ -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 > - I already removed this some times ago, and it is not present anymore on a supported branches. I do not know where you see it is still present. Best regards, Stefano Babic
Hi Stefano, it is stil present on langdale branch as you can see here : https://github.com/sbabic/meta-swupdate/tree/langdale/recipes-extended/cpio Regards, Gauthier Dewulf Le 31/05/2023 à 17:05, Stefano Babic a écrit : > Hi Gauthier, > > On 31.05.23 16:52, gdf wrote: >> Signed-off-by: gdf <gauthier.dewulf@momagroup.com> >> --- >> recipes-extended/cpio/cpio_%.bbappend | 4 -- >> ...g-CRC-with-ASCII-CRC-for-large-files.patch | 38 ------------------- >> 2 files changed, 42 deletions(-) >> delete mode 100644 recipes-extended/cpio/cpio_%.bbappend >> delete mode 100644 >> recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >> >> diff --git a/recipes-extended/cpio/cpio_%.bbappend >> b/recipes-extended/cpio/cpio_%.bbappend >> deleted file mode 100644 >> index 421d6b1..0000000 >> --- a/recipes-extended/cpio/cpio_%.bbappend >> +++ /dev/null >> @@ -1,4 +0,0 @@ >> -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" >> - >> -SRC_URI += "file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch" >> - >> diff --git >> a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >> b/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >> >> deleted file mode 100644 >> index c973dc6..0000000 >> --- >> a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >> +++ /dev/null >> @@ -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 >> - > > I already removed this some times ago, and it is not present anymore > on a supported branches. I do not know where you see it is still present. > > Best regards, > Stefano Babic >
Hi Gauthier, On 31.05.23 17:12, Gauthier Dewulf wrote: > Hi Stefano, it is stil present on langdale branch as you can see here : > https://github.com/sbabic/meta-swupdate/tree/langdale/recipes-extended/cpio > ...but langdale has reached its EOL according ro Yocto's releases. Anyway, I aligned langdale to the other branches and I removed the conflict. But do not expect further commits on langdale, it will be considered (like in poky) discontinued. Best regards, Stefano Babic > Regards, > > Gauthier Dewulf > > Le 31/05/2023 à 17:05, Stefano Babic a écrit : >> Hi Gauthier, >> >> On 31.05.23 16:52, gdf wrote: >>> Signed-off-by: gdf <gauthier.dewulf@momagroup.com> >>> --- >>> recipes-extended/cpio/cpio_%.bbappend | 4 -- >>> ...g-CRC-with-ASCII-CRC-for-large-files.patch | 38 ------------------- >>> 2 files changed, 42 deletions(-) >>> delete mode 100644 recipes-extended/cpio/cpio_%.bbappend >>> delete mode 100644 >>> recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >>> >>> diff --git a/recipes-extended/cpio/cpio_%.bbappend >>> b/recipes-extended/cpio/cpio_%.bbappend >>> deleted file mode 100644 >>> index 421d6b1..0000000 >>> --- a/recipes-extended/cpio/cpio_%.bbappend >>> +++ /dev/null >>> @@ -1,4 +0,0 @@ >>> -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" >>> - >>> -SRC_URI += "file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch" >>> - >>> diff --git >>> a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch b/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >>> deleted file mode 100644 >>> index c973dc6..0000000 >>> --- >>> a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >>> +++ /dev/null >>> @@ -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 >>> - >> >> I already removed this some times ago, and it is not present anymore >> on a supported branches. I do not know where you see it is still present. >> >> Best regards, >> Stefano Babic >> >
Indeed I didn't see it was discontinued this month, thank you ! Regards, Gauthier Dewulf Le 31/05/2023 à 17:17, Stefano Babic a écrit : > Hi Gauthier, > > On 31.05.23 17:12, Gauthier Dewulf wrote: >> Hi Stefano, it is stil present on langdale branch as you can see here >> : >> https://github.com/sbabic/meta-swupdate/tree/langdale/recipes-extended/cpio >> > > ...but langdale has reached its EOL according ro Yocto's releases. > Anyway, I aligned langdale to the other branches and I removed the > conflict. But do not expect further commits on langdale, it will be > considered (like in poky) discontinued. > > Best regards, > Stefano Babic > >> Regards, >> >> Gauthier Dewulf >> >> Le 31/05/2023 à 17:05, Stefano Babic a écrit : >>> Hi Gauthier, >>> >>> On 31.05.23 16:52, gdf wrote: >>>> Signed-off-by: gdf <gauthier.dewulf@momagroup.com> >>>> --- >>>> recipes-extended/cpio/cpio_%.bbappend | 4 -- >>>> ...g-CRC-with-ASCII-CRC-for-large-files.patch | 38 >>>> ------------------- >>>> 2 files changed, 42 deletions(-) >>>> delete mode 100644 recipes-extended/cpio/cpio_%.bbappend >>>> delete mode 100644 >>>> recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >>>> >>>> diff --git a/recipes-extended/cpio/cpio_%.bbappend >>>> b/recipes-extended/cpio/cpio_%.bbappend >>>> deleted file mode 100644 >>>> index 421d6b1..0000000 >>>> --- a/recipes-extended/cpio/cpio_%.bbappend >>>> +++ /dev/null >>>> @@ -1,4 +0,0 @@ >>>> -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" >>>> - >>>> -SRC_URI += >>>> "file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch" >>>> - >>>> diff --git >>>> a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >>>> b/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >>>> >>>> deleted file mode 100644 >>>> index c973dc6..0000000 >>>> --- >>>> a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch >>>> +++ /dev/null >>>> @@ -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 >>>> - >>> >>> I already removed this some times ago, and it is not present anymore >>> on a supported branches. I do not know where you see it is still >>> present. >>> >>> Best regards, >>> Stefano Babic >>> >> >
Hi Stefano, I just noticed that you also applied my patch to remove the cpio patch from meta-swupdate kirkstone branch on May 19. It looks like a9ab7e077a1dfc85cf2782f20e8b6016009d5345 should be reverted on the kirkstone branch because there is no duplicate patch in poky/meta/recipes-extended/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch as there was in poky master and mickledore. On Wednesday, May 31, 2023 at 8:28:27 AM UTC-7 Gauthier Dewulf wrote: > Indeed I didn't see it was discontinued this month, thank you ! > > Regards, > > Gauthier Dewulf > > Le 31/05/2023 à 17:17, Stefano Babic a écrit : > > Hi Gauthier, > > > > On 31.05.23 17:12, Gauthier Dewulf wrote: > >> Hi Stefano, it is stil present on langdale branch as you can see here > >> : > >> > https://github.com/sbabic/meta-swupdate/tree/langdale/recipes-extended/cpio > >> > > > > ...but langdale has reached its EOL according ro Yocto's releases. > > Anyway, I aligned langdale to the other branches and I removed the > > conflict. But do not expect further commits on langdale, it will be > > considered (like in poky) discontinued. > > > > Best regards, > > Stefano Babic > > > >> Regards, > >> > >> Gauthier Dewulf > >> > >> Le 31/05/2023 à 17:05, Stefano Babic a écrit : > >>> Hi Gauthier, > >>> > >>> On 31.05.23 16:52, gdf wrote: > >>>> Signed-off-by: gdf <gauthie...@momagroup.com> > >>>> --- > >>>> recipes-extended/cpio/cpio_%.bbappend | 4 -- > >>>> ...g-CRC-with-ASCII-CRC-for-large-files.patch | 38 > >>>> ------------------- > >>>> 2 files changed, 42 deletions(-) > >>>> delete mode 100644 recipes-extended/cpio/cpio_%.bbappend > >>>> delete mode 100644 > >>>> > recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > >>>> > >>>> diff --git a/recipes-extended/cpio/cpio_%.bbappend > >>>> b/recipes-extended/cpio/cpio_%.bbappend > >>>> deleted file mode 100644 > >>>> index 421d6b1..0000000 > >>>> --- a/recipes-extended/cpio/cpio_%.bbappend > >>>> +++ /dev/null > >>>> @@ -1,4 +0,0 @@ > >>>> -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" > >>>> - > >>>> -SRC_URI += > >>>> "file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch" > >>>> - > >>>> diff --git > >>>> > a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > > >>>> > b/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > > >>>> > >>>> deleted file mode 100644 > >>>> index c973dc6..0000000 > >>>> --- > >>>> > a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > >>>> +++ /dev/null > >>>> @@ -1,38 +0,0 @@ > >>>> -From 77ff5f1be394eb2c786df561ff37dde7f982ec76 Mon Sep 17 00:00:00 > >>>> 2001 > >>>> -From: Stefano Babic <sba...@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 <sba...@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 > >>>> - > >>> > >>> I already removed this some times ago, and it is not present anymore > >>> on a supported branches. I do not know where you see it is still > >>> present. > >>> > >>> Best regards, > >>> Stefano Babic > >>> > >> > > >
Hi Geoff, On 07.06.23 08:55, Geoff Parker wrote: > Hi Stefano, > > I just noticed that you also applied my patch to remove the cpio patch > from meta-swupdate kirkstone branch on May 19. It looks > like a9ab7e077a1dfc85cf2782f20e8b6016009d5345 should be reverted on the > kirkstone branch because there is no duplicate patch in > poky/meta/recipes-extended/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch as there was in poky master and mickledore. > We are looking to different things. I checked that the patch was integrated in all poky branches, started from dunfell. And it was even applied to langdale, as you see from the mail a few days ago. Checking poky in kirkstone, commit 1e6f147, patch was merged with commit 971da348. There is no need to revert. Best regards, Stefano Babic > On Wednesday, May 31, 2023 at 8:28:27 AM UTC-7 Gauthier Dewulf wrote: > > Indeed I didn't see it was discontinued this month, thank you ! > > Regards, > > Gauthier Dewulf > > Le 31/05/2023 à 17:17, Stefano Babic a écrit : > > Hi Gauthier, > > > > On 31.05.23 17:12, Gauthier Dewulf wrote: > >> Hi Stefano, it is stil present on langdale branch as you can see > here > >> : > >> > https://github.com/sbabic/meta-swupdate/tree/langdale/recipes-extended/cpio <https://github.com/sbabic/meta-swupdate/tree/langdale/recipes-extended/cpio> > >> > > > > ...but langdale has reached its EOL according ro Yocto's releases. > > Anyway, I aligned langdale to the other branches and I removed the > > conflict. But do not expect further commits on langdale, it will be > > considered (like in poky) discontinued. > > > > Best regards, > > Stefano Babic > > > >> Regards, > >> > >> Gauthier Dewulf > >> > >> Le 31/05/2023 à 17:05, Stefano Babic a écrit : > >>> Hi Gauthier, > >>> > >>> On 31.05.23 16:52, gdf wrote: > >>>> Signed-off-by: gdf <gauthie...@momagroup.com> > >>>> --- > >>>> recipes-extended/cpio/cpio_%.bbappend | 4 -- > >>>> ...g-CRC-with-ASCII-CRC-for-large-files.patch | 38 > >>>> ------------------- > >>>> 2 files changed, 42 deletions(-) > >>>> delete mode 100644 recipes-extended/cpio/cpio_%.bbappend > >>>> delete mode 100644 > >>>> > recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > >>>> > >>>> diff --git a/recipes-extended/cpio/cpio_%.bbappend > >>>> b/recipes-extended/cpio/cpio_%.bbappend > >>>> deleted file mode 100644 > >>>> index 421d6b1..0000000 > >>>> --- a/recipes-extended/cpio/cpio_%.bbappend > >>>> +++ /dev/null > >>>> @@ -1,4 +0,0 @@ > >>>> -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" > >>>> - > >>>> -SRC_URI += > >>>> "file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch" > >>>> - > >>>> diff --git > >>>> > a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > >>>> > b/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > >>>> > >>>> deleted file mode 100644 > >>>> index c973dc6..0000000 > >>>> --- > >>>> > a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch > >>>> +++ /dev/null > >>>> @@ -1,38 +0,0 @@ > >>>> -From 77ff5f1be394eb2c786df561ff37dde7f982ec76 Mon Sep 17 > 00:00:00 > >>>> 2001 > >>>> -From: Stefano Babic <sba...@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 <sba...@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 > >>>> - > >>> > >>> I already removed this some times ago, and it is not present > anymore > >>> on a supported branches. I do not know where you see it is still > >>> present. > >>> > >>> Best regards, > >>> Stefano Babic > >>> > >> > > > > -- > You received this message because you are subscribed to the Google > Groups "swupdate" group. > To unsubscribe from this group and stop receiving emails from it, send > an email to swupdate+unsubscribe@googlegroups.com > <mailto:swupdate+unsubscribe@googlegroups.com>. > To view this discussion on the web visit > https://groups.google.com/d/msgid/swupdate/ee56702d-92eb-47bf-9796-bd90f624058fn%40googlegroups.com <https://groups.google.com/d/msgid/swupdate/ee56702d-92eb-47bf-9796-bd90f624058fn%40googlegroups.com?utm_medium=email&utm_source=footer>.
diff --git a/recipes-extended/cpio/cpio_%.bbappend b/recipes-extended/cpio/cpio_%.bbappend deleted file mode 100644 index 421d6b1..0000000 --- a/recipes-extended/cpio/cpio_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI += "file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch" - diff --git a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch b/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch deleted file mode 100644 index c973dc6..0000000 --- a/recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch +++ /dev/null @@ -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 -
Signed-off-by: gdf <gauthier.dewulf@momagroup.com> --- recipes-extended/cpio/cpio_%.bbappend | 4 -- ...g-CRC-with-ASCII-CRC-for-large-files.patch | 38 ------------------- 2 files changed, 42 deletions(-) delete mode 100644 recipes-extended/cpio/cpio_%.bbappend delete mode 100644 recipes-extended/cpio/files/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch