diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2009-11-06 09:45:59 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-11-06 09:45:59 +0000 |
| commit | 654b4ac743061b15e0ed9ee8652d4462221b644d (patch) | |
| tree | 433fc0aa49af16fbce666ceb640b49b811b5f718 /recipes/gnome | |
| parent | 5fb5803ee97aa2c93328c4b2925142585e49adbe (diff) | |
| parent | 35cc93da885ac6d438da6aaed9517e91d4a7e6b3 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/gnome')
| -rwxr-xr-x | recipes/gnome/gdm-2.28.0/gdm | 11 | ||||
| -rw-r--r-- | recipes/gnome/gdm_2.28.0.bb | 6 | ||||
| -rw-r--r-- | recipes/gnome/gnome-icon-theme_2.28.0.bb | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/recipes/gnome/gdm-2.28.0/gdm b/recipes/gnome/gdm-2.28.0/gdm index fed9c06ad7..43eae95177 100755 --- a/recipes/gnome/gdm-2.28.0/gdm +++ b/recipes/gnome/gdm-2.28.0/gdm @@ -32,10 +32,21 @@ DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager case "$1" in start) # make needed directories in volatile + + if [ -e /var/log/gdm ] ; then + rm -rf /var/log/gdm + fi + mkdir -m 01770 /var/log/gdm chown gdm:gdm /var/log/gdm + + if [ -e /tmp/.ICE-unix ] ; then + rm -rf /tmp/.ICE-unix + fi + mkdir -m 01777 /tmp/.ICE-unix chown root:root /tmp/.ICE-unix + CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)") if grep -wqs text /proc/cmdline; then echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline." diff --git a/recipes/gnome/gdm_2.28.0.bb b/recipes/gnome/gdm_2.28.0.bb index 683773a3ab..1fc5e74f73 100644 --- a/recipes/gnome/gdm_2.28.0.bb +++ b/recipes/gnome/gdm_2.28.0.bb @@ -1,12 +1,14 @@ DESCRIPTION = "Graphical login manager" LICENSE = "GPL" -DEPENDS = "libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb" +DEPENDS = "tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb" -PR = "r1" +PR = "r3" inherit gnome update-rc.d +RDEPENDS_${PN} += "grep" + SRC_URI += " \ file://cross-xdetection.diff;patch=1 \ file://%gconf-tree.xml \ diff --git a/recipes/gnome/gnome-icon-theme_2.28.0.bb b/recipes/gnome/gnome-icon-theme_2.28.0.bb index 7e5c7b3af8..38f212927f 100644 --- a/recipes/gnome/gnome-icon-theme_2.28.0.bb +++ b/recipes/gnome/gnome-icon-theme_2.28.0.bb @@ -3,11 +3,11 @@ SECTION = "x11/gnome" DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" RDEPENDS = "hicolor-icon-theme" RRECOMMENDS = "librsvg-gtk" +PACKAGE_ARCH = "all" +PR = "r1" FILES_${PN} += "${datadir}/*" EXTRA_OECONF = "--disable-hicolor-check" inherit gnome - - |