aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 14:57:40 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:06 +0200
commit54bcafbd5f38f211649464258351521be677ff41 (patch)
tree286df00db61ed6023eac3a36e0a5e0177d8e28e7
parentae3415b28961944b8d55013971b571ba3cb495aa (diff)
downloadmeta-openembedded-contrib-54bcafbd5f38f211649464258351521be677ff41.tar.gz
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>
-rw-r--r--meta-oe/recipes-extended/polkit/polkit_0.104.bb3
-rw-r--r--meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend3
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 ab2547b831..cc39654fe0 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 7e1954f09f..0000000000
--- a/meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PRINC := "${@int(PRINC) + 2}"
-
-POLKITAUTH = "systemd"