[OE-core] [PATCH 08/11] systemd: drop unneeded $D check in prerm

[Christopher Larson]

From: Christopher Larson <chris_larson at mentor.com>

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
---
 meta/classes/qemu.bbclass                | 5 +++++
 meta/recipes-core/systemd/systemd_225.bb | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 315c17f..1f5bbcc 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -50,3 +50,8 @@ QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e5500"
 QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e6500"
 QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e6500"
 QEMU_EXTRAOPTIONS_ppc7400   = " -cpu 7400"
+
+python () {
+    if "QEMU_EXTRAOPTIONS" in d and d.expand("QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}") not in d and d.getVar("PACKAGE_ARCH", True) != "all":
+        bb.fatal("Incorrect use of overrides rather than PACKAGE_ARCH for QEMU_EXTRAOPTIONS")
+}
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb
index 9b0503d..6bd9adc 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -408,11 +408,7 @@ pkg_postinst_udev-hwdb () {
 }
 
 pkg_prerm_udev-hwdb () {
-	if test -n "$D"; then
-		exit 1
-	fi
-
-	rm -f ${sysconfdir}/udev/hwdb.bin
+	rm -f $D${sysconfdir}/udev/hwdb.bin
 }
 
 # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so
-- 
2.2.1