[oe-commits] Koen Kooi : gdm: move to 2.28.2, fix conflict with libpam-base-files
git version control
git at git.openembedded.org
Fri Jan 15 00:17:08 UTC 2010
Module: openembedded.git
Branch: shr/merge
Commit: a267182e1235bb1fc4d437a3b8131b1e9de15732
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a267182e1235bb1fc4d437a3b8131b1e9de15732
Author: Koen Kooi <koen at openembedded.org>
Date: Wed Jan 13 15:44:52 2010 +0100
gdm: move to 2.28.2, fix conflict with libpam-base-files
---
conf/checksums.ini | 4 ++++
recipes/gnome/gdm-2.28.1/other | 17 -----------------
.../{gdm-2.28.1 => gdm-2.28.2}/%gconf-tree.xml | 0
.../cross-xdetection.diff | 0
recipes/gnome/{gdm-2.28.1 => gdm-2.28.2}/gdm | 0
.../{gdm-2.28.1 => gdm-2.28.2}/gdm-nodocs.patch | 0
recipes/gnome/{gdm-2.28.1 => gdm-2.28.2}/gdm-pam | 0
recipes/gnome/{gdm-2.28.1 => gdm-2.28.2}/gdm.conf | 0
recipes/gnome/{gdm_2.28.1.bb => gdm_2.28.2.bb} | 6 ++----
9 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6705a70..18a5dd1 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8562,6 +8562,10 @@ sha256=b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4
md5=917dc80f5ef6adcdc15193de238476db
sha256=da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a
+[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/gdm-2.28.2.tar.bz2]
+md5=9607c6bac31c9d8bd3446e66a4576c2e
+sha256=0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a
+
[http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2]
md5=c6c22c7f9feff81a15f5c8ece03b87c1
sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
diff --git a/recipes/gnome/gdm-2.28.1/other b/recipes/gnome/gdm-2.28.1/other
deleted file mode 100644
index 1fe5756..0000000
--- a/recipes/gnome/gdm-2.28.1/other
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# /etc/pam.d/other - specify the PAM fallback behaviour
-#
-# Note that this file is used for any unspecified service; for example
-#if /etc/pam.d/cron specifies no session modules but cron calls
-#pam_open_session, the session module out of /etc/pam.d/other is
-#used. If you really want nothing to happen then use pam_permit.so or
-#pam_deny.so as appropriate.
-
-#
-# default; standard UN*X access
-#
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-
diff --git a/recipes/gnome/gdm-2.28.1/%gconf-tree.xml b/recipes/gnome/gdm-2.28.2/%gconf-tree.xml
similarity index 100%
rename from recipes/gnome/gdm-2.28.1/%gconf-tree.xml
rename to recipes/gnome/gdm-2.28.2/%gconf-tree.xml
diff --git a/recipes/gnome/gdm-2.28.1/cross-xdetection.diff b/recipes/gnome/gdm-2.28.2/cross-xdetection.diff
similarity index 100%
rename from recipes/gnome/gdm-2.28.1/cross-xdetection.diff
rename to recipes/gnome/gdm-2.28.2/cross-xdetection.diff
diff --git a/recipes/gnome/gdm-2.28.1/gdm b/recipes/gnome/gdm-2.28.2/gdm
similarity index 100%
rename from recipes/gnome/gdm-2.28.1/gdm
rename to recipes/gnome/gdm-2.28.2/gdm
diff --git a/recipes/gnome/gdm-2.28.1/gdm-nodocs.patch b/recipes/gnome/gdm-2.28.2/gdm-nodocs.patch
similarity index 100%
rename from recipes/gnome/gdm-2.28.1/gdm-nodocs.patch
rename to recipes/gnome/gdm-2.28.2/gdm-nodocs.patch
diff --git a/recipes/gnome/gdm-2.28.1/gdm-pam b/recipes/gnome/gdm-2.28.2/gdm-pam
similarity index 100%
rename from recipes/gnome/gdm-2.28.1/gdm-pam
rename to recipes/gnome/gdm-2.28.2/gdm-pam
diff --git a/recipes/gnome/gdm-2.28.1/gdm.conf b/recipes/gnome/gdm-2.28.2/gdm.conf
similarity index 100%
rename from recipes/gnome/gdm-2.28.1/gdm.conf
rename to recipes/gnome/gdm-2.28.2/gdm.conf
diff --git a/recipes/gnome/gdm_2.28.1.bb b/recipes/gnome/gdm_2.28.2.bb
similarity index 86%
rename from recipes/gnome/gdm_2.28.1.bb
rename to recipes/gnome/gdm_2.28.2.bb
index 91a5555..a0a916b 100644
--- a/recipes/gnome/gdm_2.28.1.bb
+++ b/recipes/gnome/gdm_2.28.2.bb
@@ -1,11 +1,11 @@
DESCRIPTION = "Graphical login manager"
LICENSE = "GPL"
-DEPENDS = "tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
+DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
inherit gnome update-rc.d
-RDEPENDS_${PN} += "grep"
+RDEPENDS_${PN} += "grep dbus-x11 shadow libpam-base-files"
SRC_URI += " \
file://cross-xdetection.diff;patch=1 \
@@ -13,7 +13,6 @@ SRC_URI += " \
file://gdm \
file://gdm.conf \
file://gdm-pam \
- file://other \
"
EXTRA_OECONF = " --enable-authentication-scheme=shadow \
@@ -35,7 +34,6 @@ do_install_append() {
install -d ${D}/${sysconfdir}/pam.d
install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm
- install -m 0755 ${WORKDIR}/other ${D}/${sysconfdir}/pam.d/
}
FILES_${PN} += "${datadir}/icon* \
More information about the Openembedded-commits
mailing list