summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch23
-rw-r--r--meta/recipes-extended/polkit/polkit_0.101.bb7
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 @@
1polkit: No system-auth in OE-Core, we can use common-* in place of it.
2
3Upstream-Status:Inappropriate [configuration]
4
5Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
6
7--- a/configure.ac 2011-03-04 02:26:20.000000000 +0800
8+++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800
9@@ -350,10 +350,10 @@
10 PAM_FILE_INCLUDE_PASSWORD=system
11 PAM_FILE_INCLUDE_SESSION=system
12 else
13- PAM_FILE_INCLUDE_AUTH=system-auth
14- PAM_FILE_INCLUDE_ACCOUNT=system-auth
15- PAM_FILE_INCLUDE_PASSWORD=system-auth
16- PAM_FILE_INCLUDE_SESSION=system-auth
17+ PAM_FILE_INCLUDE_AUTH=common-auth
18+ PAM_FILE_INCLUDE_ACCOUNT=common-account
19+ PAM_FILE_INCLUDE_PASSWORD=common-password
20+ PAM_FILE_INCLUDE_SESSION=common-session
21 fi
22
23 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 \
7 file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f" 7 file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
8 8
9SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \ 9SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
10 file://introspection.patch" 10 file://introspection.patch \
11PR = "r0" 11 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
12
13PAM_SRC_URI = "file://polkit-1_pam.patch"
14PR = "r1"
12DEPENDS = "libpam expat dbus-glib eggdbus intltool" 15DEPENDS = "libpam expat dbus-glib eggdbus intltool"
13RDEPENDS_${PN} = "libpam" 16RDEPENDS_${PN} = "libpam"
14EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection" 17EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"