From 7d35f4c3b15412d2a3ce94c48a69735d3c6c3942 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 19 Aug 2020 13:59:14 -0700
Subject: [PATCH] sdbus-c++: Fix ptest packaging

Define builtin PTEST_PATH
Delete the systemd test fragment if ptest is not enabled
Fixes
NOTE: Executing Tasks
ERROR: sdbus-c++-0.8.1-r0 do_package: QA Issue: sdbus-c++: Files/directories were installed but not shipped in any package:
  /etc
  /etc/dbus-1
  /etc/dbus-1/system.d
  /etc/dbus-1/system.d/org.sdbuscpp.integrationtests.conf

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Stanislav Angelovic <angelovic.s@gmail.com>
---
 meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb
index c4d63fd272..82860a82f7 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb
@@ -26,7 +26,12 @@ EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \
 
 S = "${WORKDIR}/git"
 
-FILES_${PN}_remove = "${sysconfdir}"
-FILES_${PN}-ptest += "${sysconfdir}/dbus-1/system.d/"
-FILES_${PN}-ptest += "${libdir}/${BPN}/tests"
+do_install_append() {
+    if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
+        rm -rf ${D}${sysconfdir}/dbus-1
+    fi
+}
+
+PTEST_PATH = "${libdir}/${BPN}/tests"
+FILES_${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/"
 FILES_${PN}-dev += "${bindir}/sdbus-c++-xml2cpp"