On Thu, Jan 19, 2023 at 1:44 AM Luca Ceresoli <luca.ceres...@bootlin.com> wrote:
>
> Hi Khem,
>
> On Wed, 18 Jan 2023 20:27:22 -0800
> "Khem Raj" <raj.k...@gmail.com> wrote:
>
> > Signed-off-by: Khem Raj <raj.k...@gmail.com>
> > ---
> > v1 -> v2:
> > - Fix build on mingw
> > - Backport fix to build with --disable-gdb
> >
> >  meta/conf/distro/include/tcmode-default.inc   |     2 +-
> >  .../{binutils-2.39.inc => binutils-2.40.inc}  |    22 +-
> >  ....39.bb => binutils-cross-canadian_2.40.bb} |     0
> >  ...39.bb => binutils-cross-testsuite_2.40.bb} |     0
> >  ...s-cross_2.39.bb => binutils-cross_2.40.bb} |     0
> >  ...ssdk_2.39.bb => binutils-crosssdk_2.40.bb} |     0
> >  ...s-crosssdk-Generate-relocatable-SDKs.patch |    10 +-
> >  ...o-not-generate-linker-script-directo.patch |     4 +-
> >  ...dk-Search-for-alternative-ld.so.conf.patch |    18 +-
> >  ...004-Point-scripts-location-to-libdir.patch |    10 +-
> >  ...stro-compiler-point-to-the-wrong-ins.patch |     4 +-
> >  ...-system-directories-when-cross-linki.patch |    44 +-
> >  ...ect-assembling-for-ppc-wait-mnemonic.patch |     8 +-
> >  .../binutils/0008-Use-libtool-2.4.patch       | 19254 ++++++++++------
> >  ...h-in-libtool-when-sysroot-is-enabled.patch |     2 +-
> >  .../0010-sync-with-OE-libtool-changes.patch   |     2 +-
> >  ...or-clang-before-checking-gcc-version.patch |    10 +-
> >  ...-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch |     4 +-
> >  .../binutils/0013-CVE-2022-38533.patch        |    36 -
> >  ...sing-_Alignof-when-using-C11-or-newe.patch |    48 +
> >  .../binutils/0014-CVE-2022-38128-1.patch      |   350 -
> >  .../binutils/0014-CVE-2022-38128-2.patch      |   536 -
> >  .../binutils/0014-CVE-2022-38128-3.patch      |    95 -
> >  ...-dependencies-on-gmp-and-mpfr-when-g.patch |    56 +
> >  .../binutils/0015-CVE-2022-4285.patch         |    37 -
> >  ...-pe-dll.o-entry-deom-targ_extra_ofil.patch |    41 +
> >  .../{binutils_2.39.bb => binutils_2.40.bb}    |     0
> >  27 files changed, 11820 insertions(+), 8773 deletions(-)
> >  rename meta/recipes-devtools/binutils/{binutils-2.39.inc => 
> > binutils-2.40.inc} (71%)
> >  rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.39.bb => 
> > binutils-cross-canadian_2.40.bb} (100%)
> >  rename meta/recipes-devtools/binutils/{binutils-cross-testsuite_2.39.bb => 
> > binutils-cross-testsuite_2.40.bb} (100%)
> >  rename meta/recipes-devtools/binutils/{binutils-cross_2.39.bb => 
> > binutils-cross_2.40.bb} (100%)
> >  rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.39.bb => 
> > binutils-crosssdk_2.40.bb} (100%)
> >  delete mode 100644 
> > meta/recipes-devtools/binutils/binutils/0013-CVE-2022-38533.patch
> >  create mode 100644 
> > meta/recipes-devtools/binutils/binutils/0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
> >  delete mode 100644 
> > meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-1.patch
> >  delete mode 100644 
> > meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-2.patch
> >  delete mode 100644 
> > meta/recipes-devtools/binutils/binutils/0014-CVE-2022-38128-3.patch
> >  create mode 100644 
> > meta/recipes-devtools/binutils/binutils/0014-configure-remove-dependencies-on-gmp-and-mpfr-when-g.patch
> >  delete mode 100644 
> > meta/recipes-devtools/binutils/binutils/0015-CVE-2022-4285.patch
> >  create mode 100644 
> > meta/recipes-devtools/binutils/binutils/0015-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch
> >  rename meta/recipes-devtools/binutils/{binutils_2.39.bb => 
> > binutils_2.40.bb} (100%)
> >
> > diff --git a/meta/conf/distro/include/tcmode-default.inc 
> > b/meta/conf/distro/include/tcmode-default.inc
> > index 4d4929529a..bcc5f7ce1f 100644
> > --- a/meta/conf/distro/include/tcmode-default.inc
> > +++ b/meta/conf/distro/include/tcmode-default.inc
> > @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
> >
> >  GCCVERSION ?= "12.%"
> >  SDKGCCVERSION ?= "${GCCVERSION}"
> > -BINUVERSION ?= "2.39%"
> > +BINUVERSION ?= "2.40%"
> >  GDBVERSION ?= "12.%"
> >  GLIBCVERSION ?= "2.37"
> >  LINUXLIBCVERSION ?= "6.1%"
>
> Applying this patch on an oe-core repository fails with 'git am':
>
> error: sha1 information is lacking or useless 
> (meta/conf/distro/include/tcmode-default.inc).
> error: could not build fake ancestor
> Patch failed at 0001 binutils: Upgrade to 2.40 release
>
> And also with 'git apply'
>
> error: patch failed: meta/conf/distro/include/tcmode-default.inc:18
> error: meta/conf/distro/include/tcmode-default.inc: patch does not apply

It might be due to glibc 2.37 upgrade which I have in my local tree
staged as well.
you might edit it locally. If you want I can push it to a dedicated branch

>
> I noticed you prepared the patch in a poky repository, so I did apply
> it there, re-extracted it via 'git format-patch' and the resulting
> patch applied perfectly on my oe-core. This happened with your v1 as
> well a couple days ago.
>
> I don't understand the root cause and definitely there are no recent
> commits that create conflicts. However I'm wondering whether you could
> move to working on actual oe-core instead of poky. It would certainly
> help me.
>
> Kind regards,
> Luca
>
> --
> Luca Ceresoli, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#176150): 
https://lists.openembedded.org/g/openembedded-core/message/176150
Mute This Topic: https://lists.openembedded.org/mt/96371613/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to