From 886738268ae524dc9345c00f1e33fc9ced4939a9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 Aug 2012 11:55:35 +0200 Subject: elsa: rename to entrance * elsa was killed in r75060 and reintroduced in r75061 with old name - entrance Signed-off-by: Martin Jansa --- ...am-use-common-auth-instead-of-system-auth.patch | 29 ---------------------- meta-efl/recipes-efl/efl/elsa_svn.bb | 23 ----------------- ...am-use-common-auth-instead-of-system-auth.patch | 26 +++++++++++++++++++ meta-efl/recipes-efl/efl/entrance_svn.bb | 21 ++++++++++++++++ 4 files changed, 47 insertions(+), 52 deletions(-) delete mode 100644 meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch delete mode 100644 meta-efl/recipes-efl/efl/elsa_svn.bb create mode 100644 meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch create mode 100644 meta-efl/recipes-efl/efl/entrance_svn.bb (limited to 'meta-efl') 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/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch deleted file mode 100644 index a9beea0b74..0000000000 --- a/meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 27dc9147a822d69be90edd0d137b80c0c609d5d2 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 24 Nov 2011 13:25:33 +0100 -Subject: [PATCH] pam: use common-auth instead of system-auth - -Signed-off-by: Martin Jansa ---- - PROTO/elsa/data/elsa | 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 - - --auth include system-auth --account include system-auth --password include system-auth --session include system-auth -+auth include common-auth -+account include common-account -+password include common-password -+session include common-session --- -1.7.8.rc3 - diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb deleted file mode 100644 index e23a694dbb..0000000000 --- a/meta-efl/recipes-efl/efl/elsa_svn.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Login manager for Enlightenment" -DEPENDS = "efreet eina eet ecore elementary" -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 \ -" -S = "${WORKDIR}/${SRCNAME}" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" - -PV = "0.0.4+svnr${SRCPV}" -SRCREV = "${EFL_SRCREV}" - -RDEPENDS_${PN} += "${PN}-themes sessreg xauth" -CONFFILES_${PN} += "${sysconfdir}/elsa.conf" -RCONFLICTS_${PN} += "xserver-nodm-init" -RREPLACES_${PN} += "xserver-nodm-init" diff --git a/meta-efl/recipes-efl/efl/entrance/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 new file mode 100644 index 0000000000..a82d1ed3c8 --- /dev/null +++ b/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch @@ -0,0 +1,26 @@ +From 14396c52a2556b1ab778a310a318ec19c2829735 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 24 Nov 2011 13:25:33 +0100 +Subject: [PATCH] pam: use common-auth instead of system-auth + +Signed-off-by: Martin Jansa +--- + PROTO/entrance/data/entrance | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +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 +-session include system-auth ++auth include common-auth ++account include common-account ++password include common-password ++session include common-session +-- +1.7.8.6 + diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb new file mode 100644 index 0000000000..585d552c2c --- /dev/null +++ b/meta-efl/recipes-efl/efl/entrance_svn.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Login manager for Enlightenment" +DEPENDS = "efreet eina eet ecore elementary" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "e/apps" + +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 \ +" +S = "${WORKDIR}/${SRCNAME}" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" + +PV = "0.0.4+svnr${SRCPV}" +SRCREV = "${EFL_SRCREV}" + +RDEPENDS_${PN} += "${PN}-themes sessreg xauth" +CONFFILES_${PN} += "${sysconfdir}/entrance.conf" +RCONFLICTS_${PN} += "xserver-nodm-init" +RREPLACES_${PN} += "xserver-nodm-init" -- cgit 1.2.3-korg