diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-gnome/json-glib | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-gnome/json-glib')
| -rw-r--r-- | poky/meta/recipes-gnome/json-glib/json-glib/run-ptest | 3 | ||||
| -rw-r--r-- | poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb (renamed from poky/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb) | 18 |
2 files changed, 14 insertions, 7 deletions
diff --git a/poky/meta/recipes-gnome/json-glib/json-glib/run-ptest b/poky/meta/recipes-gnome/json-glib/json-glib/run-ptest new file mode 100644 index 000000000..0c6398a17 --- /dev/null +++ b/poky/meta/recipes-gnome/json-glib/json-glib/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner json-glib diff --git a/poky/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb b/poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb index 19fe3cc44..95f90569d 100644 --- a/poky/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb +++ b/poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb @@ -10,13 +10,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "35107e23a7bbbc70f31c34f7b9adf1c3" -SRC_URI[archive.sha256sum] = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8" - GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase lib_package gobject-introspection gtk-doc gettext +inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages + +SRC_URI += "file://run-ptest" +SRC_URI[archive.md5sum] = "4d4bb9837f6d31e32d0ce658ae135f68" +SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47" + +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" -# This builds both API docs (via gtk-doc) and manpages +# This builds both API docs (via gtk-doc) GTKDOC_ENABLE_FLAG = "-Ddocs=true" GTKDOC_DISABLE_FLAG = "-Ddocs=false" @@ -29,8 +32,9 @@ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'T '${GI_DISABLE_FLAG}', d)} " do_install_append() { - # FIXME: these need to be provided via ptest - rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} + if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then + rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} + fi } BBCLASSEXTEND = "native nativesdk" |
