Skip to contentSkip to conversation

nativesdk-meson: add missing dependency on setuptools

PATCH In review Ross Burton 3 participants 5 messages Dec 20, 2018 – Jan 3, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Ross Burton

author
#0 lore raw

PATCH 1/3 nativesdk-meson: add missing dependency on setuptools

Meson uses pkg_resources, which is part of setuptools.

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb +2 -3
index 53503aa9988..721ee8c8f12 100644
@@ -66,9 +66,8 @@ do_install_append() {
 
 RDEPENDS_${PN} += "\
     nativesdk-ninja \
-    nativesdk-python3-core \
-    nativesdk-python3-misc \
-    nativesdk-python3-modules \
+    nativesdk-python3 \
+    nativesdk-python3-setuptools \
     "
 
 FILES_${PN} += "${datadir}/meson ${SDKPATHNATIVE}"
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/3 nativesdk-packagegroup-sdk-host: add Meson

Meson is growing in popularity, so add it to the SDK packagegroup.

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +1 -0
index 4bf0ac04577..ae989011f48 100644
@@ -22,6 +22,7 @@ RDEPENDS_${PN} = "\
     nativesdk-shadow \
     nativesdk-makedevs \
     nativesdk-cmake \
+    nativesdk-meson \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \
     nativesdk-sdk-provides-dummy \
     nativesdk-bison \
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH 3/3 oeqa/sdk: add test to exercise Meson

In reply to Ross Burton
Signed-off-by Ross Burton <[email protected]>
---
 meta/lib/oeqa/sdk/cases/buildepoxy.py | 36 +++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 meta/lib/oeqa/sdk/cases/buildepoxy.py
meta/lib/oeqa/sdk/cases/buildepoxy.py new file +36 -0
new file mode 100644
index 00000000000..47ae5e96df3
@@ -0,0 +1,36 @@
+import os
+import subprocess
+import tempfile
+import unittest
+
+from oeqa.sdk.case import OESDKTestCase
+from oeqa.utils.subprocesstweak import errors_have_output
+errors_have_output()
+
+class EpoxyTest(OESDKTestCase):
+    """
+    Test that Meson builds correctly.
+    """
+    def setUp(self):
+        if not (self.tc.hasHostPackage("nativesdk-meson")):
+            raise unittest.SkipTest("GalculatorTest class: SDK doesn't contain Meson")
+
+    def test_epoxy(self):
+        with tempfile.TemporaryDirectory(prefix="epoxy", dir=self.tc.sdk_dir) as testdir:
+            dl_dir = self.td.get('DL_DIR', None)
+            tarball = self.fetch(testdir, dl_dir, "https://github.com/anholt/libepoxy/releases/download/1.5.3/libepoxy-1.5.3.tar.xz")
+
+            dirs = {}
+            dirs["source"] = os.path.join(testdir, "libepoxy-1.5.3")
+            dirs["build"] = os.path.join(testdir, "build")
+            dirs["install"] = os.path.join(testdir, "install")
+
+            subprocess.check_output(["tar", "xf", tarball, "-C", testdir])
+            self.assertTrue(os.path.isdir(dirs["source"]))
+            os.makedirs(dirs["build"])
+
+            self._run("meson -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs))
+            self._run("ninja -C {build} -v".format(**dirs))
+            self._run("DESTDIR={install} ninja -C {build} -v install".format(**dirs))
+
+            self.check_elf(os.path.join(dirs["install"], "usr", "local", "lib", "libepoxy.so"))
Signature · 1 line
2.11.0
#4 lore raw

✗ patchtest: failure for "nativesdk-meson: add missing d..." and 2 more

In reply to Ross Burton

== Series Details ==

Series: "nativesdk-meson: add missing d..." and 2 more
Revision: 1
URL : https://patchwork.openembedded.org/series/15436/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 284596e947)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe