Patch review
cover Patch review
Here is the next set for meta-openembedded.
Please have reviews back by Friday.
The following changes since commit bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:
fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
Adrian Bunk (1):
wireshark: Upgrade 3.0.6 -> 3.0.8
Carlos Rafael Giani (1):
opencv: Enable pkg-config .pc file generation
Khem Raj (2):
ade: Fix install paths in multilib builds
sanlock: Replace cp -a with cp -R --no-dereference
Martin Jansa (1):
s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
use git fetcher instead of svn fetcher
Mike Krupicka (1):
mosquitto: Use mosquitto.init for daemon init
Paul Barker (1):
lmsensors: Fix sensord dependencies
Peter Kjellerstedt (2):
lvm2, libdevmapper: Do not patch configure
libldb: Do not require the "pam" distro feature to be enabled
Ross Burton (4):
opencv: don't download during configure
opencv: also download face alignment data in do_fetch()
opencv: PACKAGECONFIG for G-API, use system ADE
opencv: abort configure if we need to download
.../mosquitto/files/mosquitto.init | 2 +-
.../recipes-support/libldb/libldb_1.5.6.bb | 3 +-
...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} | 4 +-
.../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +-
...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++
.../recipes-extended/sanlock/sanlock_3.8.0.bb | 4 +-
...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------
...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++
meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 +
.../opencv/opencv/download.patch | 32 ++++++++++++
.../recipes-support/opencv/opencv_4.1.0.bb | 32 ++++++++++--
...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 ++-
...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +--
...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++--
.../{usbpath_svn.bb => usbpath_git.bb} | 10 ++--
.../{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 +++--
16 files changed, 183 insertions(+), 69 deletions(-)
rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%)
create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch
rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%)
rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%)
rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%)
rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)Signature · 1 line
2.17.1
PATCH 1/13 mosquitto: Use mosquitto.init for daemon init
From: Mike Krupicka <[email protected]>
Config file specification is missing in start) case. It is present already in restart) case.
--- .../recipes-connectivity/mosquitto/files/mosquitto.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/mosquitto/files/mosquitto.init +1 -1
@@ -38,7 +38,7 @@ export PATH="${PATH:+$PATH:}@SBINDIR@:@BASE_SBINDIR@" case "$1" in start) echo "Starting Mosquitto message broker" "mosquitto" - if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} ; then + if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c @SYSCONFDIR@/mosquitto/mosquitto.conf ; then exit 0 else exit 1
Signature · 1 line
2.17.1
PATCH 2/13 wireshark: Upgrade 3.0.6 -> 3.0.8
In reply to Armin KusterFrom: Adrian Bunk <[email protected]>
Upgrade on the 3.0 stable branch,
including fixes for CVE-2019-19553 and CVE-2020-7045.
---
.../wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%)meta-networking/recipes-support/wireshark/wireshark_3.0.8.bb renamed from meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb +2 -2
@@ -12,8 +12,8 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[md5sum] = "c6f8d12a3efe21cc7885f7cb0c4bd938" -SRC_URI[sha256sum] = "a87f4022a0c15ddbf1730bf1acafce9e75a4e657ce9fa494ceda0324c0c3e33e" +SRC_URI[md5sum] = "034f09e639fb4efebbc08af7b2a85333" +SRC_URI[sha256sum] = "b4bd8189934d82330a053c5b10398f2b625b1e1c8818831ab61739b2d7aa7561" PE = "1"
Signature · 1 line
2.17.1
PATCH 3/13 lvm2, libdevmapper: Do not patch configure
In reply to Armin KusterFrom: Peter Kjellerstedt <[email protected]>
Since the do_configure task regenerates the configure script, there is no need to patch it. Actually doing so will cause problems, which can be seen by doing:
bitbake lvm2 -c configure
bitbake lvm2 -c patch -f
--- ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------------ 1 file changed, 1 insertion(+), 33 deletions(-)
meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch +1 -33
@@ -4,44 +4,12 @@ Date: Mon, 19 Aug 2019 14:54:43 +0200 Subject: [PATCH] configure: Fix setting of CLDFLAGS default --- - configure | 6 +++--- configure.ac | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] Signed-off-by: Peter Kjellerstedt <[email protected]> -diff --git a/configure b/configure -index ff3a59b6b..4c8476502 100755 ---- a/configure -+++ b/configure -@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : - fi - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -3098,7 +3098,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -3111,7 +3111,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ;; - esac - diff --git a/configure.ac b/configure.ac index 5da694631..830edb8da 100644 --- a/configure.ac
Signature · 1 line
2.17.1
PATCH 4/13 lmsensors: Fix sensord dependencies
In reply to Armin KusterFrom: Paul Barker <[email protected]>
If sensord is removed from PACKAGECONFIG, the recipe should not depend on rrdtool and the lmsensors package should not depend on lmsensors-sensord.
Backport of 5674b0a9e8778f7538419451e629ef0c13711123 from master branch.
--- meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb +1 -2
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ DEPENDS = " \ bison-native \ flex-native \ - rrdtool \ virtual/libiconv \ "
@@ -93,7 +92,7 @@ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += " \ ${PN}-libsensors \ ${PN}-sensors \ - ${PN}-sensord \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ ${PN}-fancontrol \ ${PN}-sensorsdetect \ ${PN}-sensorsconfconvert \
Signature · 1 line
2.17.1
PATCH 5/13 libldb: Do not require the "pam" distro feature to be enabled
In reply to Armin KusterFrom: Peter Kjellerstedt <[email protected]>
It was only added because samba was a dependency, but was not removed again when the dependency on samba was removed in commit 6207331f.
This effectively reverts commit a190c2e3.
--- meta-networking/recipes-support/libldb/libldb_1.5.6.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta-networking/recipes-support/libldb/libldb_1.5.6.bb +1 -2
@@ -36,8 +36,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada SRC_URI[md5sum] = "fc58ef432c1fcb03fc3bb6cccce08977" SRC_URI[sha256sum] = "ff82474d0bf109e415a2d50334bde5715f486a53ff4bb8c7f74459dd229e975b" -inherit waf-samba distro_features_check -REQUIRED_DISTRO_FEATURES = "pam" +inherit waf-samba S = "${WORKDIR}/ldb-${PV}"
Signature · 1 line
2.17.1
PATCH 6/13 ade: Fix install paths in multilib builds
In reply to Armin KusterFrom: Khem Raj <[email protected]>
Fixes
ERROR: ade-0.1.1f-r0 do_package: QA Issue: ade: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/libade.a
--- ...tallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++++ meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 21:33:46 -0800 +Subject: [PATCH] use GNUInstallDirs for detecting install paths + +This helps with multilib builds + +Upstream-Status: Submitted [https://github.com/opencv/ade/pull/19] +Signed-off-by: Khem Raj <[email protected]> +--- + sources/ade/CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/sources/ade/CMakeLists.txt b/sources/ade/CMakeLists.txt +index 2d1dd20..46415d1 100644 +--- a/sources/ade/CMakeLists.txt ++++ b/sources/ade/CMakeLists.txt +@@ -47,12 +47,14 @@ if(BUILD_ADE_DOCUMENTATION) + VERBATIM) + endif() + ++include(GNUInstallDirs) ++ + install(TARGETS ade COMPONENT dev + EXPORT adeTargets +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib +- INCLUDES DESTINATION include) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + install(EXPORT adeTargets DESTINATION share/ade COMPONENT dev) + +-- +2.24.1 +
meta-oe/recipes-support/opencv/ade_0.1.1f.bb +1 -0
@@ -5,6 +5,7 @@ organizing data flow processing and execution." HOMEPAGE = "https://github.com/opencv/ade" SRC_URI = "git://github.com/opencv/ade.git \ + file://0001-use-GNUInstallDirs-for-detecting-install-paths.patch \ " SRCREV = "58b2595a1a95cc807be8bf6222f266a9a1f393a9"
Signature · 1 line
2.17.1
PATCH 7/13 opencv: Enable pkg-config .pc file generation
In reply to Armin KusterFrom: Carlos Rafael Giani <[email protected]>
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.
--- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-support/opencv/opencv_4.1.0.bb +1 -0
@@ -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)} \
Signature · 1 line
2.17.1
PATCH 8/13 opencv: don't download during configure
In reply to Armin KusterFrom: Ross Burton <[email protected]>
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.
--- .../recipes-support/opencv/opencv_4.1.0.bb | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
meta-oe/recipes-support/opencv/opencv_4.1.0.bb +21 -2
@@ -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)} \
Signature · 1 line
2.17.1
PATCH 9/13 opencv: also download face alignment data in do_fetch()
In reply to Armin KusterFrom: Ross Burton <[email protected]>
The face alignment data is downloaded in do_configure, so download it in do_fetch and add it to the cache.
--- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-support/opencv/opencv_4.1.0.bb +3 -0
@@ -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
Signature · 1 line
2.17.1
PATCH 10/13 opencv: PACKAGECONFIG for G-API, use system ADE
In reply to Armin KusterFrom: Ross Burton <[email protected]>
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.
--- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_4.1.0.bb +2 -1
@@ -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,"
Signature · 1 line
2.17.1
PATCH 11/13 opencv: abort configure if we need to download
In reply to Armin KusterFrom: Ross Burton <[email protected]>
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.
--- .../opencv/opencv/download.patch | 32 +++++++++++++++++++ .../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
meta-oe/recipes-support/opencv/opencv/download.patch new file +32 -0
@@ -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 <[email protected]> + +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 <opencv>/.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
meta-oe/recipes-support/opencv/opencv_4.1.0.bb +2 -0
@@ -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)} \
Signature · 1 line
2.17.1
PATCH 12/13 s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher
In reply to Armin KusterFrom: Martin Jansa <[email protected]>
* svn checkouts from http://svn.openmoko.org/ are now redirected to github:
svn --non-interactive --trust-server-cert co --no-auth-cache --ignore-externals -r 4949 http://svn.openmoko.org/trunk/src/target/gpio@4949 gpio
Redirecting to URL 'https://github.com/openmoko/openmoko-svn':
A gpio/branches A gpio/branches/oe A gpio/branches/oe/pre-20070305 A gpio/branches/oe/pre-20070305/README A gpio/branches/oe/pre-20070305/classes A gpio/branches/oe/pre-20070305/classes/autotools.bbclass A gpio/branches/oe/pre-20070305/classes/base.bbclass A gpio/branches/oe/pre-20070305/classes/openmoko-base.bbclass A gpio/branches/oe/pre-20070305/classes/openmoko-panel-plugin.bbclass
* unfortunately this is causing the checkout to start from trunk, not the subdirectory specified in the URL (e.g. /trunk/src/target/gpio) and then S variable points to incorrect directory as discussed here:
http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205028.html
* use git fetcher directly to remove the dependency on subversion-native
* for simplicity use the same SRCREV and PV for all of these, there wasn't any commit in last 8 years (not anyone can expect new commits), I don't expect anyone nowadays actually using these recipes which I've imported from meta-smartphone in 2011 - that's why I will send their removal in follow-up commit.
[ak: fixes build issue
WARNING: s3c24xx-gpio-1.0+svnr4949-r2 do_populate_lic: Could not copy license file /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c to /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/license-destdir/s3c24xx-gpio/gpio.c: [Errno 2] No such file or directory: '/home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c'
ERROR: s3c24xx-gpio-1.0+svnr4949-r2 do_populate_lic: QA Issue: s3c24xx-gpio: LIC_FILES_CHKSUM points to an invalid file: /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c [license-checksum]
]
---
.../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 +++----
.../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +++---
...ux-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++++------
.../usbpath/{usbpath_svn.bb => usbpath_git.bb} | 10 +++++-----
.../{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 ++++++-------
5 files changed, 22 insertions(+), 25 deletions(-)
rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%)
rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%)
rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%)
rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb renamed from meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb +3 -4
@@ -3,11 +3,10 @@ SECTION = "console/utils" AUTHOR = "Werner Almesberger <[email protected]>" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" -PR = "r2" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" S = "${WORKDIR}/gpio" CLEANBROKEN = "1"
meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb renamed from meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb +3 -3
@@ -3,10 +3,10 @@ SECTION = "console/utils" AUTHOR = "Werner Almesberger <[email protected]>" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" S = "${WORKDIR}/gpio" CLEANBROKEN = "1"
meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb renamed from meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +5 -6
@@ -3,13 +3,12 @@ SECTION = "devel" AUTHOR = "Harald Welte <[email protected]>" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" -SRCREV = "4268" -PV = "0.1+svnr${SRCPV}" -PR = "r1" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol=http \ - file://0001-ppt.c-Do-not-include-sys-io.h.patch \ - " +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/sjf2410-linux \ + file://0001-ppt.c-Do-not-include-sys-io.h.patch \ +" S = "${WORKDIR}/sjf2410-linux" inherit native deploy
meta-oe/recipes-support/usbpath/usbpath_git.bb renamed from meta-oe/recipes-support/usbpath/usbpath_svn.bb +5 -5
@@ -8,12 +8,12 @@ DEPENDS_class-native = "virtual/libusb0-native" BBCLASSEXTEND = "native" -SRCREV = "3172" -PV = "0.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \ - file://configure.patch" +PV = "1.0+git${SRCPV}" +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/usbpath \ + file://configure.patch \ +" S = "${WORKDIR}/usbpath" inherit autotools pkgconfig
meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb renamed from meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb +6 -7
@@ -2,14 +2,13 @@ SUMMARY = "Atheros 6K Wifi configuration utility" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" SECTION = "console/network" -SRCREV = "5394" -PV = "0.0.0+svnr${SRCPV}" -PR = "r2" +PV = "1.0+git${SRCPV}" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;protocol=http \ - file://0001-makefile-Pass-CFLAGS-to-compile.patch \ - file://0002-fix-err-API-to-have-format-string.patch \ - " +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/AR6kSDK.build_sw.18 \ + file://0001-makefile-Pass-CFLAGS-to-compile.patch \ + file://0002-fix-err-API-to-have-format-string.patch \ +" S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" CLEANBROKEN = "1"
Signature · 1 line
2.17.1
PATCH 13/13 sanlock: Replace cp -a with cp -R --no-dereference
In reply to Armin KusterFrom: Khem Raj <[email protected]>
helps to stop leaking builder's UID into sstate cache
Fixes
Exception: KeyError: 'getpwuid(): uid not found: 6000'
[ak: fixes build issue
Exception: KeyError: 'getpwuid(): uid not found: 1000']
--- ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++ .../recipes-extended/sanlock/sanlock_3.8.0.bb | 4 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch
meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch new file +51 -0
@@ -0,0 +1,51 @@ +From 78a9cffb1c760466933bbbcbae7ecb9b30a3e6a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 21 Nov 2019 13:47:42 -0800 +Subject: [PATCH] sanlock: Replace "cp -a" with "cp -R --no-dereference + --preserve=mode, links" + +Using "cp -a" leaks UID of user running the builds + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + src/Makefile | 8 ++++---- + wdmd/Makefile | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 533dd79..2fc9ba5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -127,9 +127,9 @@ install: all + $(INSTALL) -c -m 755 $(LIBSO_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(LIBPC_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig + $(INSTALL) -c -m 644 $(LIBPC_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig +- cp -a $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ +diff --git a/wdmd/Makefile b/wdmd/Makefile +index 5849efc..4894517 100644 +--- a/wdmd/Makefile ++++ b/wdmd/Makefile +@@ -68,7 +68,7 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8 + $(INSTALL) -c -m 755 $(CMD_TARGET) $(DESTDIR)/$(BINDIR) + $(INSTALL) -c -m 755 $(SHLIB_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8 +-- +2.24.0 +
meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb +3 -1
@@ -11,7 +11,9 @@ SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http" +SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ + " SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
look
Quoted 78 lines · Armin Kuster
Here is the next set for meta-openembedded.
Please have reviews back by Friday.The following changes since commit
bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contribstable/zeus-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nutAdrian Bunk (1):
wireshark: Upgrade 3.0.6 -> 3.0.8Carlos Rafael Giani (1):
opencv: Enable pkg-config .pc file generationKhem Raj (2):
ade: Fix install paths in multilib builds
sanlock: Replace cp -a with cp -R --no-dereferenceMartin Jansa (1):
s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
use git fetcher instead of svn fetcherMike Krupicka (1):
mosquitto: Use mosquitto.init for daemon initPaul Barker (1):
lmsensors: Fix sensord dependenciesPeter Kjellerstedt (2):
lvm2, libdevmapper: Do not patch configure
libldb: Do not require the "pam" distro feature to be enabledRoss Burton (4):
opencv: don't download during configure
opencv: also download face alignment data indo_fetch()
opencv: PACKAGECONFIG for G-API, use system ADE
opencv: abort configure if we need to download.../mosquitto/files/mosquitto.init | 2 +- .../recipes-support/libldb/libldb_1.5.6.bb | 3 +- ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} | 4 +- .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +- ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++ .../recipes-extended/sanlock/sanlock_3.8.0.bb | 4 +- ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------ ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++ meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 + .../opencv/opencv/download.patch | 32 ++++++++++++ .../recipes-support/opencv/opencv_4.1.0.bb | 32 ++++++++++-- ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 ++- ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +-- ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++-- .../{usbpath_svn.bb => usbpath_git.bb} | 10 ++-- .../{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 +++-- 16 files changed, 183 insertions(+), 69 deletions(-) rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%) create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%) rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%) rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%) rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%) rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)--
2.17.1--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 1 line · Khem Raj
look
What does that mean?
- armin
Quoted 79 lines · Armin Kuster
Quoted 77 lines
Here is the next set for meta-openembedded.
Please have reviews back by Friday.The following changes since commit
bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contribstable/zeus-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nutAdrian Bunk (1):
wireshark: Upgrade 3.0.6 -> 3.0.8Carlos Rafael Giani (1):
opencv: Enable pkg-config .pc file generationKhem Raj (2):
ade: Fix install paths in multilib builds
sanlock: Replace cp -a with cp -R --no-dereferenceMartin Jansa (1):
s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
use git fetcher instead of svn fetcherMike Krupicka (1):
mosquitto: Use mosquitto.init for daemon initPaul Barker (1):
lmsensors: Fix sensord dependenciesPeter Kjellerstedt (2):
lvm2, libdevmapper: Do not patch configure
libldb: Do not require the "pam" distro feature to be enabledRoss Burton (4):
opencv: don't download during configure
opencv: also download face alignment data indo_fetch()
opencv: PACKAGECONFIG for G-API, use system ADE
opencv: abort configure if we need to download.../mosquitto/files/mosquitto.init | 2 +- .../recipes-support/libldb/libldb_1.5.6.bb | 3 +- ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} | 4 +- .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +- ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++ .../recipes-extended/sanlock/sanlock_3.8.0.bb | 4 +- ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------ ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++ meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 + .../opencv/opencv/download.patch | 32 ++++++++++++ .../recipes-support/opencv/opencv_4.1.0.bb | 32 ++++++++++-- ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 ++- ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +-- ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++-- .../{usbpath_svn.bb => usbpath_git.bb} | 10 ++-- .../{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 +++-- 16 files changed, 183 insertions(+), 69 deletions(-) rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%) create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%) rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%) rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%) rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%) rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)--
2.17.1--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 5 lines · On Thu, Mar 19, 2020 at 4:16 PM akuster808 <[email protected]> wrote:
Quoted 1 line · Khem Raj
look
What does that mean?
This is an all time favorite terse Khem review!
Quoted 98 lines
- armin
Quoted 2 lines
On Wed, Mar 11, 2020 at 7:58 PM Armin Kuster <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines
Here is the next set for meta-openembedded.
Please have reviews back by Friday.The following changes since commit
bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:Quoted 7 lines
Quoted 7 lines
fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contribstable/zeus-nuthttp://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
Quoted 41 lines
Quoted 41 lines
Adrian Bunk (1):
wireshark: Upgrade 3.0.6 -> 3.0.8Carlos Rafael Giani (1):
opencv: Enable pkg-config .pc file generationKhem Raj (2):
ade: Fix install paths in multilib builds
sanlock: Replace cp -a with cp -R --no-dereferenceMartin Jansa (1):
s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
use git fetcher instead of svn fetcherMike Krupicka (1):
mosquitto: Use mosquitto.init for daemon initPaul Barker (1):
lmsensors: Fix sensord dependenciesPeter Kjellerstedt (2):
lvm2, libdevmapper: Do not patch configure
libldb: Do not require the "pam" distro feature to be enabledRoss Burton (4):
opencv: don't download during configure
opencv: also download face alignment data indo_fetch()
opencv: PACKAGECONFIG for G-API, use system ADE
opencv: abort configure if we need to download.../mosquitto/files/mosquitto.init | 2 +- .../recipes-support/libldb/libldb_1.5.6.bb | 3 +- ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} | 4 +- .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +- ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++ .../recipes-extended/sanlock/sanlock_3.8.0.bb | 4 +- ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------ ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++ meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 + .../opencv/opencv/download.patch | 32 ++++++++++++Quoted 8 lines
Quoted 8 lines
.../recipes-support/opencv/opencv_4.1.0.bb | 32 ++++++++++-- ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 ++- ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +-- ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++-- .../{usbpath_svn.bb => usbpath_git.bb} | 10 ++-- .../{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 +++-- 16 files changed, 183 insertions(+), 69 deletions(-) rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb=> wireshark_3.0.8.bb} (95%)
Quoted 1 line
Quoted 1 line
create mode 100644
meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patchQuoted 1 line
Quoted 1 line
create mode 100644
meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patchQuoted 2 lines
Quoted 2 lines
create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb=> s3c24xx-gpio_git.bb} (73%)
Quoted 1 line
Quoted 1 line
rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb=> s3c64xx-gpio_git.bb} (74%)
Quoted 1 line
Quoted 1 line
rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%)
Quoted 1 line
Quoted 1 line
rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb =>usbpath_git.bb} (68%)
Quoted 1 line
Quoted 1 line
rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb =>wmiconfig_git.bb} (58%)
Quoted 9 lines
Quoted 9 lines
--
2.17.1--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 6 lines · On Thu, Mar 19, 2020 at 4:16 PM akuster808 <[email protected]> wrote:
Quoted 1 line · Khem Raj
look
What does that mean?
s OK got stuck in transmission.
Quoted 82 lines
- armin
Quoted 79 lines · Armin Kuster
Quoted 77 lines
Here is the next set for meta-openembedded.
Please have reviews back by Friday.The following changes since commit
bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c:fluentbit: Fix packaging in multilib env (2020-01-30 18:38:10 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contribstable/zeus-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nutAdrian Bunk (1):
wireshark: Upgrade 3.0.6 -> 3.0.8Carlos Rafael Giani (1):
opencv: Enable pkg-config .pc file generationKhem Raj (2):
ade: Fix install paths in multilib builds
sanlock: Replace cp -a with cp -R --no-dereferenceMartin Jansa (1):
s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig:
use git fetcher instead of svn fetcherMike Krupicka (1):
mosquitto: Use mosquitto.init for daemon initPaul Barker (1):
lmsensors: Fix sensord dependenciesPeter Kjellerstedt (2):
lvm2, libdevmapper: Do not patch configure
libldb: Do not require the "pam" distro feature to be enabledRoss Burton (4):
opencv: don't download during configure
opencv: also download face alignment data indo_fetch()
opencv: PACKAGECONFIG for G-API, use system ADE
opencv: abort configure if we need to download.../mosquitto/files/mosquitto.init | 2 +- .../recipes-support/libldb/libldb_1.5.6.bb | 3 +- ...{wireshark_3.0.6.bb => wireshark_3.0.8.bb} | 4 +- .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +- ...cp-a-with-cp-R-no-dereference-preser.patch | 51 +++++++++++++++++++ .../recipes-extended/sanlock/sanlock_3.8.0.bb | 4 +- ...gure-Fix-setting-of-CLDFLAGS-default.patch | 34 +------------ ...tallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++ meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 + .../opencv/opencv/download.patch | 32 ++++++++++++ .../recipes-support/opencv/opencv_4.1.0.bb | 32 ++++++++++-- ...3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 ++- ...3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +-- ...ive_svn.bb => sjf2410-linux-native_git.bb} | 11 ++-- .../{usbpath_svn.bb => usbpath_git.bb} | 10 ++-- .../{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 +++-- 16 files changed, 183 insertions(+), 69 deletions(-) rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%) create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%) rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%) rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%) rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%) rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%)--
2.17.1--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel