I know you didn't test this: :) On 26 February 2018 at 14:38, Khem Raj <raj.k...@gmail.com> wrote:
> @@ -40,8 +40,13 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc > \ > file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ > > file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch > \ > file://0025-locale-fix-hard-coded-reference-to-gcc-E.patch \ > +<<<<<<< HEAD:meta/recipes-core/glibc/glibc_2.26.bb > file://0027-glibc-reset-dl-load-write-lock-after-forking.patch > \ > file://0028-Bug-4578-add-ld.so-lock-while-fork.patch \ > +======= > + file://0026-reset-dl_load_write_lock-after-forking.patch \ > + > file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch > \ > +>>>>>>> 2ce2695790... glibc: Upgrade to 2.27 release:meta/recipes-core/ > glibc/glibc_2.27.bb > " > Locally I've got the previous 2.27 upgrade squashed into a revert of the 2.26 bump, presumably there are no other changes required?
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core