polkit: move systemd support from meta-systemd back to meta-oe

* POLKITAUTH isn't used anymore PACKAGECONFIG should select right version for systemd now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 1 insertions, 5 deletions

diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bb b/meta-oe/recipes-extended/polkit/polkit_0.104.bb
index ab2547b83..cc39654fe 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bb
@@ -15,7 +15,7 @@ PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
 # there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS
 PACKAGECONFIG[consolekit] = ",,,consolekit"
 
-PR = "r9"
+PR = "r12"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
 SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
@@ -41,4 +41,3 @@ FILES_${PN} += "${libdir}/${BPN}-1/extensions/*.so \
                 ${datadir}/dbus-1/system-services/*"
 FILES_${PN}-dbg += "${libdir}/${BPN}-1/extensions/.debug/*.so"
 FILES_${PN}-dev += "${libdir}/${BPN}-1/extensions/*.la "
-
diff --git a/meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend b/meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
deleted file mode 100644
index 7e1954f09..000000000
--- a/meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PRINC := "${@int(PRINC) + 2}"
-
-POLKITAUTH = "systemd"