[oe-commits] org.oe.dev merge of 'c60ea02b6e2c20c4e9d69083d74bafacf95bf5f6'
xora commit
openembedded-commits at lists.openembedded.org
Tue Sep 18 11:29:29 UTC 2007
merge of 'c60ea02b6e2c20c4e9d69083d74bafacf95bf5f6'
and 'dba16850053a3647d83eafb21782f950995df94e'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: ba780f015bdb18e5326f919fa04fa8472d18bc5a
ViewMTN: http://monotone.openembedded.org/revision/info/ba780f015bdb18e5326f919fa04fa8472d18bc5a
Files:
1
packages/navit
packages/navit/files
packages/linux/linux-openmoko-devel/printascii.patch
packages/linux/linux-openmoko-devel/squashfs.patch
packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch
packages/navit/files/compile-fix.patch
packages/navit/navit_0.0.1.bb
packages/openmoko2/openmoko-browser2_svn.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/include/gumstix.inc
conf/machine/omap5912osk.conf
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/linux/linux-openmoko-devel/defconfig
packages/linux/linux-openmoko-devel_svn.bb
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uboot/uboot-openmoko_svn.bb
packages/gnome/epiphany_2.19.6.bb
Diffs:
#
# mt diff -rc60ea02b6e2c20c4e9d69083d74bafacf95bf5f6 -rba780f015bdb18e5326f919fa04fa8472d18bc5a
#
#
#
# add_dir "packages/navit"
#
# add_dir "packages/navit/files"
#
# add_file "packages/linux/linux-openmoko-devel/printascii.patch"
# content [e7cfe3969d58b5690e047b0ce584a1b841f2b494]
#
# add_file "packages/linux/linux-openmoko-devel/squashfs.patch"
# content [f02adcc4dcc701eebc77fc31e6cb8a4ed17a7906]
#
# add_file "packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch"
# content [d136e98d1e89f12fec85b8f247c99a11530c5a16]
#
# add_file "packages/navit/files/compile-fix.patch"
# content [ee38dc11495544297652a79f769be7bed51b215d]
#
# add_file "packages/navit/navit_0.0.1.bb"
# content [96acdd2c7dd3d5a55f11159d0020d7d95d8392b7]
#
# add_file "packages/openmoko2/openmoko-browser2_svn.bb"
# content [f55e0fe96bc0f6da63efb2a343ffb16819d87f41]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [7ab3e4a626dd86961455dfee876c957f998cfb14]
# to [cb196173c3a1b600e59b8b160c7290b856d0faa5]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a04da90ce000626924fee314bf3b57e19ad0d4c8]
# to [f252e3c7c9f615d3c422505c624f3f03621e5e1f]
#
# patch "conf/machine/include/gumstix.inc"
# from [a9b8b761a9a47e6df416c842987c359d772d4580]
# to [917537468325dc5643453f037aad76fbeb9bb147]
#
# patch "conf/machine/omap5912osk.conf"
# from [f0942949911d73f57760fb48a9469e67db0154ef]
# to [e1b832be81c4577a78b18536406e78bab2ffa518]
#
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
# from [6b749d9ef772b8e60588711e9d902b4292a7e84b]
# to [3c5317edbfb2de05bfdcc53497f5a76d49e833db]
#
# patch "packages/linux/linux-openmoko-devel/defconfig"
# from [e0d5e01862edf513ce61dd257d3e4a6790a4bfab]
# to [5006da7a604a90f24c0dd8a2e8506dbbd8cbdcbe]
#
# patch "packages/linux/linux-openmoko-devel_svn.bb"
# from [0c4e0a1a3b5984a92e7255acd3c74e12e71fd37f]
# to [aa4cafaa0349ca6de84aa37d4653ee0925325284]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# from [c83b2518da5c8c31d03ed19d8aed54afa6d26d38]
# to [9a0b682073222bc2809e001ffe275c358bde77ed]
#
# patch "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
# from [d2d7385073d2de3086a6fc7137fa76d25390a2c1]
# to [2bbb752f84f5cd5d332df9a98b5ab1922ccc2320]
#
# patch "packages/openmoko2/openmoko-sound-theme-standard2_svn.bb"
# from [bfa0e09f44be1950d51c8251ab99fdf9fce69bea]
# to [8d7ac8b5a6221ab35c4c0a274a2edef6f114e8a9]
#
# patch "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
# from [b42ad01a57090bd2d30d7aab77b4aa9e3607b31c]
# to [d3999509e6f8e1b8cbcd12aafad259da103400de]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [a9daac10326cc7c8c5b0dfea1c25a605b5855bc9]
# to [32f83f5ac25253fffe2da4176c4bce6897bd83a1]
#
============================================================
--- packages/linux/linux-openmoko-devel/printascii.patch e7cfe3969d58b5690e047b0ce584a1b841f2b494
+++ packages/linux/linux-openmoko-devel/printascii.patch e7cfe3969d58b5690e047b0ce584a1b841f2b494
@@ -0,0 +1,12 @@
+Index: linux-2.6.22.5/kernel/printk.c
+===================================================================
+--- linux-2.6.22.5.orig/kernel/printk.c
++++ linux-2.6.22.5/kernel/printk.c
+@@ -535,6 +535,7 @@ asmlinkage int vprintk(const char *fmt,
+
+ /* Emit the output into the temporary buffer */
+ printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args);
++ printascii(printk_buf);
+
+ /*
+ * Copy the output into log_buf. If the caller didn't provide
============================================================
--- packages/linux/linux-openmoko-devel/squashfs.patch f02adcc4dcc701eebc77fc31e6cb8a4ed17a7906
+++ packages/linux/linux-openmoko-devel/squashfs.patch f02adcc4dcc701eebc77fc31e6cb8a4ed17a7906
@@ -0,0 +1,4386 @@
+diff -x .gitignore -Nurp linux-2.6.20/fs/Kconfig linux-2.6.20-squashfs3.2-r2/fs/Kconfig
+--- linux-2.6.20/fs/Kconfig 2006-12-25 01:13:12.000000000 +0000
++++ linux-2.6.20-squashfs3.2-r2/fs/Kconfig 2007-01-16 02:06:03.000000000 +0000
+@@ -1404,6 +1404,71 @@ config CRAMFS
+
+ If unsure, say N.
+
++config SQUASHFS
++ tristate "SquashFS 3.2 - Squashed file system support"
++ select ZLIB_INFLATE
++ help
++ Saying Y here includes support for SquashFS 3.2 (a Compressed Read-Only File
++ System). Squashfs is a highly compressed read-only filesystem for Linux.
++ It uses zlib compression to compress both files, inodes and directories.
++ Inodes in the system are very small and all blocks are packed to minimise
++ data overhead. Block sizes greater than 4K are supported up to a maximum of 64K.
++ SquashFS 3.1 supports 64 bit filesystems and files (larger than 4GB), full
++ uid/gid information, hard links and timestamps.
++
++ Squashfs is intended for general read-only filesystem use, for archival
++ use (i.e. in cases where a .tar.gz file may be used), and in embedded
++ systems where low overhead is needed. Further information and filesystem tools
++ are available from http://squashfs.sourceforge.net.
++
++ If you want to compile this as a module ( = code which can be
++ inserted in and removed from the running kernel whenever you want),
++ say M here and read <file:Documentation/modules.txt>. The module
++ will be called squashfs. Note that the root file system (the one
++ containing the directory /) cannot be compiled as a module.
++
++ If unsure, say N.
++
++config SQUASHFS_EMBEDDED
++
++ bool "Additional options for memory-constrained systems"
++ depends on SQUASHFS
++ default n
++ help
++ Saying Y here allows you to specify cache sizes and how Squashfs
++ allocates memory. This is only intended for memory constrained
++ systems.
++
++ If unsure, say N.
++
++config SQUASHFS_FRAGMENT_CACHE_SIZE
++ int "Number of fragments cached" if SQUASHFS_EMBEDDED
++ depends on SQUASHFS
++ default "3"
++ help
++ By default SquashFS caches the last 3 fragments read from
++ the filesystem. Increasing this amount may mean SquashFS
++ has to re-read fragments less often from disk, at the expense
++ of extra system memory. Decreasing this amount will mean
++ SquashFS uses less memory at the expense of extra reads from disk.
++
++ Note there must be at least one cached fragment. Anything
++ much more than three will probably not make much difference.
++
++config SQUASHFS_VMALLOC
++ bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED
++ depends on SQUASHFS
++ default n
++ help
++ By default SquashFS uses kmalloc to obtain fragment cache memory.
++ Kmalloc memory is the standard kernel allocator, but it can fail
++ on memory constrained systems. Because of the way Vmalloc works,
++ Vmalloc can succeed when kmalloc fails. Specifying this option
++ will make SquashFS always use Vmalloc to allocate the
++ fragment cache memory.
++
++ If unsure, say N.
++
+ config VXFS_FS
+ tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
+ depends on BLOCK
+diff -x .gitignore -Nurp linux-2.6.20/fs/Makefile linux-2.6.20-squashfs3.2-r2/fs/Makefile
+--- linux-2.6.20/fs/Makefile 2006-12-25 01:13:12.000000000 +0000
++++ linux-2.6.20-squashfs3.2-r2/fs/Makefile 2007-01-16 02:06:03.000000000 +0000
+@@ -68,6 +68,7 @@ obj-$(CONFIG_JBD) += jbd/
+ obj-$(CONFIG_JBD2) += jbd2/
+ obj-$(CONFIG_EXT2_FS) += ext2/
+ obj-$(CONFIG_CRAMFS) += cramfs/
++obj-$(CONFIG_SQUASHFS) += squashfs/
+ obj-$(CONFIG_RAMFS) += ramfs/
+ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
+ obj-$(CONFIG_CODA_FS) += coda/
+diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/inode.c linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c
+--- linux-2.6.20/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c 2007-01-16 02:28:36.000000000 +0000
+@@ -0,0 +1,2329 @@
++/*
++ * Squashfs - a compressed read only filesystem for Linux
++ *
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
++ * Phillip Lougher <phillip at lougher.org.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2,
++ * or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * inode.c
++ */
++
++#include <linux/squashfs_fs.h>
++#include <linux/module.h>
++#include <linux/zlib.h>
++#include <linux/fs.h>
++#include <linux/squashfs_fs_sb.h>
++#include <linux/squashfs_fs_i.h>
++#include <linux/buffer_head.h>
++#include <linux/vfs.h>
++#include <linux/vmalloc.h>
++#include <linux/smp_lock.h>
++
++#include "squashfs.h"
++
++static void vfs_read_inode(struct inode *i);
++static struct dentry *squashfs_get_parent(struct dentry *child);
++static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode);
++static int squashfs_statfs(struct dentry *, struct kstatfs *);
++static int squashfs_symlink_readpage(struct file *file, struct page *page);
++static long long read_blocklist(struct inode *inode, int index,
++ int readahead_blks, char *block_list,
++ unsigned short **block_p, unsigned int *bsize);
++static int squashfs_readpage(struct file *file, struct page *page);
++static int squashfs_readpage4K(struct file *file, struct page *page);
++static int squashfs_readdir(struct file *, void *, filldir_t);
++static struct dentry *squashfs_lookup(struct inode *, struct dentry *,
++ struct nameidata *);
++static int squashfs_remount(struct super_block *s, int *flags, char *data);
++static void squashfs_put_super(struct super_block *);
++static int squashfs_get_sb(struct file_system_type *,int, const char *, void *,
++ struct vfsmount *);
++static struct inode *squashfs_alloc_inode(struct super_block *sb);
++static void squashfs_destroy_inode(struct inode *inode);
++static int init_inodecache(void);
++static void destroy_inodecache(void);
++
++static struct file_system_type squashfs_fs_type = {
++ .owner = THIS_MODULE,
++ .name = "squashfs",
++ .get_sb = squashfs_get_sb,
++ .kill_sb = kill_block_super,
++ .fs_flags = FS_REQUIRES_DEV
++};
++
++static const unsigned char squashfs_filetype_table[] = {
++ DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK
++};
++
++static struct super_operations squashfs_super_ops = {
++ .alloc_inode = squashfs_alloc_inode,
++ .destroy_inode = squashfs_destroy_inode,
++ .statfs = squashfs_statfs,
++ .put_super = squashfs_put_super,
++ .remount_fs = squashfs_remount
++};
++
++static struct super_operations squashfs_export_super_ops = {
++ .alloc_inode = squashfs_alloc_inode,
++ .destroy_inode = squashfs_destroy_inode,
++ .statfs = squashfs_statfs,
++ .put_super = squashfs_put_super,
++ .read_inode = vfs_read_inode
++};
++
++static struct export_operations squashfs_export_ops = {
++ .get_parent = squashfs_get_parent
++};
++
++SQSH_EXTERN const struct address_space_operations squashfs_symlink_aops = {
++ .readpage = squashfs_symlink_readpage
++};
++
++SQSH_EXTERN const struct address_space_operations squashfs_aops = {
++ .readpage = squashfs_readpage
++};
++
++SQSH_EXTERN const struct address_space_operations squashfs_aops_4K = {
++ .readpage = squashfs_readpage4K
++};
++
++static const struct file_operations squashfs_dir_ops = {
++ .read = generic_read_dir,
++ .readdir = squashfs_readdir
++};
++
++SQSH_EXTERN struct inode_operations squashfs_dir_inode_ops = {
++ .lookup = squashfs_lookup
++};
++
++
++static struct buffer_head *get_block_length(struct super_block *s,
++ int *cur_index, int *offset, int *c_byte)
++{
++ struct squashfs_sb_info *msblk = s->s_fs_info;
++ unsigned short temp;
++ struct buffer_head *bh;
++
++ if (!(bh = sb_bread(s, *cur_index)))
++ goto out;
++
++ if (msblk->devblksize - *offset == 1) {
++ if (msblk->swap)
++ ((unsigned char *) &temp)[1] = *((unsigned char *)
++ (bh->b_data + *offset));
++ else
++ ((unsigned char *) &temp)[0] = *((unsigned char *)
++ (bh->b_data + *offset));
++ brelse(bh);
++ if (!(bh = sb_bread(s, ++(*cur_index))))
++ goto out;
++ if (msblk->swap)
++ ((unsigned char *) &temp)[0] = *((unsigned char *)
++ bh->b_data);
++ else
++ ((unsigned char *) &temp)[1] = *((unsigned char *)
++ bh->b_data);
++ *c_byte = temp;
++ *offset = 1;
++ } else {
++ if (msblk->swap) {
++ ((unsigned char *) &temp)[1] = *((unsigned char *)
++ (bh->b_data + *offset));
++ ((unsigned char *) &temp)[0] = *((unsigned char *)
++ (bh->b_data + *offset + 1));
++ } else {
++ ((unsigned char *) &temp)[0] = *((unsigned char *)
++ (bh->b_data + *offset));
++ ((unsigned char *) &temp)[1] = *((unsigned char *)
++ (bh->b_data + *offset + 1));
++ }
++ *c_byte = temp;
++ *offset += 2;
++ }
++
++ if (SQUASHFS_CHECK_DATA(msblk->sblk.flags)) {
++ if (*offset == msblk->devblksize) {
++ brelse(bh);
++ if (!(bh = sb_bread(s, ++(*cur_index))))
++ goto out;
++ *offset = 0;
++ }
++ if (*((unsigned char *) (bh->b_data + *offset)) !=
++ SQUASHFS_MARKER_BYTE) {
++ ERROR("Metadata block marker corrupt @ %x\n",
++ *cur_index);
++ brelse(bh);
++ goto out;
++ }
++ (*offset)++;
++ }
++ return bh;
++
++out:
++ return NULL;
++}
++
++
++SQSH_EXTERN unsigned int squashfs_read_data(struct super_block *s, char *buffer,
++ long long index, unsigned int length,
++ long long *next_index, int srclength)
++{
++ struct squashfs_sb_info *msblk = s->s_fs_info;
++ struct squashfs_super_block *sblk = &msblk->sblk;
++ struct buffer_head *bh[((SQUASHFS_FILE_MAX_SIZE - 1) >>
++ msblk->devblksize_log2) + 2];
++ unsigned int offset = index & ((1 << msblk->devblksize_log2) - 1);
++ unsigned int cur_index = index >> msblk->devblksize_log2;
++ int bytes, avail_bytes, b = 0, k = 0;
++ unsigned int compressed;
++ unsigned int c_byte = length;
++
++ if (c_byte) {
++ bytes = msblk->devblksize - offset;
++ compressed = SQUASHFS_COMPRESSED_BLOCK(c_byte);
++ c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
++
++ TRACE("Block @ 0x%llx, %scompressed size %d, src size %d\n", index, compressed
++ ? "" : "un", (unsigned int) c_byte, srclength);
++
++ if (c_byte > srclength || index < 0 || (index + c_byte) > sblk->bytes_used)
++ goto read_failure;
++
++ if (!(bh[0] = sb_getblk(s, cur_index)))
++ goto block_release;
++
++ for (b = 1; bytes < c_byte; b++) {
++ if (!(bh[b] = sb_getblk(s, ++cur_index)))
++ goto block_release;
++ bytes += msblk->devblksize;
++ }
++ ll_rw_block(READ, b, bh);
++ } else {
++ if (index < 0 || (index + 2) > sblk->bytes_used)
++ goto read_failure;
++
++ if (!(bh[0] = get_block_length(s, &cur_index, &offset,
++ &c_byte)))
++ goto read_failure;
++
++ bytes = msblk->devblksize - offset;
++ compressed = SQUASHFS_COMPRESSED(c_byte);
++ c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
++
++ TRACE("Block @ 0x%llx, %scompressed size %d\n", index, compressed
++ ? "" : "un", (unsigned int) c_byte);
++
++ if (c_byte > srclength || (index + c_byte) > sblk->bytes_used)
++ goto read_failure;
++
++ for (b = 1; bytes < c_byte; b++) {
++ if (!(bh[b] = sb_getblk(s, ++cur_index)))
++ goto block_release;
++ bytes += msblk->devblksize;
++ }
++ ll_rw_block(READ, b - 1, bh + 1);
++ }
++
++ if (compressed) {
++ int zlib_err = 0;
++
++ /*
++ * uncompress block
++ */
++
++ mutex_lock(&msblk->read_data_mutex);
++
++ msblk->stream.next_out = buffer;
++ msblk->stream.avail_out = srclength;
++
++ for (bytes = 0; k < b; k++) {
++ avail_bytes = (c_byte - bytes) > (msblk->devblksize - offset) ?
++ msblk->devblksize - offset :
++ c_byte - bytes;
++ wait_on_buffer(bh[k]);
++ if (!buffer_uptodate(bh[k]))
++ goto release_mutex;
++
++ msblk->stream.next_in = bh[k]->b_data + offset;
++ msblk->stream.avail_in = avail_bytes;
++
++ if (k == 0) {
++ zlib_err = zlib_inflateInit(&msblk->stream);
++ if (zlib_err != Z_OK) {
++ ERROR("zlib_inflateInit returned unexpected result 0x%x, srclength %d\n",
++ zlib_err, srclength);
++ goto release_mutex;
++ }
++
++ if (avail_%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdba16850053a3647d83eafb21782f950995df94e -rba780f015bdb18e5326f919fa04fa8472d18bc5a
#
#
#
# patch "packages/gnome/epiphany_2.19.6.bb"
# from [ef9504844f21d0471510539c90b701bc53554771]
# to [77e6f8b09f3aef06dc17ffec1072c16e0554132b]
#
============================================================
--- packages/gnome/epiphany_2.19.6.bb ef9504844f21d0471510539c90b701bc53554771
+++ packages/gnome/epiphany_2.19.6.bb 77e6f8b09f3aef06dc17ffec1072c16e0554132b
@@ -1,5 +1,5 @@ DESCRIPTION = "GNOME default webbrowser"
DESCRIPTION = "GNOME default webbrowser"
-DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes"
RDEPENDS = "gnome-vfs-plugin-http"
PR = "r1"
More information about the Openembedded-commits
mailing list