Updates against mainline openembedded + removal of some unneeded files

git-svn-id: https://svn.o-hand.com/repos/poky@19 311d38ba-8fff-0310-9ca6-ca027cbcb966

51 files changed, 328 insertions, 704 deletions

diff --git a/openembedded/packages/avahi/avahi_0.2.bb b/openembedded/packages/avahi/avahi_0.2.bb
index 00c4dbd599..6b77b78088 100644
--- a/openembedded/packages/avahi/avahi_0.2.bb
+++ b/openembedded/packages/avahi/avahi_0.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
 HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
 LICENCE= "GPL"
-DEPENDS = "expat libdaemon dbus-0.34"
+DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
 SECTION = "net"
 PRIORITY = "optional"
diff --git a/openembedded/packages/base-files/base-files/borzoi/fstab b/openembedded/packages/base-files/base-files/borzoi/fstab
index 754f140b34..a44243923a 100644
--- a/openembedded/packages/base-files/base-files/borzoi/fstab
+++ b/openembedded/packages/base-files/base-files/borzoi/fstab
@@ -1,7 +1,8 @@
+# Internal
 /dev/mtdblock2	/ 	jffs2	rw,noatime	1  1 
 /dev/mtdblock3	/home 	jffs2	defaults,noatime	1  2
 proc		/proc	proc	defaults	0  0
-/dev/hda1	/media/cf	auto	defaults,sync,noauto	0  0
+/dev/hda1	/media/hdd1	ext3	defaults,noatime,nodiratime	0  0
 
 tmpfs		/var		tmpfs   defaults        0  0
 tmpfs		/media/ram	tmpfs	defaults	0  0
@@ -14,3 +15,5 @@ tmpfs		/media/ram	tmpfs	defaults	0  0
 # USB Storage
 /dev/sda1 /media/usbhdd		vfat	noauto,umask=000,noatime,iocharset=utf8,codepage=932	0	0
 
+# CF Storage
+/dev/hdb1 /media/cf		ext3	defaults,sync,noauto	0  0
diff --git a/openembedded/packages/base-files/base-files/nokia770/fstab b/openembedded/packages/base-files/base-files/nokia770/fstab
index 3224c61b5e..febe217b34 100644
--- a/openembedded/packages/base-files/base-files/nokia770/fstab
+++ b/openembedded/packages/base-files/base-files/nokia770/fstab
@@ -2,3 +2,7 @@ rootfs  /               rootfs  defaults,errors=remount-ro,noatime      0 0
 /dev/mmcblk0p1  /media/card     auto defaults,noauto,noatime,user,exec,suid  0  0
 tmpfs           /var    tmpfs   defaults             0  0
 tmpfs           /media/ram      tmpfs   defaults        0  0
+rootfs               /                    auto       defaults              1 1
+proc                 /proc                proc       defaults              0 0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
+usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb
index 144bf2e135..e2c1003c58 100644
--- a/openembedded/packages/base-files/base-files_3.0.14.bb
+++ b/openembedded/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r39"
+PR = "r40"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/openembedded/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch b/openembedded/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch
deleted file mode 100644
index 91234fd53f..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: ipkg_cmd.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
-retrieving revision 1.96
-diff -u -r1.96 ipkg_cmd.c
---- C/ipkg_cmd.c	19 Aug 2004 10:55:47 -0000	1.96
-+++ C/ipkg_cmd.c	11 Sep 2004 19:43:14 -0000
-@@ -860,6 +860,7 @@
-      str_list_elt_t *iter;
-      char *pkg_version;
-      size_t buff_len = 8192;
-+     size_t used_len;
-      char *buff ;
- 
-      buff = (char *)malloc(buff_len);
-@@ -891,9 +892,20 @@
-      }
- #else
-      if (buff) {
--	  snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
--		   pkg->name, pkg_version, pkg->dest->name);
-+     try_again:
-+	  used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
-+			      pkg->name, pkg_version, pkg->dest->name) + 1;
-+	  if (used_len > buff_len) {
-+	       buff_len *= 2;
-+	       buff = realloc (buff, buff_len);
-+	       goto try_again;
-+	  }
- 	  for (iter = installed_files->head; iter; iter = iter->next) {
-+	       used_len += strlen (iter->data) + 1;
-+	       while (buff_len <= used_len) {
-+		    buff_len *= 2;
-+		    buff = realloc (buff, buff_len);
-+	       }
- 	       strncat(buff, iter->data, buff_len);
- 	       strncat(buff, "\n", buff_len);
- 	  } 
diff --git a/openembedded/packages/ipkg/ipkg-0.99.130/terse.patch b/openembedded/packages/ipkg/ipkg-0.99.130/terse.patch
deleted file mode 100644
index 9a07df5df3..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.130/terse.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- C/ipkg_cmd.c~terse
-+++ C/ipkg_cmd.c
-@@ -119,8 +119,6 @@
- 		       "  writing status file\n");
- 	  ipkg_conf_write_status_files(conf);
- 	  pkg_write_changed_filelists(conf);
--     } else { 
--	  ipkg_message(conf, IPKG_NOTICE, "Nothing to be done\n");
-      }
- }
- 
-@@ -148,9 +146,7 @@
- 	int result;
- 	p_userdata = userdata;
- 	result = (cmd->fun)(conf, argc, argv);
--        if ( result == 0 ) {
--           ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n");
--        } else {
-+        if ( result != 0 ) {
-            ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
-         }
-    
diff --git a/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch b/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch
deleted file mode 100644
index 8f472ab405..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Index: ipkg_cmd.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
-retrieving revision 1.99
-diff -u -r1.99 ipkg_cmd.c
---- ipkg/ipkg_cmd.c	6 Jan 2005 00:21:49 -0000	1.99
-+++ ipkg/ipkg_cmd.c	8 Jan 2005 13:11:16 -0000
-@@ -1150,7 +1150,7 @@
- 
- int pkg_mark_provides(pkg_t *pkg)
- {
--     int provides_count = pkg->provides_count;
-+     int provides_count = pkg->provides_count + 1;
-      abstract_pkg_t **provides = pkg->provides;
-      int i;
-      pkg->parent->state_flag |= SF_MARKED;
-@@ -1207,7 +1207,7 @@
- 	       for (j = 0; j < available_pkgs->len; j++) {
- 		    pkg_t *pkg = available_pkgs->pkgs[j];
- 		    int k;
--		    int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count : pkg->replaces_count;
-+		    int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count + 1 : pkg->replaces_count;
- 		    for (k = 0; k < count; k++) {
- 			 abstract_pkg_t *apkg = 
- 			      ((what_field_type == WHATPROVIDES) 
-Index: ipkg_remove.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/ipkg_remove.c,v
-retrieving revision 1.40
-diff -u -r1.40 ipkg_remove.c
---- ipkg/ipkg_remove.c	10 May 2004 21:37:07 -0000	1.40
-+++ ipkg/ipkg_remove.c	8 Jan 2005 13:11:19 -0000
-@@ -39,7 +39,7 @@
-  */
- int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents)
- {
--     int nprovides = pkg->provides_count;
-+     int nprovides = pkg->provides_count + 1;
-      abstract_pkg_t **provides = pkg->provides;
-      int n_installed_dependents = 0;
-      int i;
-Index: pkg_depends.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/pkg_depends.c,v
-retrieving revision 1.61
-diff -u -r1.61 pkg_depends.c
---- ipkg/pkg_depends.c	1 Sep 2004 20:30:39 -0000	1.61
-+++ ipkg/pkg_depends.c	8 Jan 2005 13:11:21 -0000
-@@ -420,9 +420,9 @@
- int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee)
- {
-      abstract_pkg_t **provides = pkg->provides;
--     int provides_count = pkg->provides_count;
-+     int provides_count = pkg->provides_count + 1;
-      abstract_pkg_t **replacee_provides = replacee->provides;
--     int replacee_provides_count = replacee->provides_count;
-+     int replacee_provides_count = replacee->provides_count + 1;
-      int i, j;
-      for (i = 0; i < provides_count; i++) {
- 	  abstract_pkg_t *apkg = provides[i];
-@@ -443,7 +443,7 @@
- int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee)
- {
-      abstract_pkg_t **provides = pkg->provides;
--     int provides_count = pkg->provides_count;
-+     int provides_count = pkg->provides_count + 1;
-      int i;
-      for (i = 0; i < provides_count; i++) {
- 	  if (provides[i] == providee)
-@@ -461,7 +461,7 @@
-      abstract_pkg_t **replaces = pkg->replaces;
-      int replaces_count = pkg->replaces_count;
-      abstract_pkg_t **replacee_provides = pkg->provides;
--     int replacee_provides_count = pkg->provides_count;
-+     int replacee_provides_count = pkg->provides_count + 1;
-      int i, j;
-      for (i = 0; i < replaces_count; i++) {
- 	  abstract_pkg_t *abstract_replacee = replaces[i];
-@@ -504,7 +504,7 @@
-      compound_depend_t *conflicts = pkg->conflicts;
-      int conflicts_count = pkg->conflicts_count;
-      abstract_pkg_t **conflictee_provides = conflictee->provides;
--     int conflictee_provides_count = conflictee->provides_count;
-+     int conflictee_provides_count = conflictee->provides_count + 1;
-      int i, j, k;
-      for (i = 0; i < conflicts_count; i++) {
- 	  int possibility_count = conflicts[i].possibility_count;
-@@ -605,9 +605,6 @@
-     /* every pkg provides itself */
-     abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg);
- 
--    if (!pkg->provides_count)
--      return 0;
--
-     pkg->provides = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * (pkg->provides_count + 1));
-     if (pkg->provides == NULL) {
-        fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-@@ -615,6 +612,9 @@
-     }
-     pkg->provides[0] = ab_pkg;
- 
-+    if (pkg->provides_count == 0)
-+      return 0;
-+
-     // if (strcmp(ab_pkg->name, pkg->name))
-     //     fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name);
- 
diff --git a/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch b/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
deleted file mode 100644
index e70f3af9ff..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- C/ipkg_install.c~remove-c99isms.patch
-+++ C/ipkg_install.c
-@@ -186,14 +186,16 @@
- {
-      abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name);
-      int i;
-+     ipkg_error_t err;
-+     abstract_pkg_t *ppkg;
- 
-      if (providers == NULL)
- 	  return IPKG_PKG_HAS_NO_CANDIDATE;
- 
-      for (i = 0; i < providers->len; i++) {
--	  abstract_pkg_t *ppkg = abstract_pkg_vec_get(providers, i);
--     ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
--	  ipkg_error_t err = ipkg_install_by_name(conf, ppkg->name);
-+	  ppkg = abstract_pkg_vec_get(providers, i);
-+          ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
-+	  err = ipkg_install_by_name(conf, ppkg->name);
- 	  if (err)
- 	       return err;
-      }
-@@ -614,12 +616,13 @@
- int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees)
- {
-      int i;
-+     int err;
-      int replaces_count = replacees->len;
-      for (i = 0; i < replaces_count; i++) {
- 	  pkg_t *replacee = replacees->pkgs[i];
- 	  if (replacee->state_status != SS_INSTALLED) {
-                ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
--	       int err = ipkg_install_pkg(conf, replacee);
-+	       err = ipkg_install_pkg(conf, replacee);
- 	       if (err)
- 		    return err;
- 	  }
diff --git a/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch b/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
deleted file mode 100644
index f1ad2a3f6c..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: C/pkg_depends.c
-===================================================================
---- C.orig/pkg_depends.c	2005-02-08 14:32:46.000000000 +0000
-+++ C/pkg_depends.c	2005-02-08 15:50:50.000000000 +0000
-@@ -251,15 +251,16 @@
-   really conflicts 
-   returns 0 if conflicts <> replaces or 1 if conflicts == replaces 
- */
--int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg){
--
--int i ;
--int replaces_count = pkg->replaces_count;
-+int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
-+{
-+    int i ;
-+    int replaces_count = pkg->replaces_count;
-+    abstract_pkg_t **replaces;
- 
-- if (pkg->replaces_count==0)    // No replaces, it's surely a conflict
--    return 0;
-+    if (pkg->replaces_count==0)    // No replaces, it's surely a conflict
-+        return 0;
- 
--    abstract_pkg_t **replaces = pkg->replaces;
-+    replaces = pkg->replaces;
- 
-     for (i = 0; i < replaces_count; i++) {
-         if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0)       // Found
-@@ -280,6 +281,8 @@
-     register int i, j, k;
-     int count;
-     abstract_pkg_t * ab_pkg;
-+    pkg_t **pkg_scouts; 
-+    pkg_t *pkg_scout; 
- 
-     /* 
-      * this is a setup to check for redundant/cyclic dependency checks, 
-@@ -316,9 +319,9 @@
- 	    if (test_vec) {
-                 /* pkg_vec found, it is an actual package conflict
- 		 * cruise this possiblity's pkg_vec looking for an installed version */
--		pkg_t **pkg_scouts = test_vec->pkgs;
-+		pkg_scouts = test_vec->pkgs;
- 		for(k = 0; k < test_vec->len; k++){
--                    pkg_t *pkg_scout = pkg_scouts[k];
-+                    pkg_scout = pkg_scouts[k];
-                     if (!pkg_scout) {
-                         fprintf(stderr,  "%s: null pkg scout\n", __FUNCTION__);
-                         continue; 
-@@ -381,13 +384,16 @@
-      abstract_pkg_vec_t *provider_apkgs = apkg->provided_by;
-      int n_providers = provider_apkgs->len;
-      abstract_pkg_t **apkgs = provider_apkgs->pkgs;
-+     pkg_vec_t *pkg_vec;
-+     int n_pkgs ; 
-      int i;
-+     int j;
-+
-      for (i = 0; i < n_providers; i++) {
- 	  abstract_pkg_t *papkg = apkgs[i];
--	  pkg_vec_t *pkg_vec = papkg->pkgs;
-+	  pkg_vec = papkg->pkgs;
- 	  if (pkg_vec) {
--	       int n_pkgs = pkg_vec->len;
--	       int j;
-+	       n_pkgs = pkg_vec->len;
- 	       for (j = 0; j < n_pkgs; j++) {
- 		    pkg_t *pkg = pkg_vec->pkgs[j];
- 		    if (version_constraints_satisfied(depend, pkg)) {
-@@ -406,12 +412,14 @@
-      int n_providers = provider_apkgs->len;
-      abstract_pkg_t **apkgs = provider_apkgs->pkgs;
-      int i;
-+     int n_pkgs;
-+     int j;
-+
-      for (i = 0; i < n_providers; i++) {
- 	  abstract_pkg_t *papkg = apkgs[i];
- 	  pkg_vec_t *pkg_vec = papkg->pkgs;
- 	  if (pkg_vec) {
--	       int n_pkgs = pkg_vec->len;
--	       int j;
-+	       n_pkgs = pkg_vec->len;
- 	       for (j = 0; j < n_pkgs; j++) {
- 		    pkg_t *pkg = pkg_vec->pkgs[j];
- 		    if (version_constraints_satisfied(depend, pkg)) {
-@@ -532,11 +540,15 @@
-      abstract_pkg_t **conflictee_provides = conflictee->provides;
-      int conflictee_provides_count = conflictee->provides_count;
-      int i, j, k;
-+     int possibility_count;
-+     struct depend **possibilities;
-+     abstract_pkg_t *possibility ;
-+
-      for (i = 0; i < conflicts_count; i++) {
--	  int possibility_count = conflicts[i].possibility_count;
--	  struct depend **possibilities = conflicts[i].possibilities;
-+	  possibility_count = conflicts[i].possibility_count;
-+	  possibilities = conflicts[i].possibilities;
- 	  for (j = 0; j < possibility_count; j++) {
--	       abstract_pkg_t *possibility = possibilities[j]->pkg;
-+	       possibility = possibilities[j]->pkg;
- 	       for (k = 0; k < conflictee_provides_count; k++) {
- 		    if (possibility == conflictee_provides[k]) {
- 			 return 1;
-@@ -832,6 +844,8 @@
-      compound_depend_t * depends;
-      int count, othercount;
-      register int i, j;
-+     abstract_pkg_t * ab_depend;
-+     abstract_pkg_t ** temp;
- 
-      count = pkg->pre_depends_count + pkg->depends_count;
-      depends = pkg->depends;
-@@ -843,8 +857,7 @@
- 	  if (0 && pkg->pre_depends_count)
- 	       fprintf(stderr, "  i=%d possibility_count=%x depends=%p\n", i, depends->possibility_count, depends);
- 	  for (j = 0; j < depends->possibility_count; j++){
--	       abstract_pkg_t * ab_depend = depends->possibilities[j]->pkg;
--	       abstract_pkg_t ** temp;
-+	       ab_depend = depends->possibilities[j]->pkg;
- 	       if(!ab_depend->depended_upon_by)
- 		    ab_depend->depended_upon_by = (abstract_pkg_t **)calloc(1, sizeof(abstract_pkg_t *));
- 
diff --git a/openembedded/packages/ipkg/ipkg-0.99.144/paths.patch b/openembedded/packages/ipkg/ipkg-0.99.144/paths.patch
deleted file mode 100644
index f40131e252..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.144/paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-Index: C/ipkg.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ C/ipkg.h	2005-02-25 15:28:24.000000000 -0600
-@@ -0,0 +1,59 @@
-+/* ipkg.h - the itsy package management system
-+
-+   Carl D. Worth
-+
-+   Copyright (C) 2001 University of Southern California
-+
-+   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.
-+*/
-+
-+#ifndef IPKG_H
-+#define IPKG_H
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#if 0
-+#define IPKG_DEBUG_NO_TMP_CLEANUP
-+#endif
-+
-+#include "includes.h"
-+#include "ipkg_conf.h"
-+#include "ipkg_message.h"
-+
-+#define IPKG_PKG_EXTENSION ".ipk"
-+#define DPKG_PKG_EXTENSION ".deb"
-+
-+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-+#define IPKG_PKG_VERSION_SEP_CHAR '_'
-+
-+#define IPKG_STATE_DIR_PREFIX IPKGDIR
-+#define IPKG_LISTS_DIR_SUFFIX "lists"
-+#define IPKG_INFO_DIR_SUFFIX "info"
-+#define IPKG_STATUS_FILE_SUFFIX "status"
-+
-+#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
-+
-+#define IPKG_LIST_DESCRIPTION_LENGTH 128
-+
-+enum ipkg_error {
-+    IPKG_SUCCESS = 0,
-+    IPKG_PKG_DEPS_UNSATISFIED,
-+    IPKG_PKG_IS_ESSENTIAL,
-+    IPKG_PKG_HAS_DEPENDENTS,
-+    IPKG_PKG_HAS_NO_CANDIDATE
-+};
-+typedef enum ipkg_error ipkg_error_t;
-+
-+extern int ipkg_state_changed;
-+
-+#endif
-Index: C/configure.ac
-===================================================================
---- C.orig/configure.ac	2005-02-25 15:27:58.000000000 -0600
-+++ C/configure.ac	2005-02-25 15:28:00.000000000 -0600
-@@ -10,6 +10,14 @@
-   test -f $top_builddir/configure && break
- done
-