merge of '7299860d8a9c6a13547c594ec97758782d127419'

     and 'c69cd84ca3d5ca840f9c578fe9f51ce6061a7f50'

15 files changed, 198 insertions, 3 deletions

diff --git a/packages/fuse/fuse-2.7.1/.mtn2git_empty b/packages/fuse/fuse-2.7.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fuse/fuse-2.7.1/.mtn2git_empty
diff --git a/packages/fuse/fuse-2.7.1/not-run-updaterc.d-on-host.patch b/packages/fuse/fuse-2.7.1/not-run-updaterc.d-on-host.patch
new file mode 100644
index 0000000000..1124d1fa2b
--- /dev/null
+++ b/packages/fuse/fuse-2.7.1/not-run-updaterc.d-on-host.patch
@@ -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
diff --git a/packages/fuse/fuse_2.7.1.bb b/packages/fuse/fuse_2.7.1.bb
new file mode 100644
index 0000000000..a1795e7f0c
--- /dev/null
+++ b/packages/fuse/fuse_2.7.1.bb
@@ -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
+}
+
+
diff --git a/packages/gnome/gio-standalone_0.1.2.bb b/packages/gnome/gio-standalone_0.1.2.bb
new file mode 100644
index 0000000000..6e360b8237
--- /dev/null
+++ b/packages/gnome/gio-standalone_0.1.2.bb
@@ -0,0 +1,14 @@
+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.*"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/gnome/gvfs_0.0.2.bb b/packages/gnome/gvfs_0.0.2.bb
new file mode 100644
index 0000000000..8c791ad680
--- /dev/null
+++ b/packages/gnome/gvfs_0.0.2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "gvfs is a userspace virtual filesystem"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 gio-standalone fuse"
+PR = "r0"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-samba"
+
+PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
+FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
+
+FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount"
+FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount"
+FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/firewall_svn.bb b/packages/gpephone/firewall_svn.bb
new file mode 100644
index 0000000000..77b2122449
--- /dev/null
+++ b/packages/gpephone/firewall_svn.bb
@@ -0,0 +1,18 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "Cellphone firewall tool"
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+PV = "0.0+svnr-${SRCREV}"
+
+SRCREV_pn-${PN} ?= "1400"
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf-dbus"
+
+inherit gpephone autotools pkgconfig
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
diff --git a/packages/gpephone/useen_svn.bb b/packages/gpephone/useen_svn.bb
new file mode 100644
index 0000000000..93d180ba52
--- /dev/null
+++ b/packages/gpephone/useen_svn.bb
@@ -0,0 +1,18 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "Useen tool"
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+PV = "0.0+svnr-${SRCREV}"
+
+SRCREV_pn-${PN} ?= "1400"
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS = "glib-2.0"
+
+inherit gpephone autotools pkgconfig
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc
index 3fa5d22a71..4359f96d34 100644
--- a/packages/gtk+/gtk-2.10.inc
+++ b/packages/gtk+/gtk-2.10.inc
@@ -80,9 +80,9 @@ python populate_packages_prepend () {
 	immodules_root = os.path.join(gtk_libdir, 'immodules')
 	printmodules_root = os.path.join(gtk_libdir, 'printbackends');
 
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
-	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
+#	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+#	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
+#	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
diff --git a/packages/squashfs-tools/squashfs-tools-3.3/.mtn2git_empty b/packages/squashfs-tools/squashfs-tools-3.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/squashfs-tools/squashfs-tools-3.3/.mtn2git_empty
diff --git a/packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch b/packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch
new file mode 100644
index 0000000000..5addf8dd34
--- /dev/null
+++ b/packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch
@@ -0,0 +1,32 @@
+Index: squashfs-tools/Makefile
+===================================================================
+--- squashfs-tools.orig/Makefile	2007-11-16 20:32:00.000000000 +0100
++++ squashfs-tools/Makefile	2007-11-16 20:37:04.000000000 +0100
+@@ -1,19 +1,24 @@
+ INCLUDEDIR = .
+ 
+-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
++LOCAL_CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ all: mksquashfs unsquashfs
+ 
+ mksquashfs: mksquashfs.o read_fs.o sort.o
+-	$(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@
++	$(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@
+ 
+ mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
++	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) -c -o mksquashfs.o mksquashfs.c
+ 
+ read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h
++	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) -c -o read_fs.o read_fs.c
+ 
+ sort.o: sort.c squashfs_fs.h global.h sort.h
++	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) -c -o sort.o sort.c
+ 
+ unsquashfs: unsquashfs.o
+-	$(CC) unsquashfs.o -lz -o $@
++	$(CC) $(LDFLAGS) unsquashfs.o -lz -o $@
+ 
+ unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
++	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) -c -o unsquashfs.o -lz -o $@
++
diff --git a/packages/squashfs-tools/squashfs-tools-native_3.3.bb b/packages/squashfs-tools/squashfs-tools-native_3.3.bb
new file mode 100644
index 0000000000..87ba761ce4
--- /dev/null
+++ b/packages/squashfs-tools/squashfs-tools-native_3.3.bb
@@ -0,0 +1,11 @@
+require squashfs-tools_${PV}.bb
+PR = "r0"
+
+inherit native
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+PACKAGES = ""
+
+do_stage () {
+	install -m 0755 mksquashfs ${STAGING_BINDIR}/
+}
diff --git a/packages/squashfs-tools/squashfs-tools.inc b/packages/squashfs-tools/squashfs-tools.inc
new file mode 100644
index 0000000000..f27d9ec79a
--- /dev/null
+++ b/packages/squashfs-tools/squashfs-tools.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
+SECTION = "base"
+LICENSE = "GPLv2"
+
+DEPENDS = "zlib"
+
+S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools"
+
+prefix = ""
+
+do_compile() {
+	oe_runmake mksquashfs
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 0755 mksquashfs ${D}${sbindir}/
+}
diff --git a/packages/squashfs-tools/squashfs-tools_3.3.bb b/packages/squashfs-tools/squashfs-tools_3.3.bb
new file mode 100644
index 0000000000..2bf0a98ccb
--- /dev/null
+++ b/packages/squashfs-tools/squashfs-tools_3.3.bb
@@ -0,0 +1,8 @@
+require squashfs-tools.inc
+PR = "r0"
+
+# some release have .tgz, some have .tar.gz, so keep that outside the .inc file
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tgz \
+file://Makefile.patch;patch=1"
+
diff --git a/site/arm-common b/site/arm-common
index fb050dbcf1..5d3e68a18a 100644
--- a/site/arm-common
+++ b/site/arm-common
@@ -74,6 +74,9 @@ ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
 # 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}
diff --git a/site/arm-linux b/site/arm-linux
index 9aea75b5a9..868d982ec4 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -4,6 +4,7 @@ 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}