summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/distutils-base.bbclass5
-rw-r--r--classes/sourcepkg.bbclass14
-rw-r--r--conf/checksums.ini32
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc1
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc4
-rw-r--r--packages/gnome/gdm/cross-xdetection.diff84
-rwxr-xr-xpackages/gnome/gdm/gdm73
-rw-r--r--packages/gnome/gdm/gdm.conf80
-rw-r--r--packages/gnome/gdm_2.24.1.bb49
-rw-r--r--packages/gnome/gnome-power-manager_2.24.2.bb36
-rw-r--r--packages/hal/consolekit_0.3.0.bb18
-rw-r--r--packages/images/x11-image.bb4
-rw-r--r--packages/images/xorg-image.bb8
-rw-r--r--packages/libxml/libxml2-native.inc20
-rw-r--r--packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch2
-rw-r--r--packages/linux/linux-omap_git.bb4
-rw-r--r--packages/linux/linux-openmoko-devel_git.bb2
-rw-r--r--packages/linux/linux-openmoko.inc8
-rw-r--r--packages/linux/linux-openmoko/defconfig-oe3
-rw-r--r--packages/linux/linux-openmoko_2.6.24+git.bb2
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig67
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch23
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1b2/mozconfig66
-rw-r--r--packages/mozilla/firefox_3.1b2.bb46
-rw-r--r--packages/opencv/artoolkit_2.72.1.bb2
-rw-r--r--packages/pcmciautils/pcmciautils.inc1
-rw-r--r--packages/python/python-2.6-manifest.inc325
-rw-r--r--packages/python/python-2.6.1/00-fix-bindir-libdir-for-cross.patch20
-rw-r--r--packages/python/python-2.6.1/01-use-proper-tools-for-cross-build.patch116
-rw-r--r--packages/python/python-2.6.1/02-remove-test-for-cross.patch94
-rw-r--r--packages/python/python-2.6.1/03-fix-tkinter-detection.patch40
-rw-r--r--packages/python/python-2.6.1/04-default-is-optimized.patch52
-rw-r--r--packages/python/python-2.6.1/05-enable-ctypes-cross-build.patch28
-rw-r--r--packages/python/python-2.6.1/sitecustomize.py45
-rw-r--r--packages/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patch20
-rw-r--r--packages/python/python-native-2.6.1/04-default-is-optimized.patch18
-rw-r--r--packages/python/python-native-2.6.1/10-distutils-fix-swig-parameter.patch16
-rw-r--r--packages/python/python-native-2.6.1/11-distutils-never-modify-shebang-line.patch18
-rw-r--r--packages/python/python-native-2.6.1/12-distutils-prefix-is-inside-staging-area.patch60
-rw-r--r--packages/python/python-native-2.6.1/sitecustomize.py45
-rw-r--r--packages/python/python-native_2.6.1.bb28
-rw-r--r--packages/python/python.inc23
-rw-r--r--packages/python/python_2.6.1.bb106
-rw-r--r--packages/qt4/qt-embedded_4.4.3.bb2
-rw-r--r--packages/qt4/qt4-x11-free_4.4.3.bb2
-rw-r--r--packages/qt4/qt_packaging.inc1
-rw-r--r--packages/shasum/shasum-native.bb2
-rwxr-xr-xpackages/tracker/files/90tracker4
-rw-r--r--packages/tracker/tracker_0.5.4.bb9
-rw-r--r--packages/uclibc/uclibc-0.9.30/mipsel/uClibc.machine63
-rw-r--r--packages/vala/vala-native_0.5.2.bb (renamed from packages/vala/vala-native_0.5.1.bb)0
-rw-r--r--packages/vala/vala_0.5.2.bb (renamed from packages/vala/vala_0.5.1.bb)0
-rw-r--r--packages/xorg-driver/xf86-input-evdev_2.1.0.bb4
-rw-r--r--packages/xorg-lib/libxi_1.2.0.bb8
-rw-r--r--packages/xorg-proto/inputproto_1.5.0.bb6
-rw-r--r--packages/xorg-xserver/xorg-xserver-common.inc39
-rw-r--r--packages/xorg-xserver/xserver-xorg_1.5.3.bb2
-rw-r--r--site/common-glibc5
-rw-r--r--site/common-uclibc9
59 files changed, 1825 insertions, 39 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass
index 70155619b3..a08414aadf 100644
--- a/classes/distutils-base.bbclass
+++ b/classes/distutils-base.bbclass
@@ -8,9 +8,8 @@ export STAGING_LIBDIR
def python_dir(d):
import os, bb
staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
- if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
- if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
- if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
+ for majmin in "2.6 2.5 2.4 2.3".split():
+ if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin
raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
PYTHON_DIR = "${@python_dir(d)}"
diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 045b4ce629..200ff8c228 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -63,7 +63,7 @@ python sourcepkg_do_dumpdata() {
distro = bb.data.getVar('DISTRO', d, 1)
s_tree = get_src_tree(d)
openembeddeddir = os.path.join(workdir, s_tree, distro)
- dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}${DISTRO_PR}.showdata.dump",d))
+ dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}.showdata.dump",d))
try:
os.mkdir(openembeddeddir)
@@ -97,14 +97,20 @@ sourcepkg_do_create_diff_gz(){
cp $i $src_tree/${DISTRO}/files
done
- oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}${DISTRO_PR}.diff.gz"
- LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}${DISTRO_PR}.diff.gz
+ oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz"
+ LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz
rm -rf $src_tree.orig
}
EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+do_create_orig_tgz[deptask] = "do_unpack"
+do_create_diff_gz[deptask] = "do_patch"
+do_archive_bb[deptask] = "do_patch"
+do_dumpdata[deptask] = "do_unpack"
+
addtask create_orig_tgz after do_unpack before do_patch
addtask archive_bb after do_patch before do_dumpdata
addtask dumpdata after do_archive_bb before do_create_diff_gz
-addtask create_diff_gz after do_dump_data before do_configure
+addtask create_diff_gz after do_dumpdata before do_configure
+
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 8ed07032e8..df8149df52 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -118,6 +118,10 @@ sha256=8750d58745e57654820aa9359891cb0d875d804dbfcfa2e1bb95c56531e423d1
md5=1ab76bfd6731d80f6abbd1643c90cabd
sha256=7794d91711e8c9e526431da72c53bb08e14790f326d0e330d9e9d651f3f6fc6c
+[http://people.freedesktop.org/~mccann/dist/ConsoleKit-0.3.0.tar.bz2]
+md5=43b02a52212330b54cfb34c4044d9ce0
+sha256=cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4
+
[http://pypi.python.org/packages/source/C/Cython/Cython-0.9.6.14.tar.gz]
md5=edb342c7525119c2a924897873d215b4
sha256=dde5d254cd00e4182680b1241e9a5feebbc9b4887f5d0bac2ba2935f213c97e7
@@ -618,6 +622,10 @@ sha256=d0b5d4dce02c56d2eb0728db3ebd63afc3dae906d158be6532ae4480d311e167
md5=afb5451049eda91fbde10bd5a4b7fadc
sha256=f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e
+[http://www.python.org/ftp/python/2.6.1/Python-2.6.1.tar.bz2]
+md5=e81c2f0953aa60f8062c05a4673f2be0
+sha256=cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6
+
[http://jerakeen.org/files/PythonDaap-0.4.tar.gz]
md5=f7672bfd563787a76fb7e9a43c062f18
sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739
@@ -4910,6 +4918,10 @@ sha256=a1b5f230b152af6e5191536f25de0d021768f73cc3b35ff41a12f3daedcafb92
md5=d101c02c8ad670eeb2095e449c79c085
sha256=5382518ad10313c4c22fbfd2bf5cbf1a6e88160e7e29ab5dcd07362147d04c8d
+[http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.1b2-candidates/build2/source/firefox-3.1b2-source.tar.bz2]
+md5=c315e06cdfe9ee76aa4831ece1ed5df3
+sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e
+
[http://handhelds.org/~zecke/oe_packages/fish_V1.1.0.tar.gz]
md5=78770f1abce09fbbaa0a46ce8ccc607f
sha256=9d13db38c065d70f48ce70580c7d8cd940d923192c04bc3cb356cc98879b5788
@@ -6818,6 +6830,10 @@ sha256=78f7dc6946e178513202f06afc19496c8ac1e3ac6c43c56c40f4db1a23762179
md5=3341092fc87ced400631c3d635979426
sha256=0bcc8a35d52279cd24de93e957bf0f8b3359d096cd891e5bed07cb4b912f920b
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.24/gnome-power-manager-2.24.2.tar.bz2]
+md5=c8971e0c4ed060e0182785321f19b961
+sha256=ebf81236c9405ba47e7a21767c2372f2c3abb44cc671bac8662d2aeb3e746dbc
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.22/gnome-python-2.22.1.tar.bz2]
md5=02054115dc86617da2a80eb87a1f988b
sha256=559b5d857b4fbc31418bc677f3391182ba1c357cabb8dfee04a1e709a7a63d01
@@ -9246,6 +9262,10 @@ sha256=63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5
md5=3faf4bc1e2bb9353590d7b1fe50ec306
sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
+[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.5.0.tar.bz2]
+md5=dcc36554aea1338b3813943daf1e9988
+sha256=ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/proto/inputproto-X11R7.0-1.3.2.tar.bz2]
md5=0da271f396bede5b8d09a61f6d1c4484
sha256=3b48f495f9af74fc7cca2fe913e10ce3d947d1aa5e677722e87620b32f1068d0
@@ -10310,6 +10330,10 @@ sha256=4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862
md5=7c510abb0cad8dc20493fb27ff7859d8
sha256=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.2.0.tar.bz2]
+md5=4b88e07d7dd77ca1e786f09066b58c02
+sha256=7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
md5=99503799b4d52ec0cac8e203341bb7b3
sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
@@ -20142,6 +20166,10 @@ sha256=0a08ba289566e4d69b937c6bc29e43ba99b445811583b08bdef8d4b52e8a7d0c
md5=0051ae1f2ef967ce21e77889719daad1
sha256=b24593c78fa322349ae9967a454464e37a25ab58f44481334589a609e9bcca7b
+[http://download.gnome.org/sources/vala/0.5/vala-0.5.2.tar.bz2]
+md5=e5b2ee7a4ff5f551a278e64a3e502f50
+sha256=dbd7c9200d45e9278498817490092c468aa31ec9815f30d71deb5b5009401b64
+
[http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
md5=9407d33961186814cef0e6ecedfd6318
sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
@@ -21174,6 +21202,10 @@ sha256=71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd
md5=ac97e155ea4db87a8393297493f9c406
sha256=825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.1.0.tar.bz2]
+md5=a6070ead29b2d81b5b386a96df2661b8
+sha256=45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
md5=d982c6f185f4c75a4b65703ceed7be06
sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 8744cfc20a..f6afab61e9 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_glproto = "1.4.9"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_gtk+ = "2.14.2"
PREFERRED_VERSION_gtkmm = "2.14.1"
-PREFERRED_VERSION_inputproto = "1.4.4"
PREFERRED_VERSION_libgemwidget = "1.0"
PREFERRED_VERSION_libgpephone = "0.4"
PREFERRED_VERSION_libosip2 = "2.2.2"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
index cf999a2a4d..a81d5eca71 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -1,3 +1,7 @@
# This file is for updates after X11R7.4 was released
PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
+PREFERRED_VERSION_libxi ?= "1.2.0"
+PREFERRED_VERSION_inputproto ?= "1.5.0"
+
diff --git a/packages/gnome/gdm/cross-xdetection.diff b/packages/gnome/gdm/cross-xdetection.diff
new file mode 100644
index 0000000000..9cb6ac98dd
--- /dev/null
+++ b/packages/gnome/gdm/cross-xdetection.diff
@@ -0,0 +1,84 @@
+--- /tmp/configure.ac 2008-12-10 08:38:16.000000000 +0100
++++ gdm-2.24.1/configure.ac 2008-12-10 08:39:17.000000000 +0100
+@@ -1133,80 +1133,10 @@
+ dnl - Check for X Server location
+ dnl ---------------------------------------------------------------------------
+
+-# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
+-# symlink to each other, and configure should use the more stable
+-# location (the real directory) if possible.
+-#
+-# On Solaris, the /usr/bin/Xserver script is used to decide whether to
+-# use Xsun or Xorg, so this is used on Solaris.
+-#
+-# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6
+-# and /usr/X11 since they often symlink to each other, and configure
+-# should use the more stable location (the real directory) if possible.
+-#
+-if test -x /usr/X11/bin/Xserver; then
+- X_PATH="/usr/X11/bin"
+- X_SERVER_PATH="/usr/X11/bin"
+- X_SERVER="/usr/X11/bin/Xserver"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
+- X_PATH="/usr/X11R6/bin"
+- X_SERVER_PATH="/usr/X11R6/bin"
+- X_SERVER="/usr/X11R6/bin/X"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
+- X_PATH="/usr/X11/bin"
+- X_SERVER_PATH="/usr/X11/bin"
+- X_SERVER="/usr/X11/bin/X"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11R6/bin/X; then
+- X_PATH="/usr/X11R6/bin"
+- X_SERVER_PATH="/usr/X11R6/bin"
+- X_SERVER="/usr/X11R6/bin/X"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/bin/Xorg; then
+ X_PATH="/usr/bin"
+ X_SERVER_PATH="/usr/bin"
+- X_SERVER="/usr/bin/Xorg"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11/bin/X; then
+- X_PATH="/usr/X11/bin"
+- X_SERVER_PATH="/usr/X11/bin"
+- X_SERVER="/usr/X11/bin/X"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/openwin/bin/Xsun; then
+- # Do not add /usr/openwin/bin here because on Solaris you need
+- # /usr/openwin/bin in your PATH even if you are using the Xorg
+- # Xserver. We add this to the path below.
+- X_PATH="/usr/openwin/bin"
+- X_SERVER_PATH="/usr/openwin/bin"
+- X_SERVER="/usr/openwin/bin/Xsun"
+- X_CONFIG_OPTIONS="-audit 0 -nobanner"
+-elif test -x /opt/X11R6/bin/X; then
+- X_PATH="/opt/X11R6/bin"
+- X_SERVER_PATH="/opt/X11R6/bin"
+- X_SERVER="/opt/X11R6/bin/X"
+- GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/bin/X; then
+- X_PATH="/usr/bin"
+- X_SERVER_PATH="/usr/bin"
+- X_SERVER="/usr/bin/X"
+- X_CONFIG_OPTIONS="-audit 0"
+-else
+- # what to do, what to do, this is wrong, but this just sets the
+- # defaults, perhaps this user is cross compiling or some such
+- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
+- X_SERVER_PATH="/usr/X11R6/bin"
+- X_SERVER="/usr/X11R6/bin/X"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
++ X_SERVER="/etc/X11/Xserver"
+ X_CONFIG_OPTIONS="-audit 0"
+-fi
+
+ # Don't add bindir to GDM_USER_PATH if it is already in the PATH.
+ # If it is /bin or /usr/bin, for example.
diff --git a/packages/gnome/gdm/gdm b/packages/gnome/gdm/gdm
new file mode 100755
index 0000000000..0d43a6f91a
--- /dev/null
+++ b/packages/gnome/gdm/gdm
@@ -0,0 +1,73 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: gdm
+# Should-Start: console-screen acpid dbus hal network-manager
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: GNOME Display Manager
+# Description: Debian init script for the GNOME Display Manager
+### END INIT INFO
+#
+# Author: Ryan Murray <rmurray@debian.org>
+#
+set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/gdm
+
+test -x $DAEMON || exit 0
+
+if [ -r /etc/default/locale ]; then
+ . /etc/default/locale
+ export LANG LANGUAGE
+fi
+
+# To start gdm even if it is not the default display manager, change
+# HEED_DEFAULT_DISPLAY_MANAGER to "false."
+HEED_DEFAULT_DISPLAY_MANAGER=true
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+case "$1" in
+ start)
+ 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."
+ elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
+ [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
+ [ "$CONFIGURED_DAEMON" != gdm ] ; then
+ echo "Not starting GNOME Display Manager; it is not the default display manager"
+ else
+ echo "Starting GNOME Display Manager" "gdm"
+ start-stop-daemon --start --quiet --exec $DAEMON
+ fi
+ ;;
+ stop)
+ echo "Stopping GNOME Display Manager" "gdm"
+ set +e
+ start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \
+ --name gdm --retry 5
+ set -e
+ ;;
+ reload)
+ echo "Scheduling reload of GNOME Display Manager configuration" "gdm"
+ set +e
+ start-stop-daemon --stop --signal USR1 --quiet --pidfile \
+ /var/run/gdm.pid --name gdm
+ set -e
+ ;;
+ status)
+ status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $?
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/packages/gnome/gdm/gdm.conf b/packages/gnome/gdm/gdm.conf
new file mode 100644
index 0000000000..559823b863
--- /dev/null
+++ b/packages/gnome/gdm/gdm.conf
@@ -0,0 +1,80 @@
+# GDM Custom Configuration file.
+#
+# This file is the appropriate place for specifying your customizations to the
+# GDM configuration. If you run gdmsetup, it will automatically edit this
+# file for you and will cause the daemon and any running GDM GUI programs to
+# automatically update with the new configuration. Not all configuration
+# options are supported by gdmsetup, so to modify some values it may be
+# necessary to modify this file directly by hand.
+#
+# This file overrides the default configuration settings. These settings
+# are stored in the GDM System Defaults configuration file, which is found
+# at the following location.
+#
+# /usr/share/gdm/defaults.conf.
+#
+# This file contains comments about the meaning of each configuration option,
+# so is also a useful reference. Also refer to the documentation links at
+# the end of this comment for further information. In short, to hand-edit
+# this file, simply add or modify the key=value combination in the
+# appropriate section in the template below this comment section.
+#
+# For example, if you want to specify a different value for the Enable key
+# in the "[debug]" section of your GDM System Defaults configuration file,
+# then add "Enable=true" in the "[debug]" section of this file. If the
+# key already exists in this file, then simply modify it.
+#
+# Older versions of GDM used the "gdm.conf" file for configuration. If your
+# system has an old gdm.conf file on the system, it will be used instead of
+# this file - so changes made to this file will not take effect. Consider
+# migrating your configuration to this file and removing the gdm.conf file.
+#
+# If you hand edit a GDM configuration file, you can run the following
+# command and the GDM daemon will immediately reflect the change. Any
+# running GDM GUI programs will also be notified to update with the new
+# configuration.
+#
+# gdmflexiserver --command="UPDATE_CONFIG <configuration key>"
+#
+# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable".
+#
+# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and
+# re-read the new configuration settings. You can also restart GDM by sending
+# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes
+# any user session started by GDM to exit immediately while USR1 behaves like
+# gdm-safe-restart and will wait until all users log out before restarting GDM.
+#
+# For full reference documentation see the gnome help browser under
+# GNOME|System category. You can also find the docs in HTML form on
+# http://www.gnome.org/projects/gdm/
+#
+# NOTE: Lines that begin with "#" are considered comments.
+#
+# Have fun!
+
+[daemon]
+
+[security]
+
+[xdmcp]
+
+[gui]
+
+[greeter]
+
+[chooser]
+
+[debug]
+
+# Note that to disable servers defined in the GDM System Defaults
+# configuration file (such as 0=Standard, you must put a line in this file
+# that says 0=inactive, as described in the Configuration section of the GDM
+# documentation.
+#
+[servers]
+
+# Also note, that if you redefine a [server-foo] section, then GDM will
+# use the definition in this file, not the GDM System Defaults configuration
+# file. It is currently not possible to disable a [server-foo] section
+# defined in the GDM System Defaults configuration file.
+#
diff --git a/packages/gnome/gdm_2.24.1.bb b/packages/gnome/gdm_2.24.1.bb
index 24e36f5a11..c04e9aabea 100644
--- a/packages/gnome/gdm_2.24.1.bb
+++ b/packages/gnome/gdm_2.24.1.bb
@@ -1,20 +1,63 @@
DESCRIPTION = "Graphical login manager"
LICENSE = "GPL"
-DEPENDS = "libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl"
+DEPENDS = "grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl"
-inherit gnome
+PR = "r3"
-SRC_URI += "file://%gconf-tree.xml"
+inherit gnome update-rc.d
+
+SRC_URI += "file://cross-xdetection.diff;patch=1 \
+ file://%gconf-tree.xml \
+ file://gdm.conf \
+ file://gdm \
+ "
+
+EXTRA_OECONF = " --enable-authentication-scheme=shadow \
+ --with-console-kit \
+ --disable-scrollkeeper "
do_install_prepend() {
mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/
+ install -d ${D}/${sysconfdir}/gdm
+ install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/
}
FILES_${PN} += "${datadir}/icon* \
${datadir}/xsession*"
+CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm"
+
+INITSCRIPT_NAME = "gdm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+
+pkg_postinst_${PN} () {
+ # can't do this offline
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+ grep "^gdm:" /etc/group > /dev/null || addgroup gdm
+ grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm
+
+if [ -d /var/lib/gdm ]; then
+ chown -R gdm:gdm /var/lib/gdm
+ chmod 0750 /var/lib/gdm
+fi
+
+# Register up as default dm
+mkdir -p ${sysconfdir}/X11/
+echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager
+
+}
+
+pkg_postrm_${PN} () {
+ deluser gdm || true
+ delgroup gdm || true
+ sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
+}
diff --git a/packages/gnome/gnome-power-manager_2.24.2.bb b/packages/gnome/gnome-power-manager_2.24.2.bb
new file mode 100644
index 0000000000..904cd39364
--- /dev/null
+++ b/packages/gnome/gnome-power-manager_2.24.2.bb
@@ -0,0 +1,36 @@
+LICENSE = "GPLv2"
+DEPENDS = "libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib "
+
+inherit gnome
+
+EXTRA_OECONF = " --disable-scrollkeeper \
+ --disable-keyring \
+ --x-includes=${STAGING_INCDIR} \
+ --x-libraries=${STAGING_LIBDIR} \
+ --with-dpms-ext=${STAGING_INCDIR}/.. \
+ --enable-compile-warnings=no \
+ ac_cv_header_X11_extensions_dpms_h=yes \
+ "
+
+do_configure_append() {
+ rm config.log
+ # Sigh... --enable-compile-warnings=no doesn't actually t