[oe] [meta-python][PATCH] python-sh: add python sh library
From: Dwane Pottratz sh is a python subprocess replacement. Signed-off-by: Dwane Pottratz --- .../recipes-devtools/python/python-sh.inc | 32 +++ .../python/python-sh_1.12.14.bb | 8 + .../python/python3-sh_1.12.14.bb | 5 +++ 3 files changed, 45 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-sh.inc create mode 100644 meta-python/recipes-devtools/python/python-sh_1.12.14.bb create mode 100644 meta-python/recipes-devtools/python/python3-sh_1.12.14.bb diff --git a/meta-python/recipes-devtools/python/python-sh.inc b/meta-python/recipes-devtools/python/python-sh.inc new file mode 100644 index 0..f2fd562bb --- /dev/null +++ b/meta-python/recipes-devtools/python/python-sh.inc @@ -0,0 +1,32 @@ +SUMMARY = "Python subprocess replacement" +HOMEPAGE = "https://github.com/amoffat/sh; +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5317094292296f03405f59ae5f6544b6" + +SRC_URI[md5sum] = "a8351aef25d25f707c17e0a7a6280251" +SRC_URI[sha256sum] = "b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc" + +PYPI_PACKAGE = "sh" + +inherit pypi + +RDEPENDS_${PN} += " \ +${PYTHON_PN}-codecs \ +${PYTHON_PN}-core \ +${PYTHON_PN}-io \ +${PYTHON_PN}-logging \ +${PYTHON_PN}-resource \ +${PYTHON_PN}-shell \ +${PYTHON_PN}-terminal \ +${PYTHON_PN}-tests \ +${PYTHON_PN}-threading \ +${PYTHON_PN}-unixadmin \ +" + +# WARNING: We were unable to map the following python package/module +# dependencies to the bitbake packages which include them: +#coverage - only used in test and there is a check to see if it is +# available before importing. +#queue - part of threading +#signal - part of core in python3. not sure how it is imported in python2. +# No complants in compiling. diff --git a/meta-python/recipes-devtools/python/python-sh_1.12.14.bb b/meta-python/recipes-devtools/python/python-sh_1.12.14.bb new file mode 100644 index 0..7cb5140d2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-sh_1.12.14.bb @@ -0,0 +1,8 @@ +require python-sh.inc +inherit setuptools + +RDEPENDS_${PN} += " \ +${PYTHON_PN}-contextlib \ +${PYTHON_PN}-lang \ +${PYTHON_PN}-textutils \ +" diff --git a/meta-python/recipes-devtools/python/python3-sh_1.12.14.bb b/meta-python/recipes-devtools/python/python3-sh_1.12.14.bb new file mode 100644 index 0..812bd4b1a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-sh_1.12.14.bb @@ -0,0 +1,5 @@ +require python-sh.inc +inherit setuptools3 + +RDEPENDS_${PN} += " \ +" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/2] ncmpc: update to the 0.32 release tag
From: Max Kellermann Signed-off-by: Max Kellermann --- meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb index 936596a25..bc7764424 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb @@ -7,17 +7,14 @@ inherit meson DEPENDS += " \ gettext-native \ -glib-2.0 \ +boost \ +pcre \ ncurses \ libmpdclient \ " -# We're using a 0.32 pre-release commit which contains a fix for a -# build failure. -PV = "0.32~git${SRCPV}" - SRC_URI = " \ git://github.com/MusicPlayerDaemon/ncmpc \ " -SRCREV = "1150f7931de7588643437069dd798724dc1ceb47" +SRCREV = "b03703653d3f4a418c4a8b6a9e32834dd882a185" S = "${WORKDIR}/git" -- 2.19.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/2] ncmpc: add various PACKAGECONFIGs
From: Max Kellermann Signed-off-by: Max Kellermann --- .../recipes-multimedia/musicpd/ncmpc_0.32.bb | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb index bc7764424..62885bba1 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.32.bb @@ -6,13 +6,30 @@ HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/; inherit meson DEPENDS += " \ -gettext-native \ boost \ pcre \ ncurses \ libmpdclient \ " +PACKAGECONFIG ??= "colors locale mouse nls help_screen artist_screen search_screen song_screen key_screen lyrics_screen outputs_screen" + +PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" +PACKAGECONFIG[lirc] = "-Dlirc=true,-Dlirc=false,lirc" +PACKAGECONFIG[locale] = "-Dlocale=true,-Dlocale=false" +PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" +PACKAGECONFIG[mouse] = "-Dmouse=true,-Dmouse=false" +PACKAGECONFIG[nls] = "-Dnls=true,-Dnls=false,gettext-native" + +PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" +PACKAGECONFIG[artist_screen] = "-Dartist_screen=true,-Dartist_screen=false" +PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" +PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" +PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" +PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" +PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" +PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" + SRC_URI = " \ git://github.com/MusicPlayerDaemon/ncmpc \ " -- 2.19.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [sumo] [meta-virtualization] [PATCH v1] docker: CVE-2018-10892
On 10/5/2018 12:00 PM, akuster808 wrote: Sinan, On 10/05/2018 08:55 AM, Sinan Kaya wrote: On 10/5/2018 11:41 AM, Bruce Ashfield wrote: Wrong list. This needs to go to the meta-virtualization mailing list. Thanks for the heads up. Is there a document somewhere saying which patch needs to go to which list? Every Layer should haveĀ a README. That README should include where to send patches. |Maintenance --- Send pull requests, patches, comments or questions to meta-virtualizat...@yoctoproject.org Maintainer: Bruce Ashfield When sending single patches, please using something like: $ git send-email -1 -M --to meta-virtualizat...@yoctoproject.org --subject-prefix='meta-virtualization][PATCH' The mailing list you will need to subscribe to Hope this helps. - Armin | This is the second time I screwed up. Got it. I just needed to know where to look. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [sumo] [meta-virtualization] [PATCH v1] docker: CVE-2018-10892
Sinan, On 10/05/2018 08:55 AM, Sinan Kaya wrote: > On 10/5/2018 11:41 AM, Bruce Ashfield wrote: >> Wrong list. >> >> This needs to go to the meta-virtualization mailing list. > > Thanks for the heads up. Is there a document somewhere saying which > patch needs to go to which list? Every Layer should haveĀ a README. That README should include where to send patches. |Maintenance --- Send pull requests, patches, comments or questions to meta-virtualizat...@yoctoproject.org Maintainer: Bruce Ashfield When sending single patches, please using something like: $ git send-email -1 -M --to meta-virtualizat...@yoctoproject.org --subject-prefix='meta-virtualization][PATCH' The mailing list you will need to subscribe to Hope this helps. - Armin | > > This is the second time I screwed up. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [sumo] [meta-virtualization] [PATCH v1] docker: CVE-2018-10892
On 10/5/2018 11:41 AM, Bruce Ashfield wrote: Wrong list. This needs to go to the meta-virtualization mailing list. Thanks for the heads up. Is there a document somewhere saying which patch needs to go to which list? This is the second time I screwed up. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [sumo] [meta-virtualization] [PATCH v1] docker: CVE-2018-10892
Wrong list. This needs to go to the meta-virtualization mailing list. Bruce On Thu, Oct 4, 2018 at 11:48 PM Sinan Kaya wrote: > > * CVE-2018-10892 > Docker does not block /proc/acpi pathnames. The flaw allows an attacker to > modify host's hardware like enabling/disabling Bluetooth or turning up/down > keyboard brightness. > > Affects < 18.03.01 > > CVE: CVE-2018-10892 > Ref: https://access.redhat.com/security/cve/cve-2018-10892 > Signed-off-by: Sinan Kaya > --- > recipes-containers/docker/docker_git.bb | 2 ++ > .../docker/files/CVE-2018-10892.patch | 34 +++ > 2 files changed, 36 insertions(+) > create mode 100644 recipes-containers/docker/files/CVE-2018-10892.patch > > diff --git a/recipes-containers/docker/docker_git.bb > b/recipes-containers/docker/docker_git.bb > index e055a4f..7c7bd4c 100644 > --- a/recipes-containers/docker/docker_git.bb > +++ b/recipes-containers/docker/docker_git.bb > @@ -30,6 +30,8 @@ SRC_URI = "\ > file://0001-libnetwork-use-GO-instead-of-go.patch \ > " > > +SRC_URI_append_docker += "CVE-2018-10892.patch" > + > # Apache-2.0 for docker > LICENSE = "Apache-2.0" > LIC_FILES_CHKSUM = > "file://src/import/LICENSE;md5=9740d093a080530b5c5c6573df9af45a" > diff --git a/recipes-containers/docker/files/CVE-2018-10892.patch > b/recipes-containers/docker/files/CVE-2018-10892.patch > new file mode 100644 > index 000..60d0496 > --- /dev/null > +++ b/recipes-containers/docker/files/CVE-2018-10892.patch > @@ -0,0 +1,34 @@ > +From af52f266ea15e6000ed057b13d62d27ddd5441a0 Mon Sep 17 00:00:00 2001 > +From: Antonio Murdaca > +Date: Thu, 5 Jul 2018 17:06:08 +0200 > +Subject: [PATCH] Add /proc/acpi to masked paths > + > +The deafult OCI linux spec in oci/defaults{_linux}.go in Docker/Moby > +from 1.11 to current upstream master does not block /proc/acpi pathnames > +allowing attackers to modify host's hardware like enabling/disabling > +bluetooth or turning up/down keyboard brightness. SELinux prevents all > +of this if enabled. > + > +Signed-off-by: Antonio Murdaca > +CVE: CVE-2018-10892 > +Upstream-Status: Backport > [https://github.com/moby/moby/pull/37404/commits/569b9702a59804617e1cd3611fbbe953e4247b3e] > +Signed-off-by: Sinan Kaya > +--- > + oci/defaults.go | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/oci/defaults.go b/oci/defaults.go > +index 4145412dd..992157b0f 100644 > +--- a/oci/defaults.go > b/oci/defaults.go > +@@ -114,6 +114,7 @@ func DefaultLinuxSpec() specs.Spec { > + > + s.Linux = { > + MaskedPaths: []string{ > ++ "/proc/acpi", > + "/proc/kcore", > + "/proc/keys", > + "/proc/latency_stats", > +-- > +2.19.0 > + > -- > 2.19.0 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] OEDEM in Edinburgh in 2 weeks
On Thu, Oct 04, 2018 at 02:42:41PM +0200, Marco Cavallini wrote: > Il 04/10/2018 14:20, Philip Balister ha scritto: > >OEDEM is basically full at this time. > > > >https://www.openembedded.org/wiki/OEDEM_2018 > > > >We have had the room rearranged to seat 45 people and I am not sure how > >we would handle anyone over this. If you know you can't make it, could > >you please remove your name from the attendee list. We'd like to get a > >better idea of how many people on the waiting list we can accommodate. > >There are some long time contributors on the wait list we'd like to get in. > > > >Philip > > > > > Hi Philip, > if I can participate remaining standing, will be a pleasure to leave > my seat to one of the long time contributors on the wait list ;-) Marco, Unfortunately, I don't believe those are seating vs. standing spaces, but rather the maximum number of people allowed in the root at the same time, limited by a fire marshal for safety... -- Denys -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libcec: update to 4.0.2
This also removes a warning that /usr/bin/python is not provided by any package. Further it moves all binaires to a separate package libcec-tools Signed-off-by: Pascal Bach --- ...001-Explicitly-use-python3-in-pyCecClient.patch | 24 +++ .../libcec/files/python-install-location.patch | 28 -- meta-oe/recipes-extended/libcec/libcec_git.bb | 16 + 3 files changed, 35 insertions(+), 33 deletions(-) create mode 100644 meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch delete mode 100644 meta-oe/recipes-extended/libcec/files/python-install-location.patch diff --git a/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch b/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch new file mode 100644 index 0..ec1f5d0d5 --- /dev/null +++ b/meta-oe/recipes-extended/libcec/files/0001-Explicitly-use-python3-in-pyCecClient.patch @@ -0,0 +1,24 @@ +From 16e8c072709572ccefa6c7f835136db01f031323 Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Fri, 28 Sep 2018 16:56:14 +0200 +Subject: [PATCH] Explicitly use python3 in pyCecClient + +Upstream-Status: Submitted [https://github.com/Pulse-Eight/libcec/pull/433] + +--- + src/pyCecClient/pyCecClient.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pyCecClient/pyCecClient.py b/src/pyCecClient/pyCecClient.py +index 6d47857..d0504ac 100755 +--- a/src/pyCecClient/pyCecClient.py b/src/pyCecClient/pyCecClient.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/python3 + ## demo of the python-libcec API + + # This file is part of the libCEC(R) library. +-- +2.11.0 + diff --git a/meta-oe/recipes-extended/libcec/files/python-install-location.patch b/meta-oe/recipes-extended/libcec/files/python-install-location.patch deleted file mode 100644 index b6be78dd4..0 --- a/meta-oe/recipes-extended/libcec/files/python-install-location.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 330fa6777d51d41eefacff8e98e4250d210fde35 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Javi=20Mart=C3=ADnez?= -Date: Tue, 13 Dec 2016 22:31:13 +0100 -Subject: [PATCH] Improve/fix installation of Python bindings - -Upstream-Status: Backport - -dist-packages is a Debian-specific directory for distribution packages (and used in derivatives such as Ubuntu). Therefore changed to site-packages. - src/libcec/cmake/CheckPlatformSupport.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake -index fcd0ef7..7661107 100644 a/src/libcec/cmake/CheckPlatformSupport.cmake -+++ b/src/libcec/cmake/CheckPlatformSupport.cmake -@@ -195,9 +195,9 @@ else() - RENAME __init__.py) - else() - install(TARGETS ${SWIG_MODULE_cec_REAL_NAME} -- DESTINATION lib/python${PYTHON_VERSION}/dist-packages/cec) -+ DESTINATION lib/python${PYTHON_VERSION}/site-packages/cec) - install(FILES ${CMAKE_BINARY_DIR}/src/libcec/cec.py -- DESTINATION lib/python${PYTHON_VERSION}/dist-packages/cec -+ DESTINATION lib/python${PYTHON_VERSION}/site-packages/cec - RENAME __init__.py) - endif() - endif() diff --git a/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-oe/recipes-extended/libcec/libcec_git.bb index cb65caad8..4ad49971a 100644 --- a/meta-oe/recipes-extended/libcec/libcec_git.bb +++ b/meta-oe/recipes-extended/libcec/libcec_git.bb @@ -4,24 +4,30 @@ HOMEPAGE = "http://libcec.pulse-eight.com/; LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=e61fd86f9c947b430126181da2c6c715" -DEPENDS = "p8platform udev lockdev ncurses swig-native python3" +DEPENDS = "p8platform udev ncurses swig-native python3" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -PV = "4.0.1+gitr${SRCPV}" +PV = "4.0.2+gitr${SRCPV}" -SRCREV = "2fc92b5f02dca702da92ccc5ed7b805b240ef5df" +SRCREV = "0a97062dd4b196ceeb003ec41841c7a7edc36dd1" SRC_URI = "git://github.com/Pulse-Eight/libcec.git \ - file://python-install-location.patch" + file://0001-Explicitly-use-python3-in-pyCecClient.patch" S = "${WORKDIR}/git" inherit cmake pkgconfig +# Put client tools into a separate package +PACKAGE_BEFORE_PN += "${PN}-tools" +FILES_${PN}-tools = "${bindir}" +RDEPENDS_${PN}-tools = "python3-${BPN}" + # Create the wrapper for python3 PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${libdir}/python3*" +FILES_python3-${BPN} = "${libdir}/python3* ${bindir}/py*" +RDEPENDS_${PN} = "python3-core" # cec-client and xbmc need the .so present to work :( FILES_${PN} += "${libdir}/*.so" -- 2.11.0 -- ___ Openembedded-devel
[oe] [meta-oe][PATCH] p8platform: update to 2.1.0.1
This also adds a patch that makes the resulting p8-platform-config.cmake relocatable. Before it contained a hardcoded path to /usr/include. Signed-off-by: Pascal Bach --- ...1-Make-resulting-cmake-config-relocatable.patch | 64 ++ .../recipes-extended/p8platform/p8platform_git.bb | 7 ++- 2 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch diff --git a/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch b/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch new file mode 100644 index 0..9ff85b12a --- /dev/null +++ b/meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch @@ -0,0 +1,64 @@ +From 2650bb3bd3644784359be373252b0436873ca8cb Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Fri, 28 Sep 2018 16:44:37 +0200 +Subject: [PATCH] Make resulting cmake config relocatable + +This change avoids hardcoded install prefix in the p8-platform-config.cmake. +Especially important when doing cross compilation with Yocto for example. + +Upstream-Status: Submitted [https://github.com/Pulse-Eight/platform/pull/38] + +--- + CMakeLists.txt | 4 + p8-platform-config.cmake.in | 13 + + 2 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7144b0b..f2db66e 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -22,10 +22,6 @@ if(WIN32) +src/windows/os-threads.cpp) + endif() + +-set(p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform") +-IF(WIN32) +- LIST(APPEND p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform/windows") +-ENDIF(WIN32) + set(p8-platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + + if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") +diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in +index 47f30f1..b08e96c 100644 +--- a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in +@@ -9,17 +9,22 @@ + # p8-platform_LIBRARY_DIRS - directories in which the libraries are situated + # + # propagate these properties from one build system to the other ++get_filename_component(_p8-platform_rootdir ${CMAKE_CURRENT_LIST_DIR}/../ ABSOLUTE) ++ + set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") +-set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) +-set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") ++set (p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include" "${_p8-platform_rootdir}/include/p8-platform") ++if(WIN32) ++ list(APPEND p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include/p8-platform/windows") ++endif(WIN32) ++set (p8-platform_LIBRARY_DIRS "${_p8-platform_rootdir}") + set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") + set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") + + # libraries come from the build tree where this file was generated + if(WIN32) +- set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") ++ set (p8-platform_LIBRARY "${_p8-platform_rootdir}/p8-platform.lib") + else(WIN32) +- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") ++ set (p8-platform_LIBRARY "-L${_p8-platform_rootdir} -lp8-platform") + endif(WIN32) + set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") + mark_as_advanced (p8-platform_LIBRARY) +-- +2.11.0 + diff --git a/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-oe/recipes-extended/p8platform/p8platform_git.bb index f6347c2a4..0690d4ba3 100644 --- a/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -4,10 +4,11 @@ HOMEPAGE = "http://libcec.pulse-eight.com/; LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" -PV = "2.1.0" +PV = "2.1.0.1" -SRC_URI = "git://github.com/Pulse-Eight/platform.git" -SRCREV = "d7bceb64541cb046421cbcd4c98d91e9bf24822f" +SRC_URI = "git://github.com/Pulse-Eight/platform.git \ + file://0001-Make-resulting-cmake-config-relocatable.patch" +SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" S = "${WORKDIR}/git" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] ceres-solver: Removed empty package
By default ceres-solver provides a static library and headers. This change removes an empty package and sets an implicit dependency on dev and dbg packages. Signed-off-by: Vyacheslav Yurkov --- meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb index ad7c8f2a3..a62e5ef23 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb @@ -14,4 +14,6 @@ S = "${WORKDIR}/git" inherit cmake # Only a static library and headers are created -ALLOW_EMPTY_${PN} = "1" +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dev = "${PN}-staticdev" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -- 2.19.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] ceres-solver: Removed empty package
I'm bit behind with oe-core (not on master) and was not aware of that. Anyway I was about to send v2, because I realized that static library and headers should come together, and it doesn't make sense to specify two packages. Vyacheslav On Fri, Oct 5, 2018 at 11:43 AM Martin Jansa wrote: > On Fri, Oct 05, 2018 at 11:17:22AM +0200, Vyacheslav Yurkov wrote: > > By default ceres-solver provides a static library and headers. > > This change removes an empty package and sets an implicit dependency > > on dev and dbg packages. > > > > It also addresses missing cmake configuration files in dev package. > > > > Signed-off-by: Vyacheslav Yurkov > > --- > > meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 5 - > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb > b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb > > index ad7c8f2a3..13ca8efab 100644 > > --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb > > +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb > > @@ -13,5 +13,8 @@ S = "${WORKDIR}/git" > > > > inherit cmake > > > > +FILES_${PN}-dev += "${libdir}/cmake/" > > Why is this needed? cmake files are packaged automatically since oe-core > commit: > > commit 543e39ad5e2baa0f1ece013a89483783e6b15dd9 > Author: Andre McCurdy > Date: Tue Jun 26 12:48:11 2018 -0700 > > bitbake.conf: handle cmake -dev files packaging with default rules > > > + > > # Only a static library and headers are created > > -ALLOW_EMPTY_${PN} = "1" > > +RDEPENDS_${PN}-dev = "" > > +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" > > -- > > 2.19.0 > > > > -- > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] ceres-solver: Removed empty package
On Fri, Oct 05, 2018 at 11:17:22AM +0200, Vyacheslav Yurkov wrote: > By default ceres-solver provides a static library and headers. > This change removes an empty package and sets an implicit dependency > on dev and dbg packages. > > It also addresses missing cmake configuration files in dev package. > > Signed-off-by: Vyacheslav Yurkov > --- > meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb > b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb > index ad7c8f2a3..13ca8efab 100644 > --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb > +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb > @@ -13,5 +13,8 @@ S = "${WORKDIR}/git" > > inherit cmake > > +FILES_${PN}-dev += "${libdir}/cmake/" Why is this needed? cmake files are packaged automatically since oe-core commit: commit 543e39ad5e2baa0f1ece013a89483783e6b15dd9 Author: Andre McCurdy Date: Tue Jun 26 12:48:11 2018 -0700 bitbake.conf: handle cmake -dev files packaging with default rules > + > # Only a static library and headers are created > -ALLOW_EMPTY_${PN} = "1" > +RDEPENDS_${PN}-dev = "" > +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" > -- > 2.19.0 > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] ceres-solver: Removed empty package
By default ceres-solver provides a static library and headers. This change removes an empty package and sets an implicit dependency on dev and dbg packages. It also addresses missing cmake configuration files in dev package. Signed-off-by: Vyacheslav Yurkov --- meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb index ad7c8f2a3..13ca8efab 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb @@ -13,5 +13,8 @@ S = "${WORKDIR}/git" inherit cmake +FILES_${PN}-dev += "${libdir}/cmake/" + # Only a static library and headers are created -ALLOW_EMPTY_${PN} = "1" +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -- 2.19.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel