Message ID | b9d88fa46bad2987bd045b0fa98ecde7b42dbb1c.1645452535.git.steve@sakoman.com |
---|---|
State | Accepted, archived |
Commit | 61e38b71566183e329d980e26fe8ffe8d331c3a1 |
Headers | show |
Series | [dunfell,01/20] expat: fix CVE-2022-23990 | expand |
This patch should be merged without this fix https://git.yoctoproject.org/poky/commit/?id=89004bc2480808576582001460e37d98143bf9a3 On 21.02.22 15:14, Steve Sakoman wrote: > From: Alexander Kanavin <alex.kanavin@gmail.com> > > In particular libffi was missing from native, which > led to linking with host libffi instead. > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > (cherry picked from commit 293c9f879252a814107579542e8fca9af9dde599) > Signed-off-by: Steve Sakoman <steve@sakoman.com> > --- > meta/recipes-devtools/ruby/ruby.inc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc > index 7b6d4edc61..367cd98d09 100644 > --- a/meta/recipes-devtools/ruby/ruby.inc > +++ b/meta/recipes-devtools/ruby/ruby.inc > @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "\ > file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ > " > > -DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" > -DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" > +DEPENDS = "zlib openssl libyaml gdbm readline libffi" > +DEPENDS_class-target:append = " ruby-native" > > SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" > SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#162048): https://lists.openembedded.org/g/openembedded-core/message/162048 > Mute This Topic: https://lists.openembedded.org/mt/89294107/3647476 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [kweihmann@outlook.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Mon, Feb 21, 2022 at 4:17 AM Konrad Weihmann <kweihmann@outlook.com> wrote: > > This patch should be merged without this fix > https://git.yoctoproject.org/poky/commit/?id=89004bc2480808576582001460e37d98143bf9a3 Thanks for reviewing Konrad! I will add the above fix before sending the pull request. Steve > > On 21.02.22 15:14, Steve Sakoman wrote: > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > In particular libffi was missing from native, which > > led to linking with host libffi instead. > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > (cherry picked from commit 293c9f879252a814107579542e8fca9af9dde599) > > Signed-off-by: Steve Sakoman <steve@sakoman.com> > > --- > > meta/recipes-devtools/ruby/ruby.inc | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc > > index 7b6d4edc61..367cd98d09 100644 > > --- a/meta/recipes-devtools/ruby/ruby.inc > > +++ b/meta/recipes-devtools/ruby/ruby.inc > > @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "\ > > file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ > > " > > > > -DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" > > -DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" > > +DEPENDS = "zlib openssl libyaml gdbm readline libffi" > > +DEPENDS_class-target:append = " ruby-native" > > > > SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" > > SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#162048): https://lists.openembedded.org/g/openembedded-core/message/162048 > > Mute This Topic: https://lists.openembedded.org/mt/89294107/3647476 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [kweihmann@outlook.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index 7b6d4edc61..367cd98d09 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "\ file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ " -DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" -DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" +DEPENDS = "zlib openssl libyaml gdbm readline libffi" +DEPENDS_class-target:append = " ruby-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \