summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-08-10 11:55:35 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2012-08-20 09:57:43 +0200
commit886738268ae524dc9345c00f1e33fc9ced4939a9 (patch)
tree006e841873cd01b527ff906712209d82252f3e90
parente823cd104ce6341f8d27ac411d84856f549d80d3 (diff)
downloadmeta-openembedded-886738268ae524dc9345c00f1e33fc9ced4939a9.tar.gz
elsa: rename to entrance
* elsa was killed in r75060 and reintroduced in r75061 with old name - entrance Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch (renamed from meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch)19
-rw-r--r--meta-efl/recipes-efl/efl/entrance_svn.bb (renamed from meta-efl/recipes-efl/efl/elsa_svn.bb)4
2 files changed, 9 insertions, 14 deletions
diff --git a/meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch b/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch
index a9beea0b7..a82d1ed3c 100644
--- a/meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch
+++ b/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch
@@ -1,21 +1,18 @@
1From 27dc9147a822d69be90edd0d137b80c0c609d5d2 Mon Sep 17 00:00:00 2001 1From 14396c52a2556b1ab778a310a318ec19c2829735 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 24 Nov 2011 13:25:33 +0100 3Date: Thu, 24 Nov 2011 13:25:33 +0100
4Subject: [PATCH] pam: use common-auth instead of system-auth 4Subject: [PATCH] pam: use common-auth instead of system-auth
5 5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7--- 7---
8 PROTO/elsa/data/elsa | 8 ++++---- 8 PROTO/entrance/data/entrance | 8 ++++----
9 1 files changed, 4 insertions(+), 4 deletions(-) 9 1 files changed, 4 insertions(+), 4 deletions(-)
10 10
11diff --git a/data/elsa b/data/elsa 11diff --git a/data/entrance b/data/entrance
12index 3476d55..47d29222 100644 12index 872c83d..2b98c3a 100644
13--- a/data/elsa 13--- a/data/entrance
14+++ b/data/elsa 14+++ b/data/entrance
15@@ -1,7 +1,7 @@ 15@@ -1,4 +1,4 @@
16 # File autogenerated by pamd_mimic in pam eclass
17
18
19-auth include system-auth 16-auth include system-auth
20-account include system-auth 17-account include system-auth
21-password include system-auth 18-password include system-auth
@@ -25,5 +22,5 @@ index 3476d55..47d29222 100644
25+password include common-password 22+password include common-password
26+session include common-session 23+session include common-session
27-- 24--
281.7.8.rc3 251.7.8.6
29 26
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb
index e23a694db..585d552c2 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/entrance_svn.bb
@@ -4,8 +4,6 @@ LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
5SECTION = "e/apps" 5SECTION = "e/apps"
6 6
7PR = "r2"
8
9inherit e gettext 7inherit e gettext
10SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \ 8SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
11 file://0001-pam-use-common-auth-instead-of-system-auth.patch \ 9 file://0001-pam-use-common-auth-instead-of-system-auth.patch \
@@ -18,6 +16,6 @@ PV = "0.0.4+svnr${SRCPV}"
18SRCREV = "${EFL_SRCREV}" 16SRCREV = "${EFL_SRCREV}"
19 17
20RDEPENDS_${PN} += "${PN}-themes sessreg xauth" 18RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
21CONFFILES_${PN} += "${sysconfdir}/elsa.conf" 19CONFFILES_${PN} += "${sysconfdir}/entrance.conf"
22RCONFLICTS_${PN} += "xserver-nodm-init" 20RCONFLICTS_${PN} += "xserver-nodm-init"
23RREPLACES_${PN} += "xserver-nodm-init" 21RREPLACES_${PN} += "xserver-nodm-init"