From 2b0e95fd5d1a4610f4bdc5b929500472562f7b37 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Nov 2009 13:35:50 +0100 Subject: gdm: tweak initscript and add grep to depends since busybox grep doesn't do -w --- recipes/gnome/gdm-2.28.0/gdm | 11 +++++++++++ recipes/gnome/gdm_2.28.0.bb | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'recipes/gnome') diff --git a/recipes/gnome/gdm-2.28.0/gdm b/recipes/gnome/gdm-2.28.0/gdm index fed9c06ad7..22ee7d461d 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..ac5d52505d 100644 --- a/recipes/gnome/gdm_2.28.0.bb +++ b/recipes/gnome/gdm_2.28.0.bb @@ -3,10 +3,12 @@ LICENSE = "GPL" DEPENDS = "libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb" -PR = "r1" +PR = "r2" inherit gnome update-rc.d +RDEPENDS_${PN} += "grep" + SRC_URI += " \ file://cross-xdetection.diff;patch=1 \ file://%gconf-tree.xml \ -- cgit v1.2.3 From 12c4514ab0a0e20b69ae81d09e320a1737fdb265 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Nov 2009 14:10:30 +0100 Subject: gdm: add tcp-wrappers to DEPENDS, fix typo in initscript --- recipes/gnome/gdm-2.28.0/gdm | 2 +- recipes/gnome/gdm_2.28.0.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes/gnome') diff --git a/recipes/gnome/gdm-2.28.0/gdm b/recipes/gnome/gdm-2.28.0/gdm index 22ee7d461d..43eae95177 100755 --- a/recipes/gnome/gdm-2.28.0/gdm +++ b/recipes/gnome/gdm-2.28.0/gdm @@ -40,7 +40,7 @@ case "$1" in mkdir -m 01770 /var/log/gdm chown gdm:gdm /var/log/gdm - if [ -e /tmp/.ICE-unix \ ; then + if [ -e /tmp/.ICE-unix ] ; then rm -rf /tmp/.ICE-unix fi diff --git a/recipes/gnome/gdm_2.28.0.bb b/recipes/gnome/gdm_2.28.0.bb index ac5d52505d..1fc5e74f73 100644 --- a/recipes/gnome/gdm_2.28.0.bb +++ b/recipes/gnome/gdm_2.28.0.bb @@ -1,9 +1,9 @@ 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 = "r2" +PR = "r3" inherit gnome update-rc.d -- cgit v1.2.3 From 21cb1d0889888aac967711de53fb6e354058b56e Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 5 Nov 2009 21:43:08 +0000 Subject: gnome-icon-theme-2.28.0: Set it as arch-independent package. --- recipes/gnome/gnome-icon-theme_2.28.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes/gnome') 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 - - -- cgit v1.2.3