Re: [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1
On Tue, Apr 21, 2020 at 5:51 AM Grégory Vimont wrote:
>
> Hello,
> How can I reproduce this build configuration ?
>
MACHINE=qemumips bitbake opencv
>
> Le ven. 17 avr. 2020 à 09:57, Grégory Vimont a
> écrit :
>>
>> I don't know what went wrong, I see only Warnings there.
>>
>> Le jeu. 16 avr. 2020 à 20:38, Khem Raj a écrit :
>>>
>>> This fails on mips/glibc
>>>
>>> https://errors.yoctoproject.org/Errors/Details/404685/
>>>
>>>
>>> On Thu, Apr 16, 2020 at 7:17 AM Gregory Vimont
>>> wrote:
>>> >
>>> > Signed-off-by: Gregory Vimont
>>> > ---
>>> > .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} | 6 +++---
>>> > 1 file changed, 3 insertions(+), 3 deletions(-)
>>> > rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb =>
>>> > opencv_4.1.1.bb} (98%)
>>> >
>>> > diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
>>> > b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>>> > similarity index 98%
>>> > rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb
>>> > rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>>> > index d781da600..5074eb2fa 100644
>>> > --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
>>> > +++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>>> > @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
>>> >
>>> > DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
>>> >
>>> > -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad"
>>> > -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
>>> > +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574"
>>> > +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417"
>>> > SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
>>> > SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
>>> > SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
>>> > @@ -51,7 +51,7 @@ SRC_URI =
>>> > "git://github.com/opencv/opencv.git;name=opencv \
>>> >
>>> > file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
>>> > file://download.patch \
>>> > "
>>> > -PV = "4.1.0"
>>> > +PV = "4.1.1"
>>> >
>>> > S = "${WORKDIR}/git"
>>> >
>>> > --
>>> > 2.17.1
>>> >
>>> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84081):
https://lists.openembedded.org/g/openembedded-devel/message/84081
Mute This Topic: https://lists.openembedded.org/mt/73055063/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-initramfs][PATCH] meta-initramfs-image: remove klibc utilities
On Sat, Apr 25, 2020 at 12:30 AM Khem Raj wrote:
>
> On Thu, Apr 23, 2020 at 4:55 PM Andrea Adami wrote:
> >
> > klibc utils have no update-alternatives because these live ideally alone
> > in th einitramfs. This image is not minimal having busybox, linux-utils,
> > coreutils so to resolve the conflict we just remove the shared klibc utils
> > and replace the klibc kexec and vmcore-dmesg.
> >
> > Finally, remove EXCLUDE_FROM_WORLD.
> >
> > Fix:
> > ERROR: meta-initramfs-image-1.0-r0 do_rootfs:
> > Postinstall scriptlets of ['busybox', 'util-linux-umount',
> > 'util-linux-dmesg',
> > 'coreutils', 'util-linux-mount', 'cpio', 'util-linux-kill',
> > 'util-linux-losetup'] have failed.
> >
> > Signed-off-by: Andrea Adami
> > ---
> > .../packagegroups/packagegroup-meta-initramfs.bb | 16 ++--
> > 1 file changed, 2 insertions(+), 14 deletions(-)
> >
> > diff --git
> > a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > index bfede5a74..dc4928b5a 100644
> > ---
> > a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > +++
> > b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > @@ -15,22 +15,10 @@ RDEPENDS_packagegroup-meta-initramfs = "\
> > "
> >
> > RDEPENDS_packagegroup-meta-initramfs-devtools = "\
> > -libklibc dracut \
> > -klibc-utils-cat klibc-utils-losetup klibc-utils-readlink
> > klibc-utils-chroot \
> > -klibc-utils-ls klibc-utils-reboot klibc-utils-cpio klibc-utils-minips \
> > -klibc-utils-resume klibc-utils-dd klibc-utils-mkdir
> > klibc-utils-run-init \
> > -klibc-utils-dmesg klibc-utils-mkfifo klibc-utils-sh.shared
> > klibc-utils-false \
> > -klibc-utils-mknod klibc-utils-sleep klibc-utils-fstype
> > klibc-utils-mount \
> > -klibc-utils-sync klibc-utils-halt klibc-utils-mv klibc-utils-true
> > klibc-utils-ipconfig \
> > -klibc-utils-nfsmount klibc-utils-umount klibc-utils-kill
> > klibc-utils-nuke klibc-utils-uname \
> > -mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc
> > ubidetach-klibc \
> > -ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc
> > ubirename-klibc \
> > -ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc \
> > +dracut \
> > ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64",
> > "grubby", "", d)} \
> > "
> >
> > RDEPENDS_packagegroup-meta-initramfs-kernel = "\
> > -kexec-klibc vmcore-dmesg-klibc \
> > +kexec vmcore-dmesg \
>
> this creates a dependency on kexec-tools from oe-core, this however is
> not buildable on some arches e.g. riscv
> so this change does not work as such, I think you can only add it as
> dependency where its supported.
>
Well, the problem was already there, kexec-tools klibc and oe-core both have
COMPATIBLE_HOST =
'(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)'
I really have no idea about the image purposes, I see there is dracut
which seems to be buildable for most archs and does not have runtime
deps on kexec-tools.
Maybe we can just remove kexec and vmcore-dmesg
Cheers
Andrea
> > "
> > -
> > -EXCLUDE_FROM_WORLD = "1"
> > --
> > 2.17.1
> >
> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84082):
https://lists.openembedded.org/g/openembedded-devel/message/84082
Mute This Topic: https://lists.openembedded.org/mt/73230971/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] pegtl: upgrade 2.8.2 -> 2.8.3
See full changelog https://github.com/taocpp/PEGTL/releases/tag/2.8.3
Signed-off-by: Pierre-Jean Texier
---
meta-oe/recipes-extended/pegtl/{pegtl_2.8.2.bb => pegtl_2.8.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/pegtl/{pegtl_2.8.2.bb => pegtl_2.8.3.bb} (87%)
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_2.8.2.bb
b/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb
similarity index 87%
rename from meta-oe/recipes-extended/pegtl/pegtl_2.8.2.bb
rename to meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb
index 42aa655..92741d8 100644
--- a/meta-oe/recipes-extended/pegtl/pegtl_2.8.2.bb
+++ b/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE="https://github.com/taocpp/PEGTL";
LICENSE="MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=6a5195f720a8d436a4148e0cb8660400"
-SRCREV = "ede3ce17aef7da27648b195dc77814cb1d3c313d"
+SRCREV = "47e878ad4fd72c91253c9d47b6f17e001ca2dfcf"
SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=2.x \
"
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84083):
https://lists.openembedded.org/g/openembedded-devel/message/84083
Mute This Topic: https://lists.openembedded.org/mt/73262200/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-initramfs][PATCH] meta-initramfs-image: remove klibc utilities
On Sat, Apr 25, 2020 at 6:10 AM Andrea Adami wrote:
>
> On Sat, Apr 25, 2020 at 12:30 AM Khem Raj wrote:
> >
> > On Thu, Apr 23, 2020 at 4:55 PM Andrea Adami wrote:
> > >
> > > klibc utils have no update-alternatives because these live ideally alone
> > > in th einitramfs. This image is not minimal having busybox, linux-utils,
> > > coreutils so to resolve the conflict we just remove the shared klibc utils
> > > and replace the klibc kexec and vmcore-dmesg.
> > >
> > > Finally, remove EXCLUDE_FROM_WORLD.
> > >
> > > Fix:
> > > ERROR: meta-initramfs-image-1.0-r0 do_rootfs:
> > > Postinstall scriptlets of ['busybox', 'util-linux-umount',
> > > 'util-linux-dmesg',
> > > 'coreutils', 'util-linux-mount', 'cpio', 'util-linux-kill',
> > > 'util-linux-losetup'] have failed.
> > >
> > > Signed-off-by: Andrea Adami
> > > ---
> > > .../packagegroups/packagegroup-meta-initramfs.bb | 16 ++--
> > > 1 file changed, 2 insertions(+), 14 deletions(-)
> > >
> > > diff --git
> > > a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > >
> > > b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > > index bfede5a74..dc4928b5a 100644
> > > ---
> > > a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > > +++
> > > b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > > @@ -15,22 +15,10 @@ RDEPENDS_packagegroup-meta-initramfs = "\
> > > "
> > >
> > > RDEPENDS_packagegroup-meta-initramfs-devtools = "\
> > > -libklibc dracut \
> > > -klibc-utils-cat klibc-utils-losetup klibc-utils-readlink
> > > klibc-utils-chroot \
> > > -klibc-utils-ls klibc-utils-reboot klibc-utils-cpio
> > > klibc-utils-minips \
> > > -klibc-utils-resume klibc-utils-dd klibc-utils-mkdir
> > > klibc-utils-run-init \
> > > -klibc-utils-dmesg klibc-utils-mkfifo klibc-utils-sh.shared
> > > klibc-utils-false \
> > > -klibc-utils-mknod klibc-utils-sleep klibc-utils-fstype
> > > klibc-utils-mount \
> > > -klibc-utils-sync klibc-utils-halt klibc-utils-mv klibc-utils-true
> > > klibc-utils-ipconfig \
> > > -klibc-utils-nfsmount klibc-utils-umount klibc-utils-kill
> > > klibc-utils-nuke klibc-utils-uname \
> > > -mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc
> > > ubidetach-klibc \
> > > -ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc
> > > ubirename-klibc \
> > > -ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc \
> > > +dracut \
> > > ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64",
> > > "grubby", "", d)} \
> > > "
> > >
> > > RDEPENDS_packagegroup-meta-initramfs-kernel = "\
> > > -kexec-klibc vmcore-dmesg-klibc \
> > > +kexec vmcore-dmesg \
> >
> > this creates a dependency on kexec-tools from oe-core, this however is
> > not buildable on some arches e.g. riscv
> > so this change does not work as such, I think you can only add it as
> > dependency where its supported.
> >
>
> Well, the problem was already there, kexec-tools klibc and oe-core both have
>
> COMPATIBLE_HOST =
> '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)'
>
>
> I really have no idea about the image purposes, I see there is dracut
> which seems to be buildable for most archs and does not have runtime
> deps on kexec-tools.
> Maybe we can just remove kexec and vmcore-dmesg
>
these were mainly for testing builds of the given layer. So I think
removing kexec and vmcore-dmesg is ok
> Cheers
> Andrea
>
>
>
> > > "
> > > -
> > > -EXCLUDE_FROM_WORLD = "1"
> > > --
> > > 2.17.1
> > >
> > >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84084):
https://lists.openembedded.org/g/openembedded-devel/message/84084
Mute This Topic: https://lists.openembedded.org/mt/73230971/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-python][PATCH] python3-pexpect: change shebang to python3
On Fri, Apr 24, 2020 at 10:00 PM Tim Orling wrote: > > meta-python2 has zero connection the meta-python. So it will not depend on > any inc files. > Thanks, perhaps this patch is ok then, merging inc and bb can be a different one. > On Fri, Apr 24, 2020 at 6:57 PM Khem Raj wrote: >> >> >> >> On 4/23/20 6:13 PM, Changqing Li wrote: >> > From: Changqing Li >> > >> > we have offcially dropped python2, so it is possible >> > that our code run on python3 only host, so change >> > shebang to python3 to avoid error like: >> > python: command not found >> > >> > Signed-off-by: Changqing Li >> > --- >> > .../python/python-pexpect.inc | 2 ++ >> > ...hange-shebang-from-python-to-python3.patch | 25 +++ >> > 2 files changed, 27 insertions(+) >> > create mode 100644 >> > meta-python/recipes-devtools/python/python3-pexpect/0001-FSM.py-change-shebang-from-python-to-python3.patch >> > >> > diff --git a/meta-python/recipes-devtools/python/python-pexpect.inc >> > b/meta-python/recipes-devtools/python/python-pexpect.inc >> > index f02aa994e..c6230b2b5 100644 >> > --- a/meta-python/recipes-devtools/python/python-pexpect.inc >> > +++ b/meta-python/recipes-devtools/python/python-pexpect.inc >> > @@ -4,6 +4,8 @@ SECTION = "devel/python" >> > LICENSE = "ISC" >> > LIC_FILES_CHKSUM = "file://LICENSE;md5=1c7a725251880af8c6a148181665385b" >> > >> > +SRC_URI += >> > "file://0001-FSM.py-change-shebang-from-python-to-python3.patch" >> > + >> >> This .inc file should be merged into .bb, as well, also check if >> meta-python2 depends on this .inc file, if it does then the patching >> should happen inside py3 version of bb file and not .inc >> >> > SRC_URI[md5sum] = "153eb25184249d6a85fde9acf4804085" >> > SRC_URI[sha256sum] = >> > "fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c" >> > >> > diff --git >> > a/meta-python/recipes-devtools/python/python3-pexpect/0001-FSM.py-change-shebang-from-python-to-python3.patch >> > >> > b/meta-python/recipes-devtools/python/python3-pexpect/0001-FSM.py-change-shebang-from-python-to-python3.patch >> > new file mode 100644 >> > index 0..bee772da6 >> > --- /dev/null >> > +++ >> > b/meta-python/recipes-devtools/python/python3-pexpect/0001-FSM.py-change-shebang-from-python-to-python3.patch >> > @@ -0,0 +1,25 @@ >> > +From 35462d7b778eea32fd0cc0bbc79d6e6f53d942b4 Mon Sep 17 00:00:00 2001 >> > +From: Changqing Li >> > +Date: Thu, 23 Apr 2020 08:01:42 + >> > +Subject: [PATCH] FSM.py: change shebang from python to python3 >> > + >> > +Upstream-Status: Pending >> > + >> > +Signed-off-by: Changqing Li >> > +--- >> > + pexpect/FSM.py | 2 +- >> > + 1 file changed, 1 insertion(+), 1 deletion(-) >> > + >> > +diff --git a/pexpect/FSM.py b/pexpect/FSM.py >> > +index 46b392e..4e77654 100644 >> > +--- a/pexpect/FSM.py >> > b/pexpect/FSM.py >> > +@@ -1,4 +1,4 @@ >> > +-#!/usr/bin/env python >> > ++#!/usr/bin/env python3 >> > + >> > + '''This module implements a Finite State Machine (FSM). In addition to >> > state >> > + this FSM also maintains a user defined "memory". So this FSM can be used >> > as a >> > +-- >> > +2.24.1 >> > + >> > >> > >> > >> > >> >> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#84085): https://lists.openembedded.org/g/openembedded-devel/message/84085 Mute This Topic: https://lists.openembedded.org/mt/73232294/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH v2] sdbus-c++-tools: add nativesdk
On Fri, Apr 24, 2020 at 12:31 PM Peter Kjellerstedt
wrote:
>
> > -Original Message-
> > From: openembedded-devel@lists.openembedded.org > de...@lists.openembedded.org> On Behalf Of Matt Campbell
> > Sent: den 22 april 2020 22:07
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Matthew Campbell
> > Subject: [oe] [meta-oe][PATCH v2] sdbus-c++-tools: add nativesdk
> >
> > Changes from v1:
> > Fix formatting of patch
>
> The above should go below the --- line below as it relates to the
> review process rather than the change itself.
>
right, this time I fixed the commit msg before picking it up.
> //Peter
>
> > Signed-off-by: Matthew Campbell
> > ---
> > ...bus-c++-tools-native_0.8.1.bb => sdbus-c++-tools_0.8.1.bb} | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> > rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-tools-native_0.8.1.bb
> > => sdbus-c++-tools_0.8.1.bb} (89%)
> >
> > diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-
> > native_0.8.1.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb
> > similarity index 89%
> > rename from meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-
> > native_0.8.1.bb
> > rename to meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb
> > index e18b9903d..9eaec0f2a 100644
> > --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools-native_0.8.1.bb
> > +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb
> > @@ -4,7 +4,7 @@ DESCRIPTION = "Native interface code generator for
> > development with sdbus-c++"
> > LICENSE = "LGPLv2.1"
> > LIC_FILES_CHKSUM =
> > "file://${S}/COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742"
> >
> > -inherit cmake native
> > +inherit cmake
> >
> > DEPENDS += "expat"
> >
> > @@ -12,3 +12,5 @@ SRCREV = "3a4f343fb924650e7639660efa5f143961162044"
> > SRC_URI = "git://github.com/Kistler-Group/sdbus-
> > cpp.git;protocol=https;branch=master;subpath=tools"
> >
> > S = "${WORKDIR}/tools"
> > +
> > +BBCLASSEXTEND = "native nativesdk"
> > --
> > 2.20.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84086):
https://lists.openembedded.org/g/openembedded-devel/message/84086
Mute This Topic: https://lists.openembedded.org/mt/73205282/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [PATCH] libgit2: Update to v1.0.0
On Fri, Apr 24, 2020, at 6:04 PM, Khem Raj wrote:
>
>
> On 4/24/20 5:39 PM, Alistair wrote:
> > On Fri, Apr 24, 2020, at 2:16 PM, Khem Raj wrote:
> >> This update has some issues
> >>
> >> Fails on qemux86/clang
> >> https://errors.yoctoproject.org/Errors/Details/407382/
> >
> > I tried to reproduce this with:
> >
> > MACHINE=qemux86 TOOLCHAIN="clang" bitbake libgit2
>
> I think you need meta-clang in layer mix. and then set TOOLCHAIN =
> "clang" in local.conf, I will try to see as well, it seems its finding a
> library in native sysroot :( which should otherwise be in target sysroot
Yep, I checked and I have meta-clang and set TOOLCHAIN.
>
> and the reason is that its happily adding libraries in linker cmdline.
> So something is in CMakefile which is not differentiating native sysroot
> from target sysroot.
Is it possible the build wasn't clean before hand? In my testing I saw some
linker issues which was fixed by cleaning the build files.
>
> -Wl,-rpath,TOPDIR/build/tmp/work/core2-32-yoe-linux/libgit2/1.0.0-r0/recipe-sysroot-native/usr/lib
> ...
>
> TOPDIR/build/tmp/work/core2-32-yoe-linux/libgit2/1.0.0-r0/recipe-sysroot-native/usr/lib/libpcre.so
> TOPDIR/build/tmp/work/core2-32-yoe-linux/libgit2/1.0.0-r0/recipe-sysroot-native/usr/lib/libpcreposix.so
>
> ...
>
>
> core2-32-yoe-linux/libgit2/1.0.0-r0/recipe-sysroot-native/usr/lib/libpcre.so:
> error adding symbols: file in wrong format
I don't see the error and I'm not really sure what to do.
Alistair
>
> >
> > but it build for me. What am I missing?
> >
> >>
> >> for glibc/musl there is another failure which is caused by this
> >>
> >> https://errors.yoctoproject.org/Errors/Details/407386/
> >
> > I have a patch for this. I'll send it out with v2.
> >
>
> OK
>
> > Alistair
> >
> >>
> >> On Thu, Apr 23, 2020 at 11:31 PM Alistair wrote:
> >>>
> >>> Signed-off-by: Alistair Francis
> >>> ---
> >>> .../libgit2/{libgit2_0.28.4.bb => libgit2_1.0.0.bb} | 6 +++---
> >>> 1 file changed, 3 insertions(+), 3 deletions(-)
> >>> rename meta-oe/recipes-support/libgit2/{libgit2_0.28.4.bb =>
> >>> libgit2_1.0.0.bb} (64%)
> >>>
> >>> diff --git a/meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb
> >>> b/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb
> >>> similarity index 64%
> >>> rename from meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb
> >>> rename to meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb
> >>> index 9b9c19104..fd26a0fe9 100644
> >>> --- a/meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb
> >>> +++ b/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb
> >>> @@ -1,12 +1,12 @@
> >>> SUMMARY = "the Git linkable library"
> >>> HOMEPAGE = "http://libgit2.github.com/";
> >>> LICENSE = "GPL-2.0-with-GCC-exception & MIT"
> >>> -LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b"
> >>> +LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e"
> >>>
> >>> DEPENDS = "curl openssl zlib libssh2 libgcrypt"
> >>>
> >>> -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.28"
> >>> -SRCREV = "106a5f27586504ea371528191f0ea3aac2ad432b"
> >>> +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0"
> >>> +SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0"
> >>>
> >>> S = "${WORKDIR}/git"
> >>>
> >>> --
> >>> 2.26.0
> >>>
> >>>
> >>
> >>
> >>
> >>
> >>
>
>
>
>
>
> *Attachments:*
> * signature.asc
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84087):
https://lists.openembedded.org/g/openembedded-devel/message/84087
Mute This Topic: https://lists.openembedded.org/mt/73236146/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 1/2] freerdp: wayland: depend on wayland-native
do_configure tests for wayland-scanner and silently drops the wayland
configure option if not found. Adding wayland-native to depends fixes
that.
Signed-off-by: Max Krummenacher
---
meta-oe/recipes-support/freerdp/freerdp_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb
b/meta-oe/recipes-support/freerdp/freerdp_git.bb
index 373c4979f..6fb9a738a 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_git.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb
@@ -39,7 +39,7 @@ PACKAGECONFIG ??= " \
X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi
libxrender libxfixes libxdamage libxrandr libxkbfile"
PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON
-DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON
-DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}"
-PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland"
+PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland
wayland-native"
PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb"
PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam"
PACKAGECONFIG[pulseaudio] =
"-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio"
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84088):
https://lists.openembedded.org/g/openembedded-devel/message/84088
Mute This Topic: https://lists.openembedded.org/mt/73265494/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 2/2] freerdp: update to 2.0.0 release
Bump PE to prevent 'version-going-backwards (from 0:2.0.0-rc4-r0 to 0:2.0.0-r0)'
Signed-off-by: Max Krummenacher
---
meta-oe/recipes-support/freerdp/freerdp_git.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb
b/meta-oe/recipes-support/freerdp/freerdp_git.bb
index 6fb9a738a..7cafbb799 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_git.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb
@@ -10,11 +10,12 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
inherit pkgconfig cmake gitpkgv
+PE = "1"
PV = "2.0.0+gitr${SRCPV}"
PKGV = "${GITPKGVTAG}"
-# 2.0.0-rc4
-SRCREV = "e21b72c95f857817b4b32b5ef5406355c005a9e8"
+# 2.0.0 release
+SRCREV = "5ab2bed8749747b8e4b2ed431fd102bc726be684"
SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \
file://winpr-makecert-Build-with-install-RPATH.patch \
"
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84089):
https://lists.openembedded.org/g/openembedded-devel/message/84089
Mute This Topic: https://lists.openembedded.org/mt/73265496/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] tslib: Fix build with 4.x kernel headers
Fixes
| ../../tslib-1.21/tools/ts_uinput.c:337:15: error: 'struct input_event'
has no member named 'input_event_usec'
| 337 |data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
| | ^
Signed-off-by: Khem Raj
---
...-with-input_event_sec-for-old-kernel.patch | 30 +++
meta-oe/recipes-graphics/tslib/tslib_1.21.bb | 1 +
2 files changed, 31 insertions(+)
create mode 100644
meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch
diff --git
a/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch
b/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch
new file mode 100644
index 00..ea8a9e5651
--- /dev/null
+++
b/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch
@@ -0,0 +1,30 @@
+From 050bf24c16e95f63a76e13156346a072035d45b4 Mon Sep 17 00:00:00 2001
+From: Evan Harvey
+Date: Thu, 19 Mar 2020 01:32:03 -0700
+Subject: [PATCH] Fix build error with input_event_sec for old kernel
+
+Upstream-Status: Backport
[https://github.com/libts/tslib/commit/050bf24c16e95f63a76e13156346a072035d45b4]
+Signed-off-by: Khem Raj
+---
+ tools/ts_uinput.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c
+index 1832a07..9c40bb3 100644
+--- a/tools/ts_uinput.c
b/tools/ts_uinput.c
+@@ -51,6 +51,11 @@
+ #include
+ #endif
+
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #define RESET "\033[0m"
+ #define RED "\033[31m"
+ #define GREEN "\033[32m"
+--
+2.26.2
+
diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.21.bb
b/meta-oe/recipes-graphics/tslib/tslib_1.21.bb
index bb28ee410c..76c4231441 100644
--- a/meta-oe/recipes-graphics/tslib/tslib_1.21.bb
+++ b/meta-oe/recipes-graphics/tslib/tslib_1.21.bb
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "\
SRC_URI =
"https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz
\
file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+
file://0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch \
file://ts.conf \
file://tslib.sh \
"
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84090):
https://lists.openembedded.org/g/openembedded-devel/message/84090
Mute This Topic: https://lists.openembedded.org/mt/73268021/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-networking][PATCH] kea: improve reproducibility
From: Mingli Yu
There are some shell scripts such as kea-admin,
upgrade_4.0_to_5.0.sh, wipe_data.sh and etc contain
build path.
Actually the build path is meanlingless on the target,
so replace abs_top_builddir to abs_top_builddir_placeholder
to avoid expanding abs_top_builddir which introduces
build path.
Signed-off-by: Mingli Yu
---
meta-networking/recipes-connectivity/kea/kea_1.7.6.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta-networking/recipes-connectivity/kea/kea_1.7.6.bb
b/meta-networking/recipes-connectivity/kea/kea_1.7.6.bb
index 51e361c..4e221c3 100644
--- a/meta-networking/recipes-connectivity/kea/kea_1.7.6.bb
+++ b/meta-networking/recipes-connectivity/kea/kea_1.7.6.bb
@@ -35,6 +35,10 @@ BUILD_OPTIMIZATION_append_mipsel = " -O"
do_configure_prepend_class-target() {
mkdir -p ${B}/src/lib/log/compiler/
ln -sf ${STAGING_BINDIR_NATIVE}/kea-msg-compiler
${B}/src/lib/log/compiler/kea-msg-compiler
+# replace abs_top_builddir to avoid introducing the build path
+# don't expand the abs_top_builddir on the target as the abs_top_builddir
is meanlingless on the target
+find ${S} -type f -name *.sh.in | xargs sed -i
"s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g"
+sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g"
${S}/src/bin/admin/kea-admin.in
}
do_install_append_class-target() {
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84091):
https://lists.openembedded.org/g/openembedded-devel/message/84091
Mute This Topic: https://lists.openembedded.org/mt/73274619/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH v2] cjson: add recipe for v1.7.13
From: Ting Liu
cJSON aims to be the dumbest possible parser that you can get your
job done with. It's a single file of C, and a single header file.
Homepage: https://github.com/DaveGamble/cJSON
Signed-off-by: Ting Liu
---
Changes from v1:
rename recipe from cjson_git.bb to cjson_1.7.13.bb
add SECTION
enable building cJSON_Utils
not append ${libdir}/cmake to FILES_${PN}-dev as it is default
.../recipes-devtools/cjson/cjson_1.7.13.bb| 21 +++
1 file changed, 21 insertions(+)
create mode 100644 meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb
b/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb
new file mode 100644
index 0..e6174821f
--- /dev/null
+++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Ultralightweight JSON parser in ANSI C"
+AUTHOR = "Dave Gamble"
+HOMEPAGE = "https://github.com/DaveGamble/cJSON";
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0"
+
+SRC_URI = "git://github.com/DaveGamble/cJSON.git"
+SRCREV = "39853e5148dad8dc5d32ea2b00943cf4a0c6f120"
+
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE += "\
+-DENABLE_CJSON_UTILS=On \
+-DENABLE_CUSTOM_COMPILER_FLAGS=OFF \
+-DBUILD_SHARED_AND_STATIC_LIBS=On \
+"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.25.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84092):
https://lists.openembedded.org/g/openembedded-devel/message/84092
Mute This Topic: https://lists.openembedded.org/mt/73275769/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][zeus][PATCH] zeromq: Fix host-specific path issue with libsodium
From: "niko.ma...@vaisala.com"
Avoid propagation of full build host specific path into
WORKDIR/sysroot-destdir/usr/share/cmake/ZeroMQ/ZeroMQTargets.cmake
when building the recipe as this causes following-like breakage on
sstate cache consumer hosts (with different build host specific path,
than the host that populated sstate cache)
ninja: error:
'/build/host/specific/path/to/zeromq/4.3.2-r0/recipe-sysroot/usr/lib/libsodium.so',
needed by 'src/FooBar', missing and no known rule to make it
Signed-off-by: Niko Mauno
Signed-off-by: Khem Raj
---
...void-host-specific-path-to-libsodium.patch | 39 +++
.../zeromq/zeromq_4.3.2.bb| 1 +
2 files changed, 40 insertions(+)
create mode 100644
meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch
diff --git
a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch
b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch
new file mode 100644
index 0..eb3dee4d3
--- /dev/null
+++
b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch
@@ -0,0 +1,39 @@
+From: Niko Mauno
+Date: Wed Apr 22 09:00:00 2020 +0300
+Subject: CMakeLists.txt: Avoid host-specific path to libsodium
+
+Avoid propagating full build host specific path to generated
+ZeroMQTargets.cmake when building with libsodium, which changes the
+content in generated ZeroMQTargets.cmake files followingly:
+
+ -INTERFACE_LINK_LIBRARIES
"-lpthread;/build/host/specific/path/to/zeromq/4.3.2-r0/recipe-sysroot/usr/lib/libsodium.so;-lrt"
+ +INTERFACE_LINK_LIBRARIES "-lpthread;-lsodium;-lrt"
+
+This change mitigates an issue stemming from reuse of build artifacts
+where the path to libsodium.so does not match exactly between two
+different build hosts.
+
+Upstream-Status: Pending
+
+Signed-off-by: Niko Mauno
+
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -1210,7 +1210,7 @@
+ target_link_libraries(libzmq ${OPTIONAL_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})
+
+ if(SODIUM_FOUND)
+-target_link_libraries(libzmq ${SODIUM_LIBRARIES})
++target_link_libraries(libzmq -lsodium)
+ # On Solaris, libsodium depends on libssp
+ if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+ target_link_libraries(libzmq ssp)
+@@ -1240,7 +1240,7 @@
+ target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})
+
+ if(SODIUM_FOUND)
+-target_link_libraries(libzmq-static ${SODIUM_LIBRARIES})
++target_link_libraries(libzmq-static -lsodium)
+ # On Solaris, libsodium depends on libssp
+ if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+ target_link_libraries(libzmq-static ssp)
diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb
b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb
index adf2c7ba5..fc8a987f2 100644
--- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb
+++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb
@@ -7,6 +7,7 @@ PACKAGECONFIG ??= "libsodium"
PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF,
libsodium"
SRC_URI =
"http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \
+file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \
file://run-ptest \
"
SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573"
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84093):
https://lists.openembedded.org/g/openembedded-devel/message/84093
Mute This Topic: https://lists.openembedded.org/mt/73277037/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] php: upgrade 7.3.16 -> 7.4.4
On 4/25/20 12:59 AM, Khem Raj wrote:
This cause xdebug failures
https://errors.yoctoproject.org/Errors/Details/407307/
current xdebug don't support php7.4, I will upgrade xdebug to latest
and resend the patch.
On Thu, Apr 23, 2020 at 5:57 PM Changqing Li wrote:
From: Changqing Li
License-Update: License updated (year updated)
note: for 7.4, pear is disabled by default,
and it will be deprecated in future.
Signed-off-by: Changqing Li
---
...Use-pkg-config-for-libxml2-detection.patch | 23 ---
...re.ac-don-t-include-build-libtool.m4.patch | 30 +++
...001-opcache-config.m4-enable-opcache.patch | 170 +++-
...p-don-t-use-broken-wrapper-for-mkdir.patch | 11 +-
...-php.m4-don-t-unset-cache-variables.patch} | 23 +--
...e-pkg-config-for-FreeType2-detection.patch | 53 -
.../php/php/CVE-2019-6978.patch | 192 --
meta-oe/recipes-devtools/php/php/iconv.patch | 36 ++--
.../php/php/imap-fix-autofoo.patch| 36 ++--
.../php/php/phar-makefile.patch | 18 +-
.../php/php/php_exec_native.patch | 20 +-
.../php/{php_7.3.16.bb => php_7.4.4.bb} | 18 +-
12 files changed, 132 insertions(+), 498 deletions(-)
delete mode 100644
meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
create mode 100644
meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
rename
meta-oe/recipes-devtools/php/php/{0001-acinclude.m4-don-t-unset-cache-variables.patch
=> 0001-php.m4-don-t-unset-cache-variables.patch} (50%)
delete mode 100644
meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch
delete mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-6978.patch
rename meta-oe/recipes-devtools/php/{php_7.3.16.bb => php_7.4.4.bb} (94%)
diff --git
a/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
b/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
deleted file mode 100644
index ccc6d4ede..0
---
a/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Use pkg-config for libxml2 detection.
-
-xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Khem Raj
- configure.in | 15 ++-
- 1 file changed, 2 insertions(+), 13 deletions(-)
a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2481,8 +2481,8 @@ AC_DEFUN([PHP_SETUP_LIBXML], [
- LIBXML_VERSION=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3`
- if test "$LIBXML_VERSION" -ge "2006011"; then
- found_libxml=yes
-- LIBXML_LIBS=`$XML2_CONFIG --libs`
-- LIBXML_INCS=`$XML2_CONFIG --cflags`
-+ LIBXML_LIBS=`pkg-config --libs libxml-2.0`
-+ LIBXML_INCS=`pkg-config --cflags libxml-2.0`
- else
- AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.])
- fi
diff --git
a/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
b/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
new file mode 100644
index 0..2861366a6
--- /dev/null
+++
b/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
@@ -0,0 +1,30 @@
+From f5a34e771532b8433f307b679500c26af328ba35 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Fri, 17 Apr 2020 15:01:57 +0800
+Subject: [PATCH] configure.ac: don't include build/libtool.m4
+
+we delete build/libtool.m4 before do_configure,
+we will use libtool.m4 under ACLOCALDIR
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 06c6a27..f85144e 100644
+--- a/configure.ac
b/configure.ac
+@@ -6,7 +6,6 @@ dnl
+ m4_include([build/ax_check_compile_flag.m4])
+ m4_include([build/ax_func_which_gethostbyname_r.m4])
+ m4_include([build/ax_gcc_func_attribute.m4])
+-m4_include([build/libtool.m4])
+ m4_include([build/php_cxx_compile_stdcxx.m4])
+ m4_include([build/php.m4])
+ m4_include([build/pkg.m4])
+--
+2.7.4
+
diff --git
a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
index 34f433f40..ee0d5edcd 100644
---
a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
+++
b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
@@ -1,30 +1,27 @@
-From 8de5ba69d20d049b8ca983a9470c7303142ec0b3 Mon Sep 17 00:00:00 2001
-From: Changqing Li
-Date: Sun, 28 Apr 2019 16:55:13 +0800
-Subject: [PATCH] From fb139d9707dabe1684b472a08a6eb5761ede4a3a Mon Sep 17
- 00:00:00 2001 From: Changqing Li Date: Tue, 12
- Feb 2019 14:56:16 +0800 Subject: [PAT
[oe] [meta-webserver][PATCH 2/2] xdebug: upgrade 2.7.2 -> 2.9.5
From: Changqing Li
Signed-off-by: Changqing Li
---
.../recipes-php/xdebug/{xdebug_2.7.2.bb => xdebug_2.9.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-webserver/recipes-php/xdebug/{xdebug_2.7.2.bb => xdebug_2.9.5.bb}
(86%)
diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.7.2.bb
b/meta-webserver/recipes-php/xdebug/xdebug_2.9.5.bb
similarity index 86%
rename from meta-webserver/recipes-php/xdebug/xdebug_2.7.2.bb
rename to meta-webserver/recipes-php/xdebug/xdebug_2.9.5.bb
index 32d52a6..bad4da6 100644
--- a/meta-webserver/recipes-php/xdebug/xdebug_2.7.2.bb
+++ b/meta-webserver/recipes-php/xdebug/xdebug_2.9.5.bb
@@ -6,8 +6,8 @@ DEPENDS = "php re2c-native"
SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz";
-SRC_URI[md5sum] = "5d1a8ca3101df93938d283933f256493"
-SRC_URI[sha256sum] =
"b0f3283aa185c23fcd0137c3aaa58554d330995ef7a3421e983e8d018b05a4a6"
+SRC_URI[md5sum] = "c04be1bf225b768bf627dc92e5a1f9df"
+SRC_URI[sha256sum] =
"775b1705109611b996d6a713fe14117a67846e157eb7dbf349bc0b055e861a10"
UPSTREAM_CHECK_REGEX = "xdebug-(?P\d+(\.\d+)+)\.tgz"
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84095):
https://lists.openembedded.org/g/openembedded-devel/message/84095
Mute This Topic: https://lists.openembedded.org/mt/73277451/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 1/2] php: upgrade 7.3.16 -> 7.4.4
From: Changqing Li
License-Update: License updated (year updated)
note: for 7.4, pear is disabled by default,
and it will be deprecated in future.
Signed-off-by: Changqing Li
---
...0001-Use-pkg-config-for-libxml2-detection.patch | 23 ---
...nfigure.ac-don-t-include-build-libtool.m4.patch | 30
.../0001-opcache-config.m4-enable-opcache.patch| 170 +++---
...01-php-don-t-use-broken-wrapper-for-mkdir.patch | 11 +-
... 0001-php.m4-don-t-unset-cache-variables.patch} | 23 ++-
...48-Use-pkg-config-for-FreeType2-detection.patch | 53 --
.../recipes-devtools/php/php/CVE-2019-6978.patch | 192 -
meta-oe/recipes-devtools/php/php/iconv.patch | 36 ++--
.../php/php/imap-fix-autofoo.patch | 36 ++--
.../recipes-devtools/php/php/phar-makefile.patch | 18 +-
.../recipes-devtools/php/php/php_exec_native.patch | 20 ++-
.../php/{php_7.3.16.bb => php_7.4.4.bb}| 18 +-
12 files changed, 132 insertions(+), 498 deletions(-)
delete mode 100644
meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
create mode 100644
meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
rename
meta-oe/recipes-devtools/php/php/{0001-acinclude.m4-don-t-unset-cache-variables.patch
=> 0001-php.m4-don-t-unset-cache-variables.patch} (50%)
delete mode 100644
meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch
delete mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-6978.patch
rename meta-oe/recipes-devtools/php/{php_7.3.16.bb => php_7.4.4.bb} (94%)
diff --git
a/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
b/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
deleted file mode 100644
index ccc6d4e..000
---
a/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Use pkg-config for libxml2 detection.
-
-xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Khem Raj
- configure.in | 15 ++-
- 1 file changed, 2 insertions(+), 13 deletions(-)
a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2481,8 +2481,8 @@ AC_DEFUN([PHP_SETUP_LIBXML], [
- LIBXML_VERSION=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3`
- if test "$LIBXML_VERSION" -ge "2006011"; then
- found_libxml=yes
-- LIBXML_LIBS=`$XML2_CONFIG --libs`
-- LIBXML_INCS=`$XML2_CONFIG --cflags`
-+ LIBXML_LIBS=`pkg-config --libs libxml-2.0`
-+ LIBXML_INCS=`pkg-config --cflags libxml-2.0`
- else
- AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.])
- fi
diff --git
a/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
b/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
new file mode 100644
index 000..2861366
--- /dev/null
+++
b/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
@@ -0,0 +1,30 @@
+From f5a34e771532b8433f307b679500c26af328ba35 Mon Sep 17 00:00:00 2001
+From: Changqing Li
+Date: Fri, 17 Apr 2020 15:01:57 +0800
+Subject: [PATCH] configure.ac: don't include build/libtool.m4
+
+we delete build/libtool.m4 before do_configure,
+we will use libtool.m4 under ACLOCALDIR
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 06c6a27..f85144e 100644
+--- a/configure.ac
b/configure.ac
+@@ -6,7 +6,6 @@ dnl
+ m4_include([build/ax_check_compile_flag.m4])
+ m4_include([build/ax_func_which_gethostbyname_r.m4])
+ m4_include([build/ax_gcc_func_attribute.m4])
+-m4_include([build/libtool.m4])
+ m4_include([build/php_cxx_compile_stdcxx.m4])
+ m4_include([build/php.m4])
+ m4_include([build/pkg.m4])
+--
+2.7.4
+
diff --git
a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
index 34f433f..ee0d5ed 100644
---
a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
+++
b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
@@ -1,30 +1,27 @@
-From 8de5ba69d20d049b8ca983a9470c7303142ec0b3 Mon Sep 17 00:00:00 2001
-From: Changqing Li
-Date: Sun, 28 Apr 2019 16:55:13 +0800
-Subject: [PATCH] From fb139d9707dabe1684b472a08a6eb5761ede4a3a Mon Sep 17
- 00:00:00 2001 From: Changqing Li Date: Tue, 12
- Feb 2019 14:56:16 +0800 Subject: [PATCH] opcache/config.m4: enable opcache
+opcache/config.m4: enable opcache
-We can't use AC_TRY_RUN to run programs in a cross compile environment. Set
-the variables directly instead since we know that we'd be running on latest
+We c
[oe] [meta-python][PATCH 2/2] python3-cryptography-vectors: merge bb and inc
From: Tim Orling
Signed-off-by: Tim Orling
---
.../python/python-cryptography-vectors.inc| 18
.../python3-cryptography-vectors_2.8.bb | 21 ++-
2 files changed, 20 insertions(+), 19 deletions(-)
delete mode 100644
meta-python/recipes-devtools/python/python-cryptography-vectors.inc
diff --git
a/meta-python/recipes-devtools/python/python-cryptography-vectors.inc
b/meta-python/recipes-devtools/python/python-cryptography-vectors.inc
deleted file mode 100644
index 10af48c9fb..00
--- a/meta-python/recipes-devtools/python/python-cryptography-vectors.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Test vectors for the cryptography package."
-HOMEPAGE = "https://cryptography.io/";
-SECTION = "devel/python"
-LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
-
-DEPENDS += " \
-${PYTHON_PN}-cryptography \
-"
-
-SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e"
-SRC_URI[sha256sum] =
"6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116"
-
-PYPI_PACKAGE = "cryptography_vectors"
-
-BBCLASSEXTEND = "native nativesdk"
-
-UPSTREAM_CHECK_REGEX = ""
diff --git
a/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb
b/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb
index 58994a..49a5664dcd 100644
--- a/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb
+++ b/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb
@@ -1,2 +1,21 @@
-inherit pypi setuptools3
require python-cryptography-vectors.inc
+SUMMARY = "Test vectors for the cryptography package."
+HOMEPAGE = "https://cryptography.io/";
+SECTION = "devel/python"
+LICENSE = "Apache-2.0 | BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
+
+SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e"
+SRC_URI[sha256sum] =
"6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116"
+
+PYPI_PACKAGE = "cryptography_vectors"
+
+inherit pypi setuptools3
+
+DEPENDS += " \
+${PYTHON_PN}-cryptography \
+"
+
+BBCLASSEXTEND = "native nativesdk"
+
+UPSTREAM_CHECK_REGEX = ""
--
2.25.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84098):
https://lists.openembedded.org/g/openembedded-devel/message/84098
Mute This Topic: https://lists.openembedded.org/mt/73277880/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 1/2] python3-cryptography: merge bb and inc
From: Tim Orling
Drop python-cryptography/ not used anywhere.
Signed-off-by: Tim Orling
---
.../python/python-cryptography.inc| 58 --
.../python/python-cryptography/run-ptest | 2 -
.../python/python3-cryptography_2.8.bb| 61 ++-
3 files changed, 59 insertions(+), 62 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python-cryptography.inc
delete mode 100644
meta-python/recipes-devtools/python/python-cryptography/run-ptest
diff --git a/meta-python/recipes-devtools/python/python-cryptography.inc
b/meta-python/recipes-devtools/python/python-cryptography.inc
deleted file mode 100644
index 5acd02d67d..00
--- a/meta-python/recipes-devtools/python/python-cryptography.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY = "Provides cryptographic recipes and primitives to python developers"
-HOMEPAGE = "https://cryptography.io/";
-LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124"
-
-LDSHARED += "-pthread"
-
-DEPENDS += " \
-${PYTHON_PN}-cffi \
-${PYTHON_PN}-cffi-native \
-${PYTHON_PN}-asn1crypto \
-${PYTHON_PN}-six \
-"
-
-SRC_URI[md5sum] = "77730058b556c6d9838679a94c6229ce"
-SRC_URI[sha256sum] =
"3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651"
-
-RDEPENDS_${PN} += " \
-${PYTHON_PN}-cffi \
-${PYTHON_PN}-idna \
-${PYTHON_PN}-asn1crypto \
-${PYTHON_PN}-setuptools \
-${PYTHON_PN}-six \
-"
-
-RDEPENDS_${PN}_class-target += " \
-${PYTHON_PN}-cffi \
-${PYTHON_PN}-idna \
-${PYTHON_PN}-numbers \
-${PYTHON_PN}-asn1crypto \
-${PYTHON_PN}-setuptools \
-${PYTHON_PN}-six \
-${PYTHON_PN}-threading \
-"
-
-RDEPENDS_${PN}-ptest += " \
-${PN} \
-${PYTHON_PN}-cryptography-vectors \
-${PYTHON_PN}-iso8601 \
-${PYTHON_PN}-pretend \
-${PYTHON_PN}-pytest \
-${PYTHON_PN}-pytz \
-"
-
-inherit ptest
-
-do_install_ptest() {
-install -d ${D}${PTEST_PATH}/tests
-cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-install -d ${D}${PTEST_PATH}/tests/hazmat
-cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/
-}
-
-FILES_${PN}-dbg += " \
-${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \
-"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python-cryptography/run-ptest
b/meta-python/recipes-devtools/python/python-cryptography/run-ptest
deleted file mode 100644
index 0ba239c2a4..00
--- a/meta-python/recipes-devtools/python/python-cryptography/run-ptest
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-py.test
diff --git a/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb
b/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb
index 195923343b..c75dabb974 100644
--- a/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb
+++ b/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb
@@ -1,8 +1,65 @@
-inherit pypi setuptools3
-require python-cryptography.inc
+SUMMARY = "Provides cryptographic recipes and primitives to python developers"
+HOMEPAGE = "https://cryptography.io/";
+SECTION = "devel/python"
+LICENSE = "Apache-2.0 | BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124"
LDSHARED += "-pthread"
+SRC_URI[md5sum] = "77730058b556c6d9838679a94c6229ce"
+SRC_URI[sha256sum] =
"3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651"
+
SRC_URI += " \
file://run-ptest \
"
+
+inherit pypi setuptools3
+
+DEPENDS += " \
+${PYTHON_PN}-cffi \
+${PYTHON_PN}-cffi-native \
+${PYTHON_PN}-asn1crypto \
+${PYTHON_PN}-six \
+"
+
+RDEPENDS_${PN} += " \
+${PYTHON_PN}-cffi \
+${PYTHON_PN}-idna \
+${PYTHON_PN}-asn1crypto \
+${PYTHON_PN}-setuptools \
+${PYTHON_PN}-six \
+"
+
+RDEPENDS_${PN}_class-target += " \
+${PYTHON_PN}-cffi \
+${PYTHON_PN}-idna \
+${PYTHON_PN}-numbers \
+${PYTHON_PN}-asn1crypto \
+${PYTHON_PN}-setuptools \
+${PYTHON_PN}-six \
+${PYTHON_PN}-threading \
+"
+
+RDEPENDS_${PN}-ptest += " \
+${PN} \
+${PYTHON_PN}-cryptography-vectors \
+${PYTHON_PN}-iso8601 \
+${PYTHON_PN}-pretend \
+${PYTHON_PN}-pytest \
+${PYTHON_PN}-pytz \
+"
+
+inherit ptest
+
+do_install_ptest() {
+install -d ${D}${PTEST_PATH}/tests
+cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+install -d ${D}${PTEST_PATH}/tests/hazmat
+cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/
+}
+
+FILES_${PN}-dbg += " \
+${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \
+"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.25.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#84097):
https://lists.openembedded.org/g/openembedded-devel/message/84097
Mute This Topic: https://lists.openembedded.org/mt/73277879/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembe
