* [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232
@ 2017-05-09 18:06 Denys Dmytriyenko
2017-05-09 18:06 ` [master/morty][PATCH 2/6] wayland-ivi-extension: depend on wayland-native for wayland-scanner Denys Dmytriyenko
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Denys Dmytriyenko @ 2017-05-09 18:06 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
...emd-network-ipv4ll-probe-conflict-counter.patch | 48 ----------------------
.../recipes-core/systemd/systemd_%.bbappend | 1 -
2 files changed, 49 deletions(-)
delete mode 100644 meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch
diff --git a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch b/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch
deleted file mode 100644
index 557a297..0000000
--- a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1e47842a0144c501cc6fd7ccc7996761f3e32ea9 Mon Sep 17 00:00:00 2001
-From: Jason Reeder <jasonreeder@gmail.com>
-Date: Mon, 3 Apr 2017 12:07:17 -0500
-Subject: [PATCH 1/3] libsystemd-network: ipv4ll probe conflict counter
-
-A bug exists where the conflict counter is cleared
-regardless of whether or not the next probe attempt leads to
-a successful address acquisition. This causes 'bursts' of
-MAX_CONFLICTS probes followed by a delay of
-RATE_LIMIT_INTERVAL instead of a single probe each
-RATE_LIMIT_INTERVAL when beyond MAX_CONFLICTS.
-
-The conflict counter should only be cleared after an
-address is successfully acquired. This commit achieves that
-goal.
-
-From RFC3927:
-A host should maintain a counter of the number of address
-conflicts it has experienced in the process of trying to
-acquire an address, and if the number of conflicts exceeds
-MAX_CONFLICTS then the host MUST limit the rate at which it
-probes for new addresses to no more than one new address per
-RATE_LIMIT_INTERVAL. This is to prevent catastrophic ARP
-storms in pathological failure cases, such as a rogue host
-that answers all ARP probes, causing legitimate hosts to go
-into an infinite loop attempting to select a usable address.
-
-Signed-off-by: Jason Reeder <jasonreeder@gmail.com>
----
- src/libsystemd-network/sd-ipv4acd.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
-index cc7436d..97f37f2 100644
---- a/src/libsystemd-network/sd-ipv4acd.c
-+++ b/src/libsystemd-network/sd-ipv4acd.c
-@@ -249,8 +249,6 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata)
- r = ipv4acd_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT);
- if (r < 0)
- goto out;
--
-- ll->conflict = 0;
- } else {
- r = ipv4acd_set_next_wakeup(ll, 0, PROBE_WAIT);
- if (r < 0)
---
-1.9.1
-
diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
index 8fccdb5..5f54316 100644
--- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend
@@ -14,7 +14,6 @@ SRC_URI_append = " \
file://30-wlan.network \
file://60-usb.network \
file://sync-clocks.service \
- file://0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch \
file://0002-libsystemd-network-sd-ipv4ll-Wrapper-to-restart-addr.patch \
file://0003-libsystemd-network-sd-ipv4ll-acquire-new-address-aft.patch \
"
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [master/morty][PATCH 2/6] wayland-ivi-extension: depend on wayland-native for wayland-scanner 2017-05-09 18:06 [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Denys Dmytriyenko @ 2017-05-09 18:06 ` Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 3/6] linux-libc-headers: remove 4.4 bbappend Denys Dmytriyenko ` (4 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2017-05-09 18:06 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- .../recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb index 157e1ee..75e284f 100644 --- a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb +++ b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ S = "${WORKDIR}/git" -DEPENDS = "weston virtual/libgles2 pixman" +DEPENDS = "weston virtual/libgles2 pixman wayland-native" inherit cmake -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [master][PATCH 3/6] linux-libc-headers: remove 4.4 bbappend 2017-05-09 18:06 [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Denys Dmytriyenko 2017-05-09 18:06 ` [master/morty][PATCH 2/6] wayland-ivi-extension: depend on wayland-native for wayland-scanner Denys Dmytriyenko @ 2017-05-09 18:06 ` Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 4/6] openssl: adjust bbappend to the latest version Denys Dmytriyenko ` (3 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2017-05-09 18:06 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- .../linux-libc-headers/linux-libc-headers_4.4.bbappend | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_4.4.bbappend diff --git a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_4.4.bbappend b/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_4.4.bbappend deleted file mode 100644 index 7d0537d..0000000 --- a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_4.4.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -PR_append = ".arago0" - -BRANCH = "ti-lsk-linux-4.4.y" -SRCREV = "6580f85400b48d55d06f11d6b75c056399123a72" - -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "git" -SRC_URI = "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH}" - -S = "${WORKDIR}/git" -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [master][PATCH 4/6] openssl: adjust bbappend to the latest version 2017-05-09 18:06 [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Denys Dmytriyenko 2017-05-09 18:06 ` [master/morty][PATCH 2/6] wayland-ivi-extension: depend on wayland-native for wayland-scanner Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 3/6] linux-libc-headers: remove 4.4 bbappend Denys Dmytriyenko @ 2017-05-09 18:06 ` Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 5/6] packagegroup-*-graphics: disable wayland-ivi-extension due to breakage with weston 2.0 Denys Dmytriyenko ` (2 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2017-05-09 18:06 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- .../openssl/{openssl_1.0.2j.bbappend => openssl_1.0.2k.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-arago-distro/recipes-connectivity/openssl/{openssl_1.0.2j.bbappend => openssl_1.0.2k.bbappend} (100%) diff --git a/meta-arago-distro/recipes-connectivity/openssl/openssl_1.0.2j.bbappend b/meta-arago-distro/recipes-connectivity/openssl/openssl_1.0.2k.bbappend similarity index 100% rename from meta-arago-distro/recipes-connectivity/openssl/openssl_1.0.2j.bbappend rename to meta-arago-distro/recipes-connectivity/openssl/openssl_1.0.2k.bbappend -- 2.7.4 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [master][PATCH 5/6] packagegroup-*-graphics: disable wayland-ivi-extension due to breakage with weston 2.0 2017-05-09 18:06 [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Denys Dmytriyenko ` (2 preceding siblings ...) 2017-05-09 18:06 ` [master][PATCH 4/6] openssl: adjust bbappend to the latest version Denys Dmytriyenko @ 2017-05-09 18:06 ` Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 6/6] opencv: overlay 3.1 locally, needed for TI customizations and HW acceleration Denys Dmytriyenko 2017-05-09 19:49 ` [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Jason Reeder 5 siblings, 0 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2017-05-09 18:06 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- .../recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb index 5dae1b5..1d793d6 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb @@ -4,11 +4,11 @@ PR = "r16" inherit packagegroup +# wayland-ivi-extension GRAPHICS_WESTON = "\ weston \ weston-init \ weston-examples \ - wayland-ivi-extension \ " GRAPHICS_RDEPENDS = "\ -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [master][PATCH 6/6] opencv: overlay 3.1 locally, needed for TI customizations and HW acceleration 2017-05-09 18:06 [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Denys Dmytriyenko ` (3 preceding siblings ...) 2017-05-09 18:06 ` [master][PATCH 5/6] packagegroup-*-graphics: disable wayland-ivi-extension due to breakage with weston 2.0 Denys Dmytriyenko @ 2017-05-09 18:06 ` Denys Dmytriyenko 2017-05-09 19:49 ` [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Jason Reeder 5 siblings, 0 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2017-05-09 18:06 UTC (permalink / raw) To: meta-arago From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- ...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 28 ++++ .../recipes-support/opencv/opencv/fixgcc60.patch | 30 ++++ .../opencv/opencv/fixpkgconfig.patch | 29 ++++ .../recipes-support/opencv/opencv_3.1.bb | 161 +++++++++++++++++++++ 4 files changed, 248 insertions(+) create mode 100644 meta-arago-extras/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch create mode 100644 meta-arago-extras/recipes-support/opencv/opencv/fixgcc60.patch create mode 100644 meta-arago-extras/recipes-support/opencv/opencv/fixpkgconfig.patch create mode 100644 meta-arago-extras/recipes-support/opencv/opencv_3.1.bb diff --git a/meta-arago-extras/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-arago-extras/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch new file mode 100644 index 0000000..d568018 --- /dev/null +++ b/meta-arago-extras/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch @@ -0,0 +1,28 @@ +From 049f931207631aa54af55a2917318d032b2ef3fa Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> +Date: Thu, 31 Mar 2016 00:20:15 +0200 +Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp + +Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> +--- + 3rdparty/ippicv/downloader.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/3rdparty/ippicv/downloader.cmake b/3rdparty/ippicv/downloader.cmake +index a6016dbe10bc..af4062c8e95e 100644 +--- a/3rdparty/ippicv/downloader.cmake ++++ b/3rdparty/ippicv/downloader.cmake +@@ -31,8 +31,10 @@ function(_icv_downloader) + return() # Not supported + endif() + ++ if(NOT DEFINED OPENCV_ICV_PATH) + set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack") + set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}") ++ endif() + + if(DEFINED OPENCV_ICV_PACKAGE_DOWNLOADED + AND OPENCV_ICV_PACKAGE_DOWNLOADED STREQUAL OPENCV_ICV_PACKAGE_HASH +-- +2.8.0.rc3 + diff --git a/meta-arago-extras/recipes-support/opencv/opencv/fixgcc60.patch b/meta-arago-extras/recipes-support/opencv/opencv/fixgcc60.patch new file mode 100644 index 0000000..5d0bf97 --- /dev/null +++ b/meta-arago-extras/recipes-support/opencv/opencv/fixgcc60.patch @@ -0,0 +1,30 @@ +diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake +index 28ccc1c6be4f..b0e1cbf77287 100644 +--- a/cmake/OpenCVPCHSupport.cmake ++++ b/cmake/OpenCVPCHSupport.cmake +@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) + ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion + OUTPUT_VARIABLE gcc_compiler_version) + #MESSAGE("GCC Version: ${gcc_compiler_version}") +- IF(gcc_compiler_version VERSION_GREATER "4.2.-1") ++ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0") + SET(PCHSupport_FOUND TRUE) + ENDIF() + +diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake +index 3a23cd73633d..1fea1578b1d9 100644 +--- a/cmake/OpenCVUtils.cmake ++++ b/cmake/OpenCVUtils.cmake +@@ -76,7 +76,11 @@ function(ocv_include_directories) + if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}") + list(APPEND __add_before "${dir}") + else() +- include_directories(AFTER SYSTEM "${dir}") ++ if (gcc_compiler_version VERSION_LESS "6.0.0") ++ include_directories(AFTER SYSTEM "${dir}") ++ else() ++ include_directories(AFTER "${dir}") ++ endif() + endif() + endforeach() + include_directories(BEFORE ${__add_before}) diff --git a/meta-arago-extras/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-arago-extras/recipes-support/opencv/opencv/fixpkgconfig.patch new file mode 100644 index 0000000..3aeda7d --- /dev/null +++ b/meta-arago-extras/recipes-support/opencv/opencv/fixpkgconfig.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake +index b8cb8777c06b..75281ee964fd 100644 +--- a/cmake/OpenCVGenPkgconfig.cmake ++++ b/cmake/OpenCVGenPkgconfig.cmake +@@ -27,7 +27,7 @@ macro(fix_prefix lst isown) + get_filename_component(libdir "${item}" PATH) + get_filename_component(libname "${item}" NAME_WE) + string(REGEX REPLACE "^lib(.*)" "\\1" libname "${libname}") +- list(APPEND _lst "-L${libdir}" "-l${libname}") ++ list(APPEND _lst "-l${libname}") + else() + list(APPEND _lst "-l${item}") + endif() +@@ -66,10 +66,14 @@ ocv_list_unique(_3rdparty) + + set(OPENCV_PC_LIBS + "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" ++ "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" + "${_modules}" + ) + if (BUILD_SHARED_LIBS) +- set(OPENCV_PC_LIBS_PRIVATE "${_extra}") ++ set(OPENCV_PC_LIBS_PRIVATE ++ "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}" ++ "${_extra}" ++ ) + else() + set(OPENCV_PC_LIBS_PRIVATE + "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}" diff --git a/meta-arago-extras/recipes-support/opencv/opencv_3.1.bb b/meta-arago-extras/recipes-support/opencv/opencv_3.1.bb new file mode 100644 index 0000000..2851233 --- /dev/null +++ b/meta-arago-extras/recipes-support/opencv/opencv_3.1.bb @@ -0,0 +1,161 @@ +SUMMARY = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://opencv.org/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf" + +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native" + +SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" +SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" +SRCREV_party3 = "81a676001ca8075ada498583e4166079e5744668" +IPP_MD5 = "808b791a6eac9ed78d32a7666804320e" + +SRCREV_FORMAT = "opencv" +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \ + file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ + file://fixgcc60.patch \ + file://fixpkgconfig.patch \ +" + +PV = "3.1+git${SRCPV}" + +S = "${WORKDIR}/git" + +do_unpack_extra() { + tar xzf ${WORKDIR}/party3/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR} +} +addtask unpack_extra after do_unpack before do_patch + +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ + -DWITH_1394=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \ + -DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \ + ${@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)} \ + ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ + ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ +" +EXTRA_OECMAKE_append_x86 = " -DX86=ON" + +PACKAGECONFIG ??= "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[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," +PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON,-DBUILD_opencv_dnn=OFF,lapack," +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," +PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," +PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," +PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," +PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," +PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," +PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," +PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," +PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," +PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," + +inherit pkgconfig cmake + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} + +export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" +export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" +export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" +export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" +export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" + +TARGET_CC_ARCH += "-I${S}/include " + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${PN}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${PN}', '', d)} \ + ${PN}-apps" + +python populate_packages_prepend () { + cv_libdir = d.expand('${libdir}') + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = d.getVar('PN') + metapkg = pn + '-dev' + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = d.getVar('PACKAGES').split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) + + metapkg = pn + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) + +} + +PACKAGES_DYNAMIC += "^libopencv-.*" + +FILES_${PN} = "" +FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake" +FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a" +FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" +FILES_${PN}-java = "${datadir}/OpenCV/java" +FILES_${PN}-samples = "${datadir}/OpenCV/samples/" + +INSANE_SKIP_${PN}-java = "libdir" +INSANE_SKIP_${PN}-dbg = "libdir" + +ALLOW_EMPTY_${PN} = "1" + +SUMMARY_python-opencv = "Python bindings to opencv" +FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python-opencv = "python-core python-numpy" + +SUMMARY_python3-opencv = "Python bindings to opencv" +FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python3-opencv = "python3-core python3-numpy" + +do_install_append() { + cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ + sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h + + # Move Python files into correct library folder (for multilib build) + if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then + mv ${D}/usr/lib/* ${D}/${libdir}/ + rm -rf ${D}/usr/lib + fi + + if ${@bb.utils.contains("PACKAGECONFIG", "samples", "true", "false", d)}; then + install -d ${D}${datadir}/OpenCV/samples/bin/ + cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ + fi +} -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 2017-05-09 18:06 [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Denys Dmytriyenko ` (4 preceding siblings ...) 2017-05-09 18:06 ` [master][PATCH 6/6] opencv: overlay 3.1 locally, needed for TI customizations and HW acceleration Denys Dmytriyenko @ 2017-05-09 19:49 ` Jason Reeder 2017-05-09 20:02 ` Denys Dmytriyenko 5 siblings, 1 reply; 11+ messages in thread From: Jason Reeder @ 2017-05-09 19:49 UTC (permalink / raw) To: Denys Dmytriyenko, meta-arago Denys, this first patch didn't make it into systemd until v233. The next two patches have been merged upstream but won't be in a tagged release until the upcoming v234. Jason On 05/09/2017 01:06 PM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <denys@ti.com> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > --- > ...emd-network-ipv4ll-probe-conflict-counter.patch | 48 ---------------------- > .../recipes-core/systemd/systemd_%.bbappend | 1 - > 2 files changed, 49 deletions(-) > delete mode 100644 meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > > diff --git a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch b/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > deleted file mode 100644 > index 557a297..0000000 > --- a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From 1e47842a0144c501cc6fd7ccc7996761f3e32ea9 Mon Sep 17 00:00:00 2001 > -From: Jason Reeder <jasonreeder@gmail.com> > -Date: Mon, 3 Apr 2017 12:07:17 -0500 > -Subject: [PATCH 1/3] libsystemd-network: ipv4ll probe conflict counter > - > -A bug exists where the conflict counter is cleared > -regardless of whether or not the next probe attempt leads to > -a successful address acquisition. This causes 'bursts' of > -MAX_CONFLICTS probes followed by a delay of > -RATE_LIMIT_INTERVAL instead of a single probe each > -RATE_LIMIT_INTERVAL when beyond MAX_CONFLICTS. > - > -The conflict counter should only be cleared after an > -address is successfully acquired. This commit achieves that > -goal. > - > -From RFC3927: > -A host should maintain a counter of the number of address > -conflicts it has experienced in the process of trying to > -acquire an address, and if the number of conflicts exceeds > -MAX_CONFLICTS then the host MUST limit the rate at which it > -probes for new addresses to no more than one new address per > -RATE_LIMIT_INTERVAL. This is to prevent catastrophic ARP > -storms in pathological failure cases, such as a rogue host > -that answers all ARP probes, causing legitimate hosts to go > -into an infinite loop attempting to select a usable address. > - > -Signed-off-by: Jason Reeder <jasonreeder@gmail.com> > ---- > - src/libsystemd-network/sd-ipv4acd.c | 2 -- > - 1 file changed, 2 deletions(-) > - > -diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c > -index cc7436d..97f37f2 100644 > ---- a/src/libsystemd-network/sd-ipv4acd.c > -+++ b/src/libsystemd-network/sd-ipv4acd.c > -@@ -249,8 +249,6 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata) > - r = ipv4acd_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT); > - if (r < 0) > - goto out; > -- > -- ll->conflict = 0; > - } else { > - r = ipv4acd_set_next_wakeup(ll, 0, PROBE_WAIT); > - if (r < 0) > --- > -1.9.1 > - > diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > index 8fccdb5..5f54316 100644 > --- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > +++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > @@ -14,7 +14,6 @@ SRC_URI_append = " \ > file://30-wlan.network \ > file://60-usb.network \ > file://sync-clocks.service \ > - file://0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch \ > file://0002-libsystemd-network-sd-ipv4ll-Wrapper-to-restart-addr.patch \ > file://0003-libsystemd-network-sd-ipv4ll-acquire-new-address-aft.patch \ > " > -- Jason Reeder ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 2017-05-09 19:49 ` [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Jason Reeder @ 2017-05-09 20:02 ` Denys Dmytriyenko 2017-05-11 18:32 ` Denys Dmytriyenko 0 siblings, 1 reply; 11+ messages in thread From: Denys Dmytriyenko @ 2017-05-09 20:02 UTC (permalink / raw) To: Jason Reeder; +Cc: meta-arago Jason, Ah, you are right - it just failed to apply cleanly and I assumed it was already merged in. We either need to update the patch against 232, or since this is master, there are high chances for systemd to be updated in OE-Core before the next release later in the fall, which would have this patch integrated in upstream. Preferences? -- Denys On Tue, May 09, 2017 at 02:49:05PM -0500, Jason Reeder wrote: > Denys, this first patch didn't make it into systemd until v233. The next two > patches have been merged upstream but won't be in a tagged release until the > upcoming v234. > > Jason > > On 05/09/2017 01:06 PM, Denys Dmytriyenko wrote: > > From: Denys Dmytriyenko <denys@ti.com> > > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > > --- > > ...emd-network-ipv4ll-probe-conflict-counter.patch | 48 ---------------------- > > .../recipes-core/systemd/systemd_%.bbappend | 1 - > > 2 files changed, 49 deletions(-) > > delete mode 100644 meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > > > > diff --git a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch b/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > > deleted file mode 100644 > > index 557a297..0000000 > > --- a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > > +++ /dev/null > > @@ -1,48 +0,0 @@ > > -From 1e47842a0144c501cc6fd7ccc7996761f3e32ea9 Mon Sep 17 00:00:00 2001 > > -From: Jason Reeder <jasonreeder@gmail.com> > > -Date: Mon, 3 Apr 2017 12:07:17 -0500 > > -Subject: [PATCH 1/3] libsystemd-network: ipv4ll probe conflict counter > > - > > -A bug exists where the conflict counter is cleared > > -regardless of whether or not the next probe attempt leads to > > -a successful address acquisition. This causes 'bursts' of > > -MAX_CONFLICTS probes followed by a delay of > > -RATE_LIMIT_INTERVAL instead of a single probe each > > -RATE_LIMIT_INTERVAL when beyond MAX_CONFLICTS. > > - > > -The conflict counter should only be cleared after an > > -address is successfully acquired. This commit achieves that > > -goal. > > - > > -From RFC3927: > > -A host should maintain a counter of the number of address > > -conflicts it has experienced in the process of trying to > > -acquire an address, and if the number of conflicts exceeds > > -MAX_CONFLICTS then the host MUST limit the rate at which it > > -probes for new addresses to no more than one new address per > > -RATE_LIMIT_INTERVAL. This is to prevent catastrophic ARP > > -storms in pathological failure cases, such as a rogue host > > -that answers all ARP probes, causing legitimate hosts to go > > -into an infinite loop attempting to select a usable address. > > - > > -Signed-off-by: Jason Reeder <jasonreeder@gmail.com> > > ---- > > - src/libsystemd-network/sd-ipv4acd.c | 2 -- > > - 1 file changed, 2 deletions(-) > > - > > -diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c > > -index cc7436d..97f37f2 100644 > > ---- a/src/libsystemd-network/sd-ipv4acd.c > > -+++ b/src/libsystemd-network/sd-ipv4acd.c > > -@@ -249,8 +249,6 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata) > > - r = ipv4acd_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT); > > - if (r < 0) > > - goto out; > > -- > > -- ll->conflict = 0; > > - } else { > > - r = ipv4acd_set_next_wakeup(ll, 0, PROBE_WAIT); > > - if (r < 0) > > --- > > -1.9.1 > > - > > diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > > index 8fccdb5..5f54316 100644 > > --- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > > +++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > > @@ -14,7 +14,6 @@ SRC_URI_append = " \ > > file://30-wlan.network \ > > file://60-usb.network \ > > file://sync-clocks.service \ > > - file://0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch \ > > file://0002-libsystemd-network-sd-ipv4ll-Wrapper-to-restart-addr.patch \ > > file://0003-libsystemd-network-sd-ipv4ll-acquire-new-address-aft.patch \ > > " > > > > -- > Jason Reeder > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 2017-05-09 20:02 ` Denys Dmytriyenko @ 2017-05-11 18:32 ` Denys Dmytriyenko 2017-05-11 18:56 ` Jason Reeder 0 siblings, 1 reply; 11+ messages in thread From: Denys Dmytriyenko @ 2017-05-11 18:32 UTC (permalink / raw) To: Jason Reeder; +Cc: meta-arago Jason, Any comments? On Tue, May 09, 2017 at 04:02:04PM -0400, Denys Dmytriyenko wrote: > Jason, > > Ah, you are right - it just failed to apply cleanly and I assumed it was > already merged in. > > We either need to update the patch against 232, or since this is master, there > are high chances for systemd to be updated in OE-Core before the next release > later in the fall, which would have this patch integrated in upstream. > > Preferences? > > -- > Denys > > > On Tue, May 09, 2017 at 02:49:05PM -0500, Jason Reeder wrote: > > Denys, this first patch didn't make it into systemd until v233. The next two > > patches have been merged upstream but won't be in a tagged release until the > > upcoming v234. > > > > Jason > > > > On 05/09/2017 01:06 PM, Denys Dmytriyenko wrote: > > > From: Denys Dmytriyenko <denys@ti.com> > > > > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > > > --- > > > ...emd-network-ipv4ll-probe-conflict-counter.patch | 48 ---------------------- > > > .../recipes-core/systemd/systemd_%.bbappend | 1 - > > > 2 files changed, 49 deletions(-) > > > delete mode 100644 meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > > > > > > diff --git a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch b/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > > > deleted file mode 100644 > > > index 557a297..0000000 > > > --- a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > > > +++ /dev/null > > > @@ -1,48 +0,0 @@ > > > -From 1e47842a0144c501cc6fd7ccc7996761f3e32ea9 Mon Sep 17 00:00:00 2001 > > > -From: Jason Reeder <jasonreeder@gmail.com> > > > -Date: Mon, 3 Apr 2017 12:07:17 -0500 > > > -Subject: [PATCH 1/3] libsystemd-network: ipv4ll probe conflict counter > > > - > > > -A bug exists where the conflict counter is cleared > > > -regardless of whether or not the next probe attempt leads to > > > -a successful address acquisition. This causes 'bursts' of > > > -MAX_CONFLICTS probes followed by a delay of > > > -RATE_LIMIT_INTERVAL instead of a single probe each > > > -RATE_LIMIT_INTERVAL when beyond MAX_CONFLICTS. > > > - > > > -The conflict counter should only be cleared after an > > > -address is successfully acquired. This commit achieves that > > > -goal. > > > - > > > -From RFC3927: > > > -A host should maintain a counter of the number of address > > > -conflicts it has experienced in the process of trying to > > > -acquire an address, and if the number of conflicts exceeds > > > -MAX_CONFLICTS then the host MUST limit the rate at which it > > > -probes for new addresses to no more than one new address per > > > -RATE_LIMIT_INTERVAL. This is to prevent catastrophic ARP > > > -storms in pathological failure cases, such as a rogue host > > > -that answers all ARP probes, causing legitimate hosts to go > > > -into an infinite loop attempting to select a usable address. > > > - > > > -Signed-off-by: Jason Reeder <jasonreeder@gmail.com> > > > ---- > > > - src/libsystemd-network/sd-ipv4acd.c | 2 -- > > > - 1 file changed, 2 deletions(-) > > > - > > > -diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c > > > -index cc7436d..97f37f2 100644 > > > ---- a/src/libsystemd-network/sd-ipv4acd.c > > > -+++ b/src/libsystemd-network/sd-ipv4acd.c > > > -@@ -249,8 +249,6 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata) > > > - r = ipv4acd_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT); > > > - if (r < 0) > > > - goto out; > > > -- > > > -- ll->conflict = 0; > > > - } else { > > > - r = ipv4acd_set_next_wakeup(ll, 0, PROBE_WAIT); > > > - if (r < 0) > > > --- > > > -1.9.1 > > > - > > > diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > > > index 8fccdb5..5f54316 100644 > > > --- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > > > +++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > > > @@ -14,7 +14,6 @@ SRC_URI_append = " \ > > > file://30-wlan.network \ > > > file://60-usb.network \ > > > file://sync-clocks.service \ > > > - file://0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch \ > > > file://0002-libsystemd-network-sd-ipv4ll-Wrapper-to-restart-addr.patch \ > > > file://0003-libsystemd-network-sd-ipv4ll-acquire-new-address-aft.patch \ > > > " > > > > > > > -- > > Jason Reeder > > _______________________________________________ > > meta-arago mailing list > > meta-arago@arago-project.org > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 2017-05-11 18:32 ` Denys Dmytriyenko @ 2017-05-11 18:56 ` Jason Reeder 2017-05-11 19:12 ` Denys Dmytriyenko 0 siblings, 1 reply; 11+ messages in thread From: Jason Reeder @ 2017-05-11 18:56 UTC (permalink / raw) To: Denys Dmytriyenko; +Cc: meta-arago On 05/11/2017 01:32 PM, Denys Dmytriyenko wrote: > Jason, > > Any comments? > > On Tue, May 09, 2017 at 04:02:04PM -0400, Denys Dmytriyenko wrote: >> Jason, >> >> Ah, you are right - it just failed to apply cleanly and I assumed it was >> already merged in. Does the 0002 patch apply cleanly against 232? I just tried it locally and it seemed to have conflicts as well. 0003 applied cleanly though. >> >> We either need to update the patch against 232, or since this is master, there >> are high chances for systemd to be updated in OE-Core before the next release >> later in the fall, which would have this patch integrated in upstream. >> >> Preferences? I can update the patches against 232. I just update the patches and then replace them in the meta-arago repo right? Wasn't there a tag to use to denote upstreamed/ backported when I send out the meta-arago patch? >> >> -- >> Denys >> >> >> On Tue, May 09, 2017 at 02:49:05PM -0500, Jason Reeder wrote: >>> Denys, this first patch didn't make it into systemd until v233. The next two >>> patches have been merged upstream but won't be in a tagged release until the >>> upcoming v234. >>> >>> Jason >>> >>> On 05/09/2017 01:06 PM, Denys Dmytriyenko wrote: >>>> From: Denys Dmytriyenko <denys@ti.com> >>>> >>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com> >>>> --- >>>> ...emd-network-ipv4ll-probe-conflict-counter.patch | 48 ---------------------- >>>> .../recipes-core/systemd/systemd_%.bbappend | 1 - >>>> 2 files changed, 49 deletions(-) >>>> delete mode 100644 meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch >>>> >>>> diff --git a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch b/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch >>>> deleted file mode 100644 >>>> index 557a297..0000000 >>>> --- a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch >>>> +++ /dev/null >>>> @@ -1,48 +0,0 @@ >>>> -From 1e47842a0144c501cc6fd7ccc7996761f3e32ea9 Mon Sep 17 00:00:00 2001 >>>> -From: Jason Reeder <jasonreeder@gmail.com> >>>> -Date: Mon, 3 Apr 2017 12:07:17 -0500 >>>> -Subject: [PATCH 1/3] libsystemd-network: ipv4ll probe conflict counter >>>> - >>>> -A bug exists where the conflict counter is cleared >>>> -regardless of whether or not the next probe attempt leads to >>>> -a successful address acquisition. This causes 'bursts' of >>>> -MAX_CONFLICTS probes followed by a delay of >>>> -RATE_LIMIT_INTERVAL instead of a single probe each >>>> -RATE_LIMIT_INTERVAL when beyond MAX_CONFLICTS. >>>> - >>>> -The conflict counter should only be cleared after an >>>> -address is successfully acquired. This commit achieves that >>>> -goal. >>>> - >>>> -From RFC3927: >>>> -A host should maintain a counter of the number of address >>>> -conflicts it has experienced in the process of trying to >>>> -acquire an address, and if the number of conflicts exceeds >>>> -MAX_CONFLICTS then the host MUST limit the rate at which it >>>> -probes for new addresses to no more than one new address per >>>> -RATE_LIMIT_INTERVAL. This is to prevent catastrophic ARP >>>> -storms in pathological failure cases, such as a rogue host >>>> -that answers all ARP probes, causing legitimate hosts to go >>>> -into an infinite loop attempting to select a usable address. >>>> - >>>> -Signed-off-by: Jason Reeder <jasonreeder@gmail.com> >>>> ---- >>>> - src/libsystemd-network/sd-ipv4acd.c | 2 -- >>>> - 1 file changed, 2 deletions(-) >>>> - >>>> -diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c >>>> -index cc7436d..97f37f2 100644 >>>> ---- a/src/libsystemd-network/sd-ipv4acd.c >>>> -+++ b/src/libsystemd-network/sd-ipv4acd.c >>>> -@@ -249,8 +249,6 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata) >>>> - r = ipv4acd_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT); >>>> - if (r < 0) >>>> - goto out; >>>> -- >>>> -- ll->conflict = 0; >>>> - } else { >>>> - r = ipv4acd_set_next_wakeup(ll, 0, PROBE_WAIT); >>>> - if (r < 0) >>>> --- >>>> -1.9.1 >>>> - >>>> diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend >>>> index 8fccdb5..5f54316 100644 >>>> --- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend >>>> +++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend >>>> @@ -14,7 +14,6 @@ SRC_URI_append = " \ >>>> file://30-wlan.network \ >>>> file://60-usb.network \ >>>> file://sync-clocks.service \ >>>> - file://0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch \ >>>> file://0002-libsystemd-network-sd-ipv4ll-Wrapper-to-restart-addr.patch \ >>>> file://0003-libsystemd-network-sd-ipv4ll-acquire-new-address-aft.patch \ >>>> " >>>> >>> >>> -- >>> Jason Reeder >>> _______________________________________________ >>> meta-arago mailing list >>> meta-arago@arago-project.org >>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago >> _______________________________________________ >> meta-arago mailing list >> meta-arago@arago-project.org >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago -- Jason Reeder ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 2017-05-11 18:56 ` Jason Reeder @ 2017-05-11 19:12 ` Denys Dmytriyenko 0 siblings, 0 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2017-05-11 19:12 UTC (permalink / raw) To: Jason Reeder; +Cc: meta-arago On Thu, May 11, 2017 at 01:56:45PM -0500, Jason Reeder wrote: > > > On 05/11/2017 01:32 PM, Denys Dmytriyenko wrote: > > Jason, > > > > Any comments? > > > > On Tue, May 09, 2017 at 04:02:04PM -0400, Denys Dmytriyenko wrote: > >> Jason, > >> > >> Ah, you are right - it just failed to apply cleanly and I assumed it was > >> already merged in. > > Does the 0002 patch apply cleanly against 232? I just tried it locally and it > seemed to have conflicts as well. 0003 applied cleanly though. Yes, 2 and 3 still applied cleanly. Not sure if it's exact 232 release, plus there are some local patches... Here's the recipe in oe-core/master: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd_232.bb And it uses commit a1e2ef7ec912902d8142e7cb5830cbfb47dba86c > >> We either need to update the patch against 232, or since this is master, there > >> are high chances for systemd to be updated in OE-Core before the next release > >> later in the fall, which would have this patch integrated in upstream. > >> > >> Preferences? > > I can update the patches against 232. I just update the patches and then replace > them in the meta-arago repo right? Wasn't there a tag to use to denote upstreamed/ > backported when I send out the meta-arago patch? Thanks a lot! This is against master branches of oe-core and meta-arago, not "morty", so it won't go into any specific SDK release this year. Here's the info: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations In this case it's either: Upstream-Status: Accepted [233] or Upstream-Status: Submitted [systemd-devel@lists.freedesktop.org] -- Denys > >> -- > >> Denys > >> > >> > >> On Tue, May 09, 2017 at 02:49:05PM -0500, Jason Reeder wrote: > >>> Denys, this first patch didn't make it into systemd until v233. The next two > >>> patches have been merged upstream but won't be in a tagged release until the > >>> upcoming v234. > >>> > >>> Jason > >>> > >>> On 05/09/2017 01:06 PM, Denys Dmytriyenko wrote: > >>>> From: Denys Dmytriyenko <denys@ti.com> > >>>> > >>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com> > >>>> --- > >>>> ...emd-network-ipv4ll-probe-conflict-counter.patch | 48 ---------------------- > >>>> .../recipes-core/systemd/systemd_%.bbappend | 1 - > >>>> 2 files changed, 49 deletions(-) > >>>> delete mode 100644 meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > >>>> > >>>> diff --git a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch b/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > >>>> deleted file mode 100644 > >>>> index 557a297..0000000 > >>>> --- a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > >>>> +++ /dev/null > >>>> @@ -1,48 +0,0 @@ > >>>> -From 1e47842a0144c501cc6fd7ccc7996761f3e32ea9 Mon Sep 17 00:00:00 2001 > >>>> -From: Jason Reeder <jasonreeder@gmail.com> > >>>> -Date: Mon, 3 Apr 2017 12:07:17 -0500 > >>>> -Subject: [PATCH 1/3] libsystemd-network: ipv4ll probe conflict counter > >>>> - > >>>> -A bug exists where the conflict counter is cleared > >>>> -regardless of whether or not the next probe attempt leads to > >>>> -a successful address acquisition. This causes 'bursts' of > >>>> -MAX_CONFLICTS probes followed by a delay of > >>>> -RATE_LIMIT_INTERVAL instead of a single probe each > >>>> -RATE_LIMIT_INTERVAL when beyond MAX_CONFLICTS. > >>>> - > >>>> -The conflict counter should only be cleared after an > >>>> -address is successfully acquired. This commit achieves that > >>>> -goal. > >>>> - > >>>> -From RFC3927: > >>>> -A host should maintain a counter of the number of address > >>>> -conflicts it has experienced in the process of trying to > >>>> -acquire an address, and if the number of conflicts exceeds > >>>> -MAX_CONFLICTS then the host MUST limit the rate at which it > >>>> -probes for new addresses to no more than one new address per > >>>> -RATE_LIMIT_INTERVAL. This is to prevent catastrophic ARP > >>>> -storms in pathological failure cases, such as a rogue host > >>>> -that answers all ARP probes, causing legitimate hosts to go > >>>> -into an infinite loop attempting to select a usable address. > >>>> - > >>>> -Signed-off-by: Jason Reeder <jasonreeder@gmail.com> > >>>> ---- > >>>> - src/libsystemd-network/sd-ipv4acd.c | 2 -- > >>>> - 1 file changed, 2 deletions(-) > >>>> - > >>>> -diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c > >>>> -index cc7436d..97f37f2 100644 > >>>> ---- a/src/libsystemd-network/sd-ipv4acd.c > >>>> -+++ b/src/libsystemd-network/sd-ipv4acd.c > >>>> -@@ -249,8 +249,6 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata) > >>>> - r = ipv4acd_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT); > >>>> - if (r < 0) > >>>> - goto out; > >>>> -- > >>>> -- ll->conflict = 0; > >>>> - } else { > >>>> - r = ipv4acd_set_next_wakeup(ll, 0, PROBE_WAIT); > >>>> - if (r < 0) > >>>> --- > >>>> -1.9.1 > >>>> - > >>>> diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > >>>> index 8fccdb5..5f54316 100644 > >>>> --- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > >>>> +++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > >>>> @@ -14,7 +14,6 @@ SRC_URI_append = " \ > >>>> file://30-wlan.network \ > >>>> file://60-usb.network \ > >>>> file://sync-clocks.service \ > >>>> - file://0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch \ > >>>> file://0002-libsystemd-network-sd-ipv4ll-Wrapper-to-restart-addr.patch \ > >>>> file://0003-libsystemd-network-sd-ipv4ll-acquire-new-address-aft.patch \ > >>>> " > >>>> > >>> > >>> -- > >>> Jason Reeder > >>> _______________________________________________ > >>> meta-arago mailing list > >>> meta-arago@arago-project.org > >>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > >> _______________________________________________ > >> meta-arago mailing list > >> meta-arago@arago-project.org > >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > > -- > Jason Reeder ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-05-11 19:12 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-05-09 18:06 [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Denys Dmytriyenko 2017-05-09 18:06 ` [master/morty][PATCH 2/6] wayland-ivi-extension: depend on wayland-native for wayland-scanner Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 3/6] linux-libc-headers: remove 4.4 bbappend Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 4/6] openssl: adjust bbappend to the latest version Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 5/6] packagegroup-*-graphics: disable wayland-ivi-extension due to breakage with weston 2.0 Denys Dmytriyenko 2017-05-09 18:06 ` [master][PATCH 6/6] opencv: overlay 3.1 locally, needed for TI customizations and HW acceleration Denys Dmytriyenko 2017-05-09 19:49 ` [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 Jason Reeder 2017-05-09 20:02 ` Denys Dmytriyenko 2017-05-11 18:32 ` Denys Dmytriyenko 2017-05-11 18:56 ` Jason Reeder 2017-05-11 19:12 ` Denys Dmytriyenko
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.