From 8bf214c9b0fdaa68134bb81c39f854ed51a4de56 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 16 Nov 2007 16:09:44 +0000 Subject: openmoko-session2.bb : install out window manager script using update-alternatives. Fixes no openmoko-today2 problem --- packages/openmoko2/openmoko-session2.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 66ce5da82a..a8768534b1 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,7 +4,7 @@ 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 @@ SRC_URI = "\ " 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} -- cgit v1.2.3 From 3dd5a5d7ad3829252e36e97085521f88cc8f0bbc Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 16 Nov 2007 16:10:39 +0000 Subject: fuse: add 2.7.1 --- packages/fuse/fuse-2.7.1/.mtn2git_empty | 0 .../fuse-2.7.1/not-run-updaterc.d-on-host.patch | 23 ++++++++++++++++++ packages/fuse/fuse_2.7.1.bb | 27 ++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 packages/fuse/fuse-2.7.1/.mtn2git_empty create mode 100644 packages/fuse/fuse-2.7.1/not-run-updaterc.d-on-host.patch create mode 100644 packages/fuse/fuse_2.7.1.bb 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 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 +} + + -- cgit v1.2.3 From 0ded981f0bed7d8d92ec2633c9cc3f89a90ccf31 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 16 Nov 2007 16:12:56 +0000 Subject: site/arm-*: add getgrgid for gio --- site/arm-common | 3 +++ site/arm-linux | 1 + 2 files changed, 4 insertions(+) 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} -- cgit v1.2.3 From 60010adcb9203f278f8984e7b82d5671a1c08b08 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 16 Nov 2007 16:13:40 +0000 Subject: gio-standalone: add 0.1.2, a file and I/O abstraction library --- packages/gnome/gio-standalone_0.1.2.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/gnome/gio-standalone_0.1.2.bb 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..b1017b31ce --- /dev/null +++ b/packages/gnome/gio-standalone_0.1.2.bb @@ -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.*" -- cgit v1.2.3 From 31167f5087e5984d2da7cac3ea4484a99c18cf0c Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 16 Nov 2007 16:16:21 +0000 Subject: gio-standalone: add do_stage function --- packages/gnome/gio-standalone_0.1.2.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/gnome/gio-standalone_0.1.2.bb b/packages/gnome/gio-standalone_0.1.2.bb index b1017b31ce..6e360b8237 100644 --- a/packages/gnome/gio-standalone_0.1.2.bb +++ b/packages/gnome/gio-standalone_0.1.2.bb @@ -7,3 +7,8 @@ inherit gnome PACKAGES =+ "libgio" FILES_libgio = "${libdir}/libgio.so.*" + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From 863dee02bab26c60c86337e3da2849cbc0985276 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 16 Nov 2007 16:38:48 +0000 Subject: gvfs: add 0.0.2, a userspace virtual filesystem --- packages/gnome/gvfs_0.0.2.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/gnome/gvfs_0.0.2.bb 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 +} -- cgit v1.2.3 From 6d006a16fa56c64bd8001634307698450efa3b14 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 16 Nov 2007 18:16:32 +0000 Subject: useen: Add svn recipe --- packages/gpephone/useen_svn.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/gpephone/useen_svn.bb 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}" -- cgit v1.2.3 From 251397b8ed8ca5e809b3eaf35baa976f0ca479c4 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 16 Nov 2007 18:17:09 +0000 Subject: firewall: Add svn recipe --- packages/gpephone/firewall_svn.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/gpephone/firewall_svn.bb 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}" -- cgit v1.2.3