Patchwork [1/2] consolekit 0.4.5: add pam support based on distro features

login
register
mail settings
Submitter Koen Kooi
Date June 25, 2011, 9:24 a.m.
Message ID <1308993885-14753-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/6511/
State New, archived
Headers show

Comments

Koen Kooi - June 25, 2011, 9:24 a.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../recipes-support/consolekit/consolekit_0.4.5.bb |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
Koen Kooi - June 30, 2011, 6:46 p.m.
ping 

Op 25 jun 2011, om 11:24 heeft Koen Kooi het volgende geschreven:

> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> .../recipes-support/consolekit/consolekit_0.4.5.bb |   13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
> index f3b1ef8..2b85455 100644
> --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
> +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
> @@ -2,11 +2,13 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login
> HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
> BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit"
> 
> +PR = "r2"
> +
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
>                     file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
> 
> -DEPENDS = "dbus"
> +DEPENDS = "dbus ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
> 
> inherit gnome
> 
> @@ -18,8 +20,13 @@ SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368
> 
> S = "${WORKDIR}/ConsoleKit-${PV}"
> 
> -EXTRA_OECONF = "--with-systemdsystemunitdir=${base_libdir}/systemd/system/"
> +EXTRA_OECONF = "--with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
> +                ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${libdir}/security', '--disable-pam-module', d)} \
> +               "
> 
> -FILES_${PN} += "${libdir}/ConsoleKit ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit"
> +FILES_${PN} += "${libdir}/ConsoleKit ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*"
> 
> +PACKAGES =+ "pam-plugin-ck-connector"
> +FILES_pam-plugin-ck-connector += "${libdir}/security/*.so"
> +RDEPENDS_pam-plugin-ck-connector += "${PN}"
> 
> -- 
> 1.6.6.1
>
Richard Purdie - June 30, 2011, 10:01 p.m.
On Sat, 2011-06-25 at 11:24 +0200, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  .../recipes-support/consolekit/consolekit_0.4.5.bb |   13 ++++++++++---
>  1 files changed, 10 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
index f3b1ef8..2b85455 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
@@ -2,11 +2,13 @@  DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit"
 
+PR = "r2"
+
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
 
-DEPENDS = "dbus"
+DEPENDS = "dbus ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 inherit gnome
 
@@ -18,8 +20,13 @@  SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368
 
 S = "${WORKDIR}/ConsoleKit-${PV}"
 
-EXTRA_OECONF = "--with-systemdsystemunitdir=${base_libdir}/systemd/system/"
+EXTRA_OECONF = "--with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
+                ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${libdir}/security', '--disable-pam-module', d)} \
+               "
 
-FILES_${PN} += "${libdir}/ConsoleKit ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit"
+FILES_${PN} += "${libdir}/ConsoleKit ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*"
 
+PACKAGES =+ "pam-plugin-ck-connector"
+FILES_pam-plugin-ck-connector += "${libdir}/security/*.so"
+RDEPENDS_pam-plugin-ck-connector += "${PN}"