Re: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta images in a new layer
niedz., 1 mar 2020 o 14:43 Otavio Salvador napisał(a): > > Hello, > > On Fri, Feb 28, 2020 at 12:03 PM Bartosz Golaszewski wrote: > ... > > Over-The-Air updates are a crucial part of IoT systems based on linux. > > There are several OTA update frameworks available and many offer some > > sort of support in yocto (e.g. meta-mender, meta-rauc). There are certain > > operations that are common to all of them such as: generating binary > > delta patches, system recovery, creating provisioning images etc. > > > > This patch proposes to add a new layer in meta-openembedded dedicated to > > OTA. As the first functionality it adds a bbclass for generating binary > > delta images using two popular algorithms - vcdiff and rsync. > > > > Such images can then be easily packaged in update artifacts for different > > OTA frameworks. > > > > Signed-off-by: Bartosz Golaszewski > > I see the value of this, as we are also doing OTA update framework > development, however I wonder if it is worth a new layer for this. For > now, I'd say to put it inside meta-oe directly. > This single class surely doesn't justify a new layer but I have a bunch of other stuff lined up for upstreaming if this is accepted. This is thematically separate from most of the recipes in meta-oe too. Bartosz -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/5] opencv: Enable pkg-config .pc file generation
Yes, you are right, these series of opencv patches are backport for zeus
branch. I missed the prefix while preparing and testing these patches. I had
resent them with the zeus branch prefix. Thank you for your correction.
-Original Message-
From: Khem Raj
Sent: Sunday, March 1, 2020 10:40 AM
To: Yeoh, Ee Peng
Cc: openembeded-devel ; Carlos
Rafael Giani
Subject: Re: [PATCH 1/5] opencv: Enable pkg-config .pc file generation
which branch is this intended for? it does not look it is for master since it
sounds more like backport, please add it to subject prefix so stable maintainer
can get notified about it.
On Sat, Feb 29, 2020 at 4:33 PM Yeoh Ee Peng wrote:
>
> From: Carlos Rafael Giani
>
> In OpenCV 4, .pc file generation is disabled by default. Yet, other
> software such as GStreamer and FFmpeg rely on the .pc files during
> build time configuration. Explicitely enable .pc file generation to
> make sure pkg-config can be used for getting information about OpenCV.
>
> Signed-off-by: Carlos Rafael Giani
> Signed-off-by: Khem Raj
> Signed-off-by: Yeoh Ee Peng
> ---
> meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> index 77b5dd6..5e89db0 100644
> --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> @@ -64,6 +64,7 @@ EXTRA_OECMAKE =
> "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
> -DCMAKE_SKIP_RPATH=ON \
> -DOPENCV_ICV_HASH=${IPP_MD5} \
> -DIPPROOT=${WORKDIR}/ippicv_lnx \
> +-DOPENCV_GENERATE_PKGCONFIG=ON \
> ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1
> -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
> ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1
> -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
> ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2",
> "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1
> -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
> --
> 2.7.4
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [zeus][[PATCH 2/5] opencv: don't download during configure
From: Ross Burton
OpenCV downloads data files during the CMake configure phase, which
is bad because fetching should only happen in do_fetch (and if proxies
are needed, won't be set in do_configure).
The recipe attempts to solve this already by having the repositories in
SRC_URI and moving the files to the correct place before do_configure().
However they are written to ${B} which is then wiped in do_configure so
they're not used.
The OpenCV download logic has a download cache with specially formatted
filenames, so take the downloaded files and populate the cache.
Signed-off-by: Ross Burton
Signed-off-by: Khem Raj
Signed-off-by: Yeoh Ee Peng
---
meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 5e89db0..cfc7854 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -51,10 +51,28 @@ PV = "4.1.0"
S = "${WORKDIR}/git"
+# OpenCV wants to download more files during configure. We download these in
+# do_fetch and construct a source cache in the format it expects
+OPENCV_DLDIR = "${WORKDIR}/downloads"
+
do_unpack_extra() {
tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
-cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
-cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
+
+md5() {
+# Return the MD5 of $1
+echo $(md5sum $1 | cut -d' ' -f1)
+}
+cache() {
+TAG=$1
+shift
+mkdir --parents ${OPENCV_DLDIR}/$TAG
+for F in $*; do
+DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F)
+test -e $DEST || ln -s $F $DEST
+done
+}
+cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
+cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
}
addtask unpack_extra after do_unpack before do_patch
@@ -65,6 +83,7 @@ EXTRA_OECMAKE =
"-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DOPENCV_ICV_HASH=${IPP_MD5} \
-DIPPROOT=${WORKDIR}/ippicv_lnx \
-DOPENCV_GENERATE_PKGCONFIG=ON \
+-DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1
-DENABLE_SSE42=1", "", d)} \
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [zeus][PATCH 5/5] opencv: abort configure if we need to download
From: Ross Burton
OpenCV's habit of downloading files during do_configure is bad form
(as it becomes impossible to do offline builds), so add an option to
error out if a download would be needed.
Signed-off-by: Ross Burton
Signed-off-by: Khem Raj
Signed-off-by: Yeoh Ee Peng
---
.../recipes-support/opencv/opencv/download.patch | 32 ++
meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 2 ++
2 files changed, 34 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
diff --git a/meta-oe/recipes-support/opencv/opencv/download.patch
b/meta-oe/recipes-support/opencv/opencv/download.patch
new file mode 100644
index 000..fa8db88
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/download.patch
@@ -0,0 +1,32 @@
+This CMake module will download files during do_configure. This is bad as it
+means we can't do offline builds.
+
+Add an option to disallow downloads by emitting a fatal error.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton
+
+diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
+index cdc47ad2cb..74573f45a2 100644
+--- a/cmake/OpenCVDownload.cmake
b/cmake/OpenCVDownload.cmake
+@@ -14,6 +14,7 @@
+ #RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will
be appended to it
+ # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is /.cache
+
++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads")
+ set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files")
+ if(DEFINED ENV{OPENCV_DOWNLOAD_PATH})
+ set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH
"${HELP_OPENCV_DOWNLOAD_PATH}")
+@@ -153,6 +154,11 @@ function(ocv_download)
+
+ # Download
+ if(NOT EXISTS "${CACHE_CANDIDATE}")
++if(NOT OPENCV_ALLOW_DOWNLOADS)
++ message(FATAL_ERROR "Not going to download ${DL_FILENAME}")
++ return()
++endif()
++
+ ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+ file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
+ INACTIVITY_TIMEOUT 60
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 03e4f58..f679ccb 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -48,6 +48,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
file://0003-To-fix-errors-as-following.patch \
file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
file://0001-Dont-use-isystem.patch \
+ file://download.patch \
"
PV = "4.1.0"
@@ -87,6 +88,7 @@ EXTRA_OECMAKE =
"-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DIPPROOT=${WORKDIR}/ippicv_lnx \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
+-DOPENCV_ALLOW_DOWNLOADS=OFF \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1
-DENABLE_SSE42=1", "", d)} \
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [zeus][PATCH 4/5] opencv: PACKAGECONFIG for G-API, use system ADE
From: Ross Burton
The Graph API is enabled by default, and if ADE isn't present it will
download a copy of the source during do_configure.
Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we
package.
Signed-off-by: Ross Burton
Signed-off-by: Khem Raj
Signed-off-by: Yeoh Ee Peng
---
meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 487393f..03e4f58 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -93,10 +93,11 @@ EXTRA_OECMAKE =
"-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
"
EXTRA_OECMAKE_append_x86 = " -DX86=ON"
-PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples
tbb gphoto2 \
+PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer
samples tbb gphoto2 \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "",
d)}"
+PACKAGECONFIG[gapi] = "-DWITH_ADE=ON
-Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
PACKAGECONFIG[amdblas] =
"-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
PACKAGECONFIG[amdfft] =
"-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON
-DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [zeus][[PATCH 3/5] opencv: also download face alignment data in do_fetch()
From: Ross Burton
The face alignment data is downloaded in do_configure, so download it in
do_fetch and add it to the cache.
Signed-off-by: Ross Burton
Signed-off-by: Khem Raj
Signed-off-by: Yeoh Ee Peng
---
meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index cfc7854..487393f 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -15,6 +15,7 @@ SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
+SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
def ipp_filename(d):
import re
@@ -41,6 +42,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp
\
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc
\
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg
\
+
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face
\
file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \
file://0003-To-fix-errors-as-following.patch \
@@ -73,6 +75,7 @@ do_unpack_extra() {
}
cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
+cache data ${WORKDIR}/face/*.dat
}
addtask unpack_extra after do_unpack before do_patch
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [zeus][PATCH 1/5] opencv: Enable pkg-config .pc file generation
From: Carlos Rafael Giani
In OpenCV 4, .pc file generation is disabled by default. Yet, other
software such as GStreamer and FFmpeg rely on the .pc files during build
time configuration. Explicitely enable .pc file generation to make sure
pkg-config can be used for getting information about OpenCV.
Signed-off-by: Carlos Rafael Giani
Signed-off-by: Khem Raj
Signed-off-by: Yeoh Ee Peng
---
meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 77b5dd6..5e89db0 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -64,6 +64,7 @@ EXTRA_OECMAKE =
"-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DCMAKE_SKIP_RPATH=ON \
-DOPENCV_ICV_HASH=${IPP_MD5} \
-DIPPROOT=${WORKDIR}/ippicv_lnx \
+-DOPENCV_GENERATE_PKGCONFIG=ON \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1
-DENABLE_SSE42=1", "", d)} \
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta images in a new layer
Hello, On Fri, Feb 28, 2020 at 12:03 PM Bartosz Golaszewski wrote: ... > Over-The-Air updates are a crucial part of IoT systems based on linux. > There are several OTA update frameworks available and many offer some > sort of support in yocto (e.g. meta-mender, meta-rauc). There are certain > operations that are common to all of them such as: generating binary > delta patches, system recovery, creating provisioning images etc. > > This patch proposes to add a new layer in meta-openembedded dedicated to > OTA. As the first functionality it adds a bbclass for generating binary > delta images using two popular algorithms - vcdiff and rsync. > > Such images can then be easily packaged in update artifacts for different > OTA frameworks. > > Signed-off-by: Bartosz Golaszewski I see the value of this, as we are also doing OTA update framework development, however I wonder if it is worth a new layer for this. For now, I'd say to put it inside meta-oe directly. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java] openjre-8 fmacro-prefix-map problem
Hi, On Wed, Feb 26, 2020 at 01:30:11PM -0500, Lennart Sorensen wrote: > On Mon, Sep 30, 2019, Vincent Prince wrote: > > Hello again, > > > > I see that there is a patch that should fix the problem: > > https://git.yoctoproject.org/cgit/cgit.cgi/meta-java/tree/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch > > It is applied but it seems target compilation options are non filtered? > > I just hit this problem too, and found out why it isn't filtering. > TARGET_CFLAGS isn't actually exported so the build can't use it to filter. > > Adding this to openjre-8_242.bb fixes the problem: > > export TARGET_CFLAGS > export TARGET_CXXFLAGS > > No more problem with the host gcc/g++ complaining about -fmacro-prefix-map > being unknown. Thanks for the pointer. I'll take a look into it! regards;rl > > I suspect openjdk-8 would need to same fix but I didn't build that yet. > > -- > Len Sorensen > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
