[oe-commits] Martin Jansa : elsa: rename to entrance
git at git.openembedded.org
git at git.openembedded.org
Mon Aug 20 18:11:05 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: 886738268ae524dc9345c00f1e33fc9ced4939a9
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=886738268ae524dc9345c00f1e33fc9ced4939a9
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Fri Aug 10 11:55:35 2012 +0200
elsa: rename to entrance
* elsa was killed in r75060 and reintroduced in r75061 with old name - entrance
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
...am-use-common-auth-instead-of-system-auth.patch | 19 ++++++++-----------
.../efl/{elsa_svn.bb => entrance_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
similarity index 64%
rename from meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch
rename to meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch
index a9beea0..a82d1ed 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 at 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 at 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
similarity index 92%
rename from meta-efl/recipes-efl/efl/elsa_svn.bb
rename to meta-efl/recipes-efl/efl/entrance_svn.bb
index e23a694..585d552 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"
More information about the Openembedded-commits
mailing list