diff options
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-extended/polkit/polkit_0.101.bb | 7 |
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch new file mode 100644 index 0000000000..74647efce4 --- /dev/null +++ b/meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch @@ -0,0 +1,23 @@ +polkit: No system-auth in OE-Core, we can use common-* in place of it. + +Upstream-Status:Inappropriate [configuration] + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> + +--- a/configure.ac 2011-03-04 02:26:20.000000000 +0800 ++++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800 +@@ -350,10 +350,10 @@ + PAM_FILE_INCLUDE_PASSWORD=system + PAM_FILE_INCLUDE_SESSION=system + else +- PAM_FILE_INCLUDE_AUTH=system-auth +- PAM_FILE_INCLUDE_ACCOUNT=system-auth +- PAM_FILE_INCLUDE_PASSWORD=system-auth +- PAM_FILE_INCLUDE_SESSION=system-auth ++ PAM_FILE_INCLUDE_AUTH=common-auth ++ PAM_FILE_INCLUDE_ACCOUNT=common-account ++ PAM_FILE_INCLUDE_PASSWORD=common-password ++ PAM_FILE_INCLUDE_SESSION=common-session + fi + + AC_SUBST(PAM_FILE_INCLUDE_AUTH) diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb index 6769914881..56ceca46cb 100644 --- a/meta/recipes-extended/polkit/polkit_0.101.bb +++ b/meta/recipes-extended/polkit/polkit_0.101.bb @@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f" SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \ - file://introspection.patch" -PR = "r0" + file://introspection.patch \ + ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + +PAM_SRC_URI = "file://polkit-1_pam.patch" +PR = "r1" DEPENDS = "libpam expat dbus-glib eggdbus intltool" RDEPENDS_${PN} = "libpam" EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection" |