[oe] [PATCHv2] menulibre: Fix multilib fetch
| ERROR: lib32-menulibre-2.2.0-r0 do_fetch: Fetcher failure for URL:
'https://launchpad.net/menulibre/2.2/2.2.0/+download/lib32-menulibre-2.2.0.tar.gz'.
Unable to fetch URL from any source.
| ERROR: lib32-menulibre-2.2.0-r0 do_fetch: Function failed: base_do_fetch
Signed-off-by: Andreas Müller
---
meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
index b0e4784fe..1e9e5f1a1 100644
--- a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
+++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
@@ -13,7 +13,7 @@ inherit distutils3 gtk-icon-cache distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI =
"https://launchpad.net/menulibre/2.2/${PV}/+download/${PN}-${PV}.tar.gz;
+SRC_URI =
"https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz;
SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8"
SRC_URI[sha256sum] =
"546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] menulibre: Fix multilib fetch
|
/home/superandy/data/oe-core/sources/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
Signed-off-by: Andreas Müller
---
meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
index b0e4784fe..1e9e5f1a1 100644
--- a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
+++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb
@@ -13,7 +13,7 @@ inherit distutils3 gtk-icon-cache distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI =
"https://launchpad.net/menulibre/2.2/${PV}/+download/${PN}-${PV}.tar.gz;
+SRC_URI =
"https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz;
SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8"
SRC_URI[sha256sum] =
"546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH 3/4] libupnp: Upgrade to 1.8.4
Signed-off-by: Khem Raj
---
.../recipes-connectivity/libupnp/libupnp_git.bb| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb
b/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb
index 7a524f2d50..84fa41c290 100644
--- a/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb
+++ b/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb
@@ -9,12 +9,13 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863"
-PV = "1.8.2+git${SRCPV}"
-SRCREV = "56d6042abae861e8838a4e6b6b5b575b99e38f34"
+PV = "1.8.4+git${SRCPV}"
+# release-1.8.4
+SRCREV = "d5a01fc9895daae98a0c5a8c7d3afce46add529d"
SRC_URI = "git://github.com/mrjimenez/pupnp.git;protocol=https"
S="${WORKDIR}/git"
inherit autotools
-EXTRA_OECONF += "--enable-reuseaddr"
\ No newline at end of file
+EXTRA_OECONF += "--enable-reuseaddr"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH 4/4] gerbera: Update to 1.3.0
Add missing dependency on libnsl2
Turn systemd support into a packageconfig knob
Signed-off-by: Khem Raj
---
.../recipes-multimedia/gerbera/gerbera_git.bb | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
b/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
index f763cf1e42..9c78da0d23 100644
--- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
+++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
@@ -7,20 +7,21 @@ SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https
\
file://gerbera.service \
"
-PV = "1.0+git${SRCPV}"
-SRCREV = "4435b165d121195aefd67d0287f7f9349e181d45"
+PV = "1.3.0+git${SRCPV}"
+# v1.3.0
+SRCREV = "c7a81fb41e446ee67b3eac90e2caecd6de651a16"
S = "${WORKDIR}/git"
-DEPENDS = "expat zlib curl libupnp e2fsprogs sqlite3 "
+DEPENDS = "expat zlib curl libupnp e2fsprogs sqlite3 libnsl2"
SYSTEMD_SERVICE_${PN} = "gerbera.service"
inherit cmake systemd
-PACKAGECONFIG = ""
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd"
PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib"
-
EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE
-DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid"
do_install_append() {
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 1/4] python-gevent: Upgrade to 1.4.0
Signed-off-by: Khem Raj
---
.../python/{python-gevent_1.2.2.bb => python-gevent_1.4.0.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-python/recipes-devtools/python/{python-gevent_1.2.2.bb =>
python-gevent_1.4.0.bb} (100%)
diff --git a/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb
b/meta-python/recipes-devtools/python/python-gevent_1.4.0.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python-gevent_1.2.2.bb
rename to meta-python/recipes-devtools/python/python-gevent_1.4.0.bb
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 2/4] python-mprpc: Upgrade to 0.1.17
Signed-off-by: Khem Raj
---
.../recipes-connectivity/python-mprpc/python-mprpc.inc| 4 ++--
.../{python-mprpc_0.1.16.bb => python-mprpc_0.1.17.bb}| 0
.../{python3-mprpc_0.1.16.bb => python3-mprpc_0.1.17.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-connectivity/python-mprpc/{python-mprpc_0.1.16.bb
=> python-mprpc_0.1.17.bb} (100%)
rename meta-python/recipes-connectivity/python-mprpc/{python3-mprpc_0.1.16.bb
=> python3-mprpc_0.1.17.bb} (100%)
diff --git a/meta-python/recipes-connectivity/python-mprpc/python-mprpc.inc
b/meta-python/recipes-connectivity/python-mprpc/python-mprpc.inc
index 05fbae48b4..e9eebe84af 100644
--- a/meta-python/recipes-connectivity/python-mprpc/python-mprpc.inc
+++ b/meta-python/recipes-connectivity/python-mprpc/python-mprpc.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=4ba825394aec026b5f94edca44426859"
DEPENDS += "${PYTHON_PN}-gevent"
RDEPENDS_${PN} += "${PYTHON_PN}-gevent ${PYTHON_PN}-msgpack
${PYTHON_PN}-gsocketpool"
-SRC_URI[md5sum] = "acde1f346411997d76ab89790a356823"
-SRC_URI[sha256sum] =
"e8ddd47e7a2fb2d3b203fcc522443ee5be56c8f7e2c6d915c047445951cef1fb"
+SRC_URI[md5sum] = "8d97961051422f3de315613434982d3b"
+SRC_URI[sha256sum] =
"3589fd127482e291b1ec314d6f0e55cc13311c12932ace356d6178ea1ca28f6a"
inherit pypi
diff --git
a/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.16.bb
b/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.17.bb
similarity index 100%
rename from meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.16.bb
rename to meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.17.bb
diff --git
a/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.16.bb
b/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.17.bb
similarity index 100%
rename from
meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.16.bb
rename to meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.17.bb
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] vncx11: Fix dev package do_rootfs failure
When building the dev package I see these errors:
Collected errors:
* check_data_file_clashes: Package x11vnc-dev wants to install file
/home/alistair/oe-master/build/tmp-glibc/wor
k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfbproto.h
But that file is already provided by package * libvncserver-dev
* check_data_file_clashes: Package x11vnc-dev wants to install file
/home/alistair/oe-master/build/tmp-glibc/wor
k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfb.h
But that file is already provided by package * libvncserver-dev
* check_data_file_clashes: Package x11vnc-dev wants to install file
/home/alistair/oe-master/build/tmp-glibc/wor
k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfbregion.h
But that file is already provided by package * libvncserver-dev
* check_data_file_clashes: Package x11vnc-dev wants to install file
/home/alistair/oe-master/build/tmp-glibc/wor
k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfbconfig.h
But that file is already provided by package * libvncserver-dev
* check_data_file_clashes: Package x11vnc-dev wants to install file
/home/alistair/oe-master/build/tmp-glibc/wor
k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/keysym.h
But that file is already provided by package * libvncserver-dev
* check_data_file_clashes: Package x11vnc-dev wants to install file
/home/alistair/oe-master/build/tmp-glibc/wor
k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfbclient.h
But that file is already provided by package * libvncserver-dev
as both libvncserver and x11vnx try to install the same files let's just
remove them from x11vnc.
Signed-off-by: Alistair Francis
---
meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index b047bc462..774d2c9cb 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -32,3 +32,7 @@ do_prepare_sources () {
sed -i -e '/^# libtool.m4/q' ${S}/acinclude.m4
}
do_patch[postfuncs] += "do_prepare_sources"
+
+do_install_append() {
+rm -rf ${D}/usr/include/rfb
+}
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] rapidjson: fix cmake artifacts installation for non-default BASELIB case
On Thu, 2019-02-07 at 09:59 -0800, Khem Raj wrote: > On Thu, Feb 7, 2019 at 9:31 AM Ruslan Bilovol > wrote: > > I see you picked up this patch to master-next, but the patch's > > author > > is incorrect: > > https://git.openembedded.org/meta-openembedded/commit/?h=master-next=cf54629463841242ce1faa90f6ad4a2383df3b2c > > > > Could you please fix it? > > > > sure > > > > This is the same issue we faced with oe-core mailing list, I > > remember > > Richard Purdie had some scripts to fix it automatically > > > > I wonder why is this happening? May be Michael can help us > understand, > why patchwork would feed a worng author or is it > some email client error somewhere? Its an email client problem. Roughly speaking the email was sent from an IP address which according to DMARC shouldn't be sending email. The list servers therefore rewrite it to a valid address to stop it being stopped as spam. Cheers, Richard -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] rapidjson: fix cmake artifacts installation for non-default BASELIB case
On Thu, Feb 7, 2019 at 9:31 AM Ruslan Bilovol wrote:
>
> Hi Khem,
>
> I see you picked up this patch to master-next, but the patch's author
> is incorrect:
> https://git.openembedded.org/meta-openembedded/commit/?h=master-next=cf54629463841242ce1faa90f6ad4a2383df3b2c
>
> Could you please fix it?
>
sure
> This is the same issue we faced with oe-core mailing list, I remember
> Richard Purdie had some scripts to fix it automatically
>
I wonder why is this happening? May be Michael can help us understand,
why patchwork would feed a worng author or is it
some email client error somewhere?
> Thanks,
> Ruslan
>
> On 2/7/19 1:00 PM, Ruslan Bilovol wrote:
> > If BASELIB is set to non-default value (like lib64),
> > next 'installed but not shipped' issue happens:
> >/usr/lib
> >/usr/lib/cmake
> >/usr/lib/pkgconfig
> >/usr/lib/cmake/RapidJSON
> >/usr/lib/cmake/RapidJSON/RapidJSONConfigVersion.cmake
> >/usr/lib/cmake/RapidJSON/RapidJSONConfig.cmake
> >/usr/lib/pkgconfig/RapidJSON.pc
> >
> > This is because rapidjson has library installation dir set
> > to 'lib' by default and hardcoded in another place.
> > Fix this by next changes:
> > - set appropriate LIB_INSTALL_DIR
> > - fix hardcoded 'lib' in CMAKECONFIG_INSTALL_DIR case
> >
> > Signed-off-by: Ruslan Bilovol
> > ---
> > ...ve-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch | 36
> > ++
> > .../recipes-devtools/rapidjson/rapidjson_git.bb| 5 +--
> > 2 files changed, 39 insertions(+), 2 deletions(-)
> > create mode 100644
> > meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
> >
> > diff --git
> > a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
> >
> > b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
> > new file mode 100644
> > index 000..745f5d0
> > --- /dev/null
> > +++
> > b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
> > @@ -0,0 +1,36 @@
> > +From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001
> > +From: Ruslan Bilovol
> > +Date: Thu, 24 Jan 2019 18:11:39 +0200
> > +Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path
> > +
> > +Currently this path is hardcoded to lib/cmake.
> > +Some distributions have different library path (like lib64).
> > +So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR
> > +configurable and usable in such distros.
> > +
> > +Upstream-Status: Backport
> > [https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9]
> > +
> > +Signed-off-by: Ruslan Bilovol
> > +---
> > + CMakeLists.txt | 4 ++--
> > + 1 file changed, 2 insertions(+), 2 deletions(-)
> > +
> > +diff --git a/CMakeLists.txt b/CMakeLists.txt
> > +index 7c60407..0275672 100644
> > +--- a/CMakeLists.txt
> > b/CMakeLists.txt
> > +@@ -199,9 +199,9 @@
> > CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in
> > + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY)
> > +
> > + # ... for the install tree
> > +-SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} )
> > ++SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} )
> > + FILE( RELATIVE_PATH REL_INCLUDE_DIR
> > +-"${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}"
> > ++"${CMAKECONFIG_INSTALL_DIR}"
> > + "${CMAKE_INSTALL_PREFIX}/include" )
> > +
> > + SET( ${PROJECT_NAME}_INCLUDE_DIR
> > "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" )
> > +--
> > +1.9.1
> > +
> > diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
> > b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
> > index c90eab0..e3ed9c6 100644
> > --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
> > +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
> > @@ -4,7 +4,8 @@ SECTION = "libs"
> > LICENSE = "MIT"
> > LIC_FILES_CHKSUM =
> > "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
> >
> > -SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1"
> > +SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \
> > +
> > file://0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch"
> >
> > SRCREV = "6a905f9311f82d306da77bd963ec5aa5da07da9c"
> >
> > @@ -14,7 +15,7 @@ S = "${WORKDIR}/git"
> >
> > inherit cmake
> >
> > -EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF
> > -DRAPIDJSON_BUILD_EXAMPLES=OFF"
> > +EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF
> > -DRAPIDJSON_BUILD_EXAMPLES=OFF -DLIB_INSTALL_DIR:STRING=${libdir}"
> >
> > # RapidJSON is a header-only C++ library, so the main package will be
> > empty.
> >
> >
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
[oe] [meta-python][PATCH 3/4] python*-xlrd: Add native and nativesdk to BBCLASSEXTEND
Signed-off-by: Fabio Berton
---
meta-python/recipes-devtools/python/python-xlrd.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-python/recipes-devtools/python/python-xlrd.inc
b/meta-python/recipes-devtools/python/python-xlrd.inc
index d1ab05d4f..893e82e05 100644
--- a/meta-python/recipes-devtools/python/python-xlrd.inc
+++ b/meta-python/recipes-devtools/python/python-xlrd.inc
@@ -10,3 +10,5 @@ SRC_URI[md5sum] = "b85c9916ac755cad489a9005f5a0d390"
SRC_URI[sha256sum] =
"8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2"
RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io
${PYTHON_PN}-pprint ${PYTHON_PN}-shell"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 4/4] python-protobuf: Add nativesdk to BBCLASSEXTEND
Signed-off-by: Fabio Berton
---
meta-python/recipes-devtools/python/python-protobuf.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-python/recipes-devtools/python/python-protobuf.inc
b/meta-python/recipes-devtools/python/python-protobuf.inc
index b617904d2..51037915d 100644
--- a/meta-python/recipes-devtools/python/python-protobuf.inc
+++ b/meta-python/recipes-devtools/python/python-protobuf.inc
@@ -28,4 +28,4 @@ RDEPENDS_${PN} += " \
"
# For usage in other recipies when compiling protobuf files (e.g. by
grpcio-tools)
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 1/4] python*-jinja2: Add native and nativesdk to BBCLASSEXTEND
Signed-off-by: Fabio Berton
---
meta-python/recipes-devtools/python/python-jinja2.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-python/recipes-devtools/python/python-jinja2.inc
b/meta-python/recipes-devtools/python/python-jinja2.inc
index 0c0bf0def..5342eb563 100644
--- a/meta-python/recipes-devtools/python/python-jinja2.inc
+++ b/meta-python/recipes-devtools/python/python-jinja2.inc
@@ -13,3 +13,5 @@ RDEPENDS_${PN} += "${PYTHON_PN}-io ${PYTHON_PN}-pickle
${PYTHON_PN}-crypt \
${PYTHON_PN}-json ${PYTHON_PN}-threading ${PYTHON_PN}-numbers"
CLEANBROKEN = "1"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 2/4] python*-markupsafe: Add native and nativesdk to BBCLASSEXTEND
SIGNED-off-by: Fabio Berton
---
meta-python/recipes-devtools/python/python-markupsafe.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-python/recipes-devtools/python/python-markupsafe.inc
b/meta-python/recipes-devtools/python/python-markupsafe.inc
index 927f84452..437a60cfb 100644
--- a/meta-python/recipes-devtools/python/python-markupsafe.inc
+++ b/meta-python/recipes-devtools/python/python-markupsafe.inc
@@ -10,3 +10,5 @@ PYPI_PACKAGE = "MarkupSafe"
inherit pypi
RDEPENDS_${PN} += "${PYTHON_PN}-stringold"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] rapidjson: fix cmake artifacts installation for non-default BASELIB case
Hi Khem,
I see you picked up this patch to master-next, but the patch's author
is incorrect:
https://git.openembedded.org/meta-openembedded/commit/?h=master-next=cf54629463841242ce1faa90f6ad4a2383df3b2c
Could you please fix it?
This is the same issue we faced with oe-core mailing list, I remember
Richard Purdie had some scripts to fix it automatically
Thanks,
Ruslan
On 2/7/19 1:00 PM, Ruslan Bilovol wrote:
If BASELIB is set to non-default value (like lib64),
next 'installed but not shipped' issue happens:
/usr/lib
/usr/lib/cmake
/usr/lib/pkgconfig
/usr/lib/cmake/RapidJSON
/usr/lib/cmake/RapidJSON/RapidJSONConfigVersion.cmake
/usr/lib/cmake/RapidJSON/RapidJSONConfig.cmake
/usr/lib/pkgconfig/RapidJSON.pc
This is because rapidjson has library installation dir set
to 'lib' by default and hardcoded in another place.
Fix this by next changes:
- set appropriate LIB_INSTALL_DIR
- fix hardcoded 'lib' in CMAKECONFIG_INSTALL_DIR case
Signed-off-by: Ruslan Bilovol
---
...ve-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch | 36 ++
.../recipes-devtools/rapidjson/rapidjson_git.bb| 5 +--
2 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644
meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
diff --git
a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
new file mode 100644
index 000..745f5d0
--- /dev/null
+++
b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
@@ -0,0 +1,36 @@
+From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001
+From: Ruslan Bilovol
+Date: Thu, 24 Jan 2019 18:11:39 +0200
+Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path
+
+Currently this path is hardcoded to lib/cmake.
+Some distributions have different library path (like lib64).
+So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR
+configurable and usable in such distros.
+
+Upstream-Status: Backport
[https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9]
+
+Signed-off-by: Ruslan Bilovol
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7c60407..0275672 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -199,9 +199,9 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY)
+
+ # ... for the install tree
+-SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} )
++SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} )
+ FILE( RELATIVE_PATH REL_INCLUDE_DIR
+-"${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}"
++"${CMAKECONFIG_INSTALL_DIR}"
+ "${CMAKE_INSTALL_PREFIX}/include" )
+
+ SET( ${PROJECT_NAME}_INCLUDE_DIR
"\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" )
+--
+1.9.1
+
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index c90eab0..e3ed9c6 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -4,7 +4,8 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
-SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1"
+SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \
+
file://0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch"
SRCREV = "6a905f9311f82d306da77bd963ec5aa5da07da9c"
@@ -14,7 +15,7 @@ S = "${WORKDIR}/git"
inherit cmake
-EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF"
+EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF
-DRAPIDJSON_BUILD_EXAMPLES=OFF -DLIB_INSTALL_DIR:STRING=${libdir}"
# RapidJSON is a header-only C++ library, so the main package will be empty.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] python3-gevent: update to 1.4.0
This fixes build issues with Python 3.7.
License-Update: added BSD license for one of the source files
Signed-off-by: Alexander Kanavin
---
.../recipes-devtools/python/python-gevent.inc | 10 ---
...etup.py-do-not-query-for-include-dir.patch | 26 +++
...event_1.2.2.bb => python3-gevent_1.4.0.bb} | 1 -
3 files changed, 32 insertions(+), 5 deletions(-)
create mode 100644
meta-python/recipes-devtools/python/python-gevent/0002-setup.py-do-not-query-for-include-dir.patch
rename meta-python/recipes-devtools/python/{python3-gevent_1.2.2.bb =>
python3-gevent_1.4.0.bb} (97%)
diff --git a/meta-python/recipes-devtools/python/python-gevent.inc
b/meta-python/recipes-devtools/python/python-gevent.inc
index 13513f219..bc89d104a 100644
--- a/meta-python/recipes-devtools/python/python-gevent.inc
+++ b/meta-python/recipes-devtools/python/python-gevent.inc
@@ -4,8 +4,9 @@ a high-level synchronous API on top of the libevent event loop."
HOMEPAGE = "http://www.gevent.org;
LICENSE = "MIT & Python-2.0 & BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65 \
-file://NOTICE;md5=5966cd2c6582656d28ab3c33da3860f8 \
-
file://deps/libev/LICENSE;md5=d6ad416afd040c90698edcdf1cbee347"
+file://NOTICE;md5=18108df3583462cafd457f024b9b09b5 \
+
file://deps/libev/LICENSE;md5=d6ad416afd040c90698edcdf1cbee347 \
+"
DEPENDS += "libevent"
DEPENDS += "${PYTHON_PN}-greenlet"
RDEPENDS_${PN} = "${PYTHON_PN}-greenlet \
@@ -17,10 +18,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/python-gevent:"
SRC_URI_append = " \
file://libev-conf.patch;patch=1;pnum=1 \
+file://0002-setup.py-do-not-query-for-include-dir.patch \
"
-SRC_URI[md5sum] = "7f0baf355384fe5ff2ecf66853422554"
-SRC_URI[sha256sum] =
"4791c8ae9c57d6f153354736e1ccab1e2baf6c8d9ae5a77a9ac90f41e2966b2d"
+SRC_URI[md5sum] = "6b9dd98917061803d9158e5258b8f412"
+SRC_URI[sha256sum] =
"1eb7fa3b9bd9174dfe9c3b59b7a09b768ecd496debfc4976a9530a3e15c990d1"
# The python-gevent has no autoreconf ability
# and the logic for detecting a cross compile is flawed
diff --git
a/meta-python/recipes-devtools/python/python-gevent/0002-setup.py-do-not-query-for-include-dir.patch
b/meta-python/recipes-devtools/python/python-gevent/0002-setup.py-do-not-query-for-include-dir.patch
new file mode 100644
index 0..7536b71a6
--- /dev/null
+++
b/meta-python/recipes-devtools/python/python-gevent/0002-setup.py-do-not-query-for-include-dir.patch
@@ -0,0 +1,26 @@
+From a53ed6b2f967a5f95e69d51cad3f8c120d7df65b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Thu, 7 Feb 2019 15:21:15 +0100
+Subject: [PATCH] setup.py: do not query for include dir
+
+As this will return the native python directory erroneously.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 86d6c5a..5d22291 100755
+--- a/setup.py
b/setup.py
+@@ -52,7 +52,7 @@ from _setupares import ARES
+ # Get access to the greenlet header file.
+ # The sysconfig dir is not enough if we're in a virtualenv
+ # See https://github.com/pypa/pip/issues/4610
+-include_dirs = [sysconfig.get_path("include")]
++include_dirs = []
+ venv_include_dir = os.path.join(sys.prefix, 'include', 'site',
+ 'python' + sysconfig.get_python_version())
+ venv_include_dir = os.path.abspath(venv_include_dir)
diff --git a/meta-python/recipes-devtools/python/python3-gevent_1.2.2.bb
b/meta-python/recipes-devtools/python/python3-gevent_1.4.0.bb
similarity index 97%
rename from meta-python/recipes-devtools/python/python3-gevent_1.2.2.bb
rename to meta-python/recipes-devtools/python/python3-gevent_1.4.0.bb
index 1f172e586..df688e424 100644
--- a/meta-python/recipes-devtools/python/python3-gevent_1.2.2.bb
+++ b/meta-python/recipes-devtools/python/python3-gevent_1.4.0.bb
@@ -1,3 +1,2 @@
require python-gevent.inc
inherit setuptools3
-
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe] [PATCH] rapidjson: fix cmake artifacts installation for non-default BASELIB case
If BASELIB is set to non-default value (like lib64),
next 'installed but not shipped' issue happens:
/usr/lib
/usr/lib/cmake
/usr/lib/pkgconfig
/usr/lib/cmake/RapidJSON
/usr/lib/cmake/RapidJSON/RapidJSONConfigVersion.cmake
/usr/lib/cmake/RapidJSON/RapidJSONConfig.cmake
/usr/lib/pkgconfig/RapidJSON.pc
This is because rapidjson has library installation dir set
to 'lib' by default and hardcoded in another place.
Fix this by next changes:
- set appropriate LIB_INSTALL_DIR
- fix hardcoded 'lib' in CMAKECONFIG_INSTALL_DIR case
Signed-off-by: Ruslan Bilovol
---
...ve-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch | 36 ++
.../recipes-devtools/rapidjson/rapidjson_git.bb| 5 +--
2 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644
meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
diff --git
a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
new file mode 100644
index 000..745f5d0
--- /dev/null
+++
b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch
@@ -0,0 +1,36 @@
+From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001
+From: Ruslan Bilovol
+Date: Thu, 24 Jan 2019 18:11:39 +0200
+Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path
+
+Currently this path is hardcoded to lib/cmake.
+Some distributions have different library path (like lib64).
+So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR
+configurable and usable in such distros.
+
+Upstream-Status: Backport
[https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9]
+
+Signed-off-by: Ruslan Bilovol
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7c60407..0275672 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -199,9 +199,9 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY)
+
+ # ... for the install tree
+-SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} )
++SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} )
+ FILE( RELATIVE_PATH REL_INCLUDE_DIR
+-"${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}"
++"${CMAKECONFIG_INSTALL_DIR}"
+ "${CMAKE_INSTALL_PREFIX}/include" )
+
+ SET( ${PROJECT_NAME}_INCLUDE_DIR
"\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" )
+--
+1.9.1
+
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index c90eab0..e3ed9c6 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -4,7 +4,8 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
-SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1"
+SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \
+
file://0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch"
SRCREV = "6a905f9311f82d306da77bd963ec5aa5da07da9c"
@@ -14,7 +15,7 @@ S = "${WORKDIR}/git"
inherit cmake
-EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF
-DRAPIDJSON_BUILD_EXAMPLES=OFF"
+EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF
-DRAPIDJSON_BUILD_EXAMPLES=OFF -DLIB_INSTALL_DIR:STRING=${libdir}"
# RapidJSON is a header-only C++ library, so the main package will be empty.
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
