[oe-commits] org.oe.dev merge of '01e31e6ccd75ddf643280f27490975f2e499a82a'
oe commit
openembedded-commits at lists.openembedded.org
Fri Nov 16 20:53:48 UTC 2007
merge of '01e31e6ccd75ddf643280f27490975f2e499a82a'
and 'dcf02285d808869be79389e20e77afe25dfb8734'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: c69cd84ca3d5ca840f9c578fe9f51ce6061a7f50
ViewMTN: http://monotone.openembedded.org/revision/info/c69cd84ca3d5ca840f9c578fe9f51ce6061a7f50
Files:
1
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
packages/gnome/gvfs_0.0.2.bb
packages/gpephone/firewall_svn.bb
packages/gpephone/useen_svn.bb
packages/openmoko2/openmoko-session2.bb
site/arm-common
site/arm-linux
packages/squashfs-tools/squashfs-tools-3.3
packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch
packages/squashfs-tools/squashfs-tools-native_3.3.bb
packages/squashfs-tools/squashfs-tools.inc
packages/squashfs-tools/squashfs-tools_3.3.bb
packages/gtk+/gtk-2.10.inc
Diffs:
#
# mt diff -r01e31e6ccd75ddf643280f27490975f2e499a82a -rc69cd84ca3d5ca840f9c578fe9f51ce6061a7f50
#
#
#
# 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 [3c0bd38cf4990797b3925367af21c85074935b0f]
#
# add_file "packages/gnome/gvfs_0.0.2.bb"
# content [f6a1956df3fb38a2a4e81a8d235573b19c19f3c5]
#
# add_file "packages/gpephone/firewall_svn.bb"
# content [707e5f62435c7c0130c795babdbe705aced3f0e8]
#
# add_file "packages/gpephone/useen_svn.bb"
# content [df6794b692b6307ab4efda6349b60b4a0680e420]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [a4e57156caaece7b3fd09e98c9f541594ba4879b]
# to [fbe2c5b1b35022fd032e2c27d0770f76a8a26d9e]
#
# 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 3c0bd38cf4990797b3925367af21c85074935b0f
+++ packages/gnome/gio-standalone_0.1.2.bb 3c0bd38cf4990797b3925367af21c85074935b0f
@@ -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
+}
+
============================================================
--- packages/gnome/gvfs_0.0.2.bb f6a1956df3fb38a2a4e81a8d235573b19c19f3c5
+++ packages/gnome/gvfs_0.0.2.bb f6a1956df3fb38a2a4e81a8d235573b19c19f3c5
@@ -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
+}
============================================================
--- packages/gpephone/firewall_svn.bb 707e5f62435c7c0130c795babdbe705aced3f0e8
+++ packages/gpephone/firewall_svn.bb 707e5f62435c7c0130c795babdbe705aced3f0e8
@@ -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}"
============================================================
--- packages/gpephone/useen_svn.bb df6794b692b6307ab4efda6349b60b4a0680e420
+++ packages/gpephone/useen_svn.bb df6794b692b6307ab4efda6349b60b4a0680e420
@@ -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}"
============================================================
--- 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}
============================================================
--- 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}
#
# mt diff -rdcf02285d808869be79389e20e77afe25dfb8734 -rc69cd84ca3d5ca840f9c578fe9f51ce6061a7f50
#
#
#
# add_dir "packages/squashfs-tools/squashfs-tools-3.3"
#
# add_file "packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch"
# content [3d380232f2f1d9ab67d6fbb4593bce52013383cd]
#
# add_file "packages/squashfs-tools/squashfs-tools-native_3.3.bb"
# content [11663bda662eb2d9f26943b9177f46ec18bdf9f9]
#
# add_file "packages/squashfs-tools/squashfs-tools.inc"
# content [67bd7f66235df621582cccdbb39c40c4b3f1709d]
#
# add_file "packages/squashfs-tools/squashfs-tools_3.3.bb"
# content [0643113fa50caf5f04f82b16d5bc7b33518bbc55]
#
# patch "packages/gtk+/gtk-2.10.inc"
# from [162cf297e438ae9441b397783b38eb85d188382d]
# to [0b317cf35adb0014c5b13d515f1e4a88a1395969]
#
============================================================
--- packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch 3d380232f2f1d9ab67d6fbb4593bce52013383cd
+++ packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch 3d380232f2f1d9ab67d6fbb4593bce52013383cd
@@ -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 $@
++
============================================================
--- packages/squashfs-tools/squashfs-tools-native_3.3.bb 11663bda662eb2d9f26943b9177f46ec18bdf9f9
+++ packages/squashfs-tools/squashfs-tools-native_3.3.bb 11663bda662eb2d9f26943b9177f46ec18bdf9f9
@@ -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}/
+}
============================================================
--- packages/squashfs-tools/squashfs-tools.inc 67bd7f66235df621582cccdbb39c40c4b3f1709d
+++ packages/squashfs-tools/squashfs-tools.inc 67bd7f66235df621582cccdbb39c40c4b3f1709d
@@ -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}/
+}
============================================================
--- packages/squashfs-tools/squashfs-tools_3.3.bb 0643113fa50caf5f04f82b16d5bc7b33518bbc55
+++ packages/squashfs-tools/squashfs-tools_3.3.bb 0643113fa50caf5f04f82b16d5bc7b33518bbc55
@@ -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"
+
============================================================
--- packages/gtk+/gtk-2.10.inc 162cf297e438ae9441b397783b38eb85d188382d
+++ packages/gtk+/gtk-2.10.inc 0b317cf35adb0014c5b13d515f1e4a88a1395969
@@ -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)
More information about the Openembedded-commits
mailing list