aboutsummaryrefslogtreecommitdiffstats
path: root/meta-efl
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 /meta-efl
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>
Diffstat (limited to 'meta-efl')
-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 a9beea0b74..a82d1ed3c8 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 @@
-From 27dc9147a822d69be90edd0d137b80c0c609d5d2 Mon Sep 17 00:00:00 2001
+From 14396c52a2556b1ab778a310a318ec19c2829735 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 24 Nov 2011 13:25:33 +0100
Subject: [PATCH] pam: use common-auth instead of system-auth
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- PROTO/elsa/data/elsa | 8 ++++----
+ PROTO/entrance/data/entrance | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/data/elsa b/data/elsa
-index 3476d55..47d29222 100644
---- a/data/elsa
-+++ b/data/elsa
-@@ -1,7 +1,7 @@
- # File autogenerated by pamd_mimic in pam eclass
-
-
+diff --git a/data/entrance b/data/entrance
+index 872c83d..2b98c3a 100644
+--- a/data/entrance
++++ b/data/entrance
+@@ -1,4 +1,4 @@
-auth include system-auth
-account include system-auth
-password include system-auth
@@ -25,5 +22,5 @@ index 3476d55..47d29222 100644
+password include common-password
+session include common-session
--
-1.7.8.rc3
+1.7.8.6
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb
index e23a694dbb..585d552c2c 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+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SECTION = "e/apps"
-PR = "r2"
-
inherit e gettext
SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
file://0001-pam-use-common-auth-instead-of-system-auth.patch \
@@ -18,6 +16,6 @@ PV = "0.0.4+svnr${SRCPV}"
SRCREV = "${EFL_SRCREV}"
RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
-CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
+CONFFILES_${PN} += "${sysconfdir}/entrance.conf"
RCONFLICTS_${PN} += "xserver-nodm-init"
RREPLACES_${PN} += "xserver-nodm-init"