[oe-commits] org.oe.dev merge of '3b9fd83e9698bae081197909b331c676eba025fd'

[oe commit]

merge of '3b9fd83e9698bae081197909b331c676eba025fd'
     and 'a34feb8c5cd32b70487440b494c3f223e50b122d'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f2599a639a2bce74fd29be0a3fe3b529e9d37493
ViewMTN: http://monotone.openembedded.org/revision/info/f2599a639a2bce74fd29be0a3fe3b529e9d37493
Files:
1
packages/openmoko2/openmoko-session2.bb
packages/fuse/fuse-2.7.1
packages/fuse/fuse-2.7.1/not-run-updaterc.d-on-host.patch
packages/fuse/fuse_2.7.1.bb
packages/gnome/gio-standalone_0.1.2.bb
site/arm-common
site/arm-linux
Diffs:

#
# mt diff -r3b9fd83e9698bae081197909b331c676eba025fd -rf2599a639a2bce74fd29be0a3fe3b529e9d37493
#
# 
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [a4e57156caaece7b3fd09e98c9f541594ba4879b]
#    to [fbe2c5b1b35022fd032e2c27d0770f76a8a26d9e]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	a4e57156caaece7b3fd09e98c9f541594ba4879b
+++ packages/openmoko2/openmoko-session2.bb	fbe2c5b1b35022fd032e2c27d0770f76a8a26d9e
@@ -1,10 +1,10 @@ RCONFLICTS_${PN} = "openmoko-session mat
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r61"
+PR = "r62"
 
 SRC_URI = "\
   file://etc \
@@ -12,6 +12,13 @@ S = ${WORKDIR}
 "
 S = ${WORKDIR}
 
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "11"
+
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}


#
# mt diff -ra34feb8c5cd32b70487440b494c3f223e50b122d -rf2599a639a2bce74fd29be0a3fe3b529e9d37493
#
# 
# 
# add_dir "packages/fuse/fuse-2.7.1"
# 
# add_file "packages/fuse/fuse-2.7.1/not-run-updaterc.d-on-host.patch"
#  content [42d489b59ef3fc32e3ba5f3e12e5e21ddee4f160]
# 
# add_file "packages/fuse/fuse_2.7.1.bb"
#  content [558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd]
# 
# add_file "packages/gnome/gio-standalone_0.1.2.bb"
#  content [9ddf6ad7b5475f003e97798a94d4aa704dc1be56]
# 
# patch "site/arm-common"
#  from [6b09ad0595160e89218310713281f2deba1dc4e1]
#    to [00066e6510efdf8c78490177618c98b23a0d5e5e]
# 
# patch "site/arm-linux"
#  from [70f60e8f587533f25b0632ccc65d1228bad207a1]
#    to [641c4cf99a3af4480173b3d79e47be6ff22c8c93]
# 
============================================================
--- packages/fuse/fuse-2.7.1/not-run-updaterc.d-on-host.patch	42d489b59ef3fc32e3ba5f3e12e5e21ddee4f160
+++ packages/fuse/fuse-2.7.1/not-run-updaterc.d-on-host.patch	42d489b59ef3fc32e3ba5f3e12e5e21ddee4f160
@@ -0,0 +1,23 @@
+Index: fuse-2.7.1/util/Makefile.am
+===================================================================
+--- fuse-2.7.1.orig/util/Makefile.am	2007-04-25 18:06:47.000000000 +0200
++++ fuse-2.7.1/util/Makefile.am	2007-11-16 16:57:29.000000000 +0100
+@@ -33,10 +33,6 @@
+ 	$(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ 	$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+ 	$(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
+-	@if test -x /usr/sbin/update-rc.d; then \
+-		echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+-		/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
+-	fi
+ 
+ install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
+@@ -46,7 +43,3 @@
+ 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ 	rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
+ 	rm -f $(DESTDIR)$(INIT_D_PATH)/fuse
+-	@if test -x /usr/sbin/update-rc.d; then \
+-		echo "/usr/sbin/update-rc.d fuse remove || true"; \
+-		/usr/sbin/update-rc.d fuse remove || true; \
+-	fi
============================================================
--- packages/fuse/fuse_2.7.1.bb	558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd
+++ packages/fuse/fuse_2.7.1.bb	558ffc8ccc8eecab22dc7255ffbc3a59e46a35cd
@@ -0,0 +1,27 @@
+require fuse.inc
+
+PR = "r0"
+
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
+
+EXTRA_OECONF = " --disable-kernel-module"
+
+#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
+PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
+FILES_${PN} += "${libdir}/libfuse.so.*"
+FILES_${PN}-dev += "${libdir}/libfuse*.la"
+
+FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
+FILES_libulockmgr-dev += "${libdir}/libulock*.la"
+FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
+
+FILES_fuse-utils = "${bindir} ${base_sbindir}"
+FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
+DEBIAN_NOAUTONAME_fuse-utils = "1"
+DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
+
+fakeroot do_stage() {
+        autotools_stage_all
+}
+
+
============================================================
--- packages/gnome/gio-standalone_0.1.2.bb	9ddf6ad7b5475f003e97798a94d4aa704dc1be56
+++ packages/gnome/gio-standalone_0.1.2.bb	9ddf6ad7b5475f003e97798a94d4aa704dc1be56
@@ -0,0 +1,9 @@
+DESCRIPTION = "gio is a platform independent file and I/O abstraction library"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0"
+PR = "r0"
+
+inherit gnome
+
+PACKAGES =+ "libgio"
+FILES_libgio = "${libdir}/libgio.so.*"
============================================================
--- site/arm-common	6b09ad0595160e89218310713281f2deba1dc4e1
+++ site/arm-common	00066e6510efdf8c78490177618c98b23a0d5e5e
@@ -74,6 +74,9 @@ am_cv_func_working_getline=${am_cv_func_
 # gettext
 am_cv_func_working_getline=${am_cv_func_working_getline=yes}
 
+# gio
+ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
+
 # glib
 glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
 glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
============================================================
--- site/arm-linux	70f60e8f587533f25b0632ccc65d1228bad207a1
+++ site/arm-linux	641c4cf99a3af4480173b3d79e47be6ff22c8c93
@@ -1,9 +1,10 @@ ac_cv_func_posix_getpwuid_r=${ac_cv_func
 ac_cv_func_getpgrp_void=yes
 ac_cv_func_setpgrp_void=yes
 ac_cv_func_setgrent_void=yes
 ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_malloc_works=yes
 ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
 ac_cv_func_setvbuf_reversed=no
 ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}