Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. org.openmoko.dev: ca4fa3cbffd662fd5502ebc26a66b2701bfa9dcf
([EMAIL PROTECTED])
2. org.openmoko.dev: ca4fa3cbffd662fd5502ebc26a66b2701bfa9dcf
([EMAIL PROTECTED])
3. r4418 - in trunk/src/target/opkg: . libopkg tests
([EMAIL PROTECTED])
4. r4419 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
5. Production testing software for GTA02: Changes to 'master'
([EMAIL PROTECTED])
6. development tree for U-Boot: Changes to 'stable'
([EMAIL PROTECTED])
7. development tree for U-Boot: Changes to 'stable'
([EMAIL PROTECTED])
8. development kernel tree: Changes to 'zecke' ([EMAIL PROTECTED])
--- Begin Message ---
revision: ca4fa3cbffd662fd5502ebc26a66b2701bfa9dcf
date: 2008-05-09T09:48:41
author: [EMAIL PROTECTED]
branch: org.openmoko.dev
changelog:
Change Tag of enlazar from Communication to Network
manifest:
format_version "1"
new_manifest [0d73d63f32234344f9b5651d169fc66cce10e758]
old_revision [1126507c60f8a235465edca0bfaed3c8ca438054]
patch "packages/openmoko-projects/enlazar_svn.bb"
from [47b1f4f00fe055287bfa497c3b8f4a15ceb8e456]
to [7060188b2ea9b96344c4b3c78a57aa6035c1abff]
#
#
# patch "packages/openmoko-projects/enlazar_svn.bb"
# from [47b1f4f00fe055287bfa497c3b8f4a15ceb8e456]
# to [7060188b2ea9b96344c4b3c78a57aa6035c1abff]
#
============================================================
--- packages/openmoko-projects/enlazar_svn.bb
47b1f4f00fe055287bfa497c3b8f4a15ceb8e456
+++ packages/openmoko-projects/enlazar_svn.bb
7060188b2ea9b96344c4b3c78a57aa6035c1abff
@@ -1,5 +1,6 @@ HOMEPAGE = "http://enlazar.projects.open
DESCRIPTION = "Enlazar - Network part for Assasin"
HOMEPAGE = "http://enlazar.projects.openmoko.org/";
+PKG_TAGS_${PN} = "group::network"
LICENSE = "GPL"
DEPENDS = "evas edje ecore edbus"
RDEPENDS = "networkmanager"
--- End Message ---
--- Begin Message ---
revision: ca4fa3cbffd662fd5502ebc26a66b2701bfa9dcf
date: 2008-05-09T09:48:41
author: [EMAIL PROTECTED]
branch: org.openmoko.dev
changelog:
Change Tag of enlazar from Communication to Network
manifest:
format_version "1"
new_manifest [0d73d63f32234344f9b5651d169fc66cce10e758]
old_revision [1126507c60f8a235465edca0bfaed3c8ca438054]
patch "packages/openmoko-projects/enlazar_svn.bb"
from [47b1f4f00fe055287bfa497c3b8f4a15ceb8e456]
to [7060188b2ea9b96344c4b3c78a57aa6035c1abff]
#
#
# patch "packages/openmoko-projects/enlazar_svn.bb"
# from [47b1f4f00fe055287bfa497c3b8f4a15ceb8e456]
# to [7060188b2ea9b96344c4b3c78a57aa6035c1abff]
#
============================================================
--- packages/openmoko-projects/enlazar_svn.bb
47b1f4f00fe055287bfa497c3b8f4a15ceb8e456
+++ packages/openmoko-projects/enlazar_svn.bb
7060188b2ea9b96344c4b3c78a57aa6035c1abff
@@ -1,5 +1,6 @@ HOMEPAGE = "http://enlazar.projects.open
DESCRIPTION = "Enlazar - Network part for Assasin"
HOMEPAGE = "http://enlazar.projects.openmoko.org/";
+PKG_TAGS_${PN} = "group::network"
LICENSE = "GPL"
DEPENDS = "evas edje ecore edbus"
RDEPENDS = "networkmanager"
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-05-09 12:52:43 +0200 (Fri, 09 May 2008)
New Revision: 4418
Modified:
trunk/src/target/opkg/configure.ac
trunk/src/target/opkg/libopkg/opkg.c
trunk/src/target/opkg/libopkg/opkg.h
trunk/src/target/opkg/tests/libopkg_test.c
Log:
opkg: implement opkg_find_package()
Modified: trunk/src/target/opkg/configure.ac
===================================================================
--- trunk/src/target/opkg/configure.ac 2008-05-08 20:28:53 UTC (rev 4417)
+++ trunk/src/target/opkg/configure.ac 2008-05-09 10:52:43 UTC (rev 4418)
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script
AC_INIT(libopkg/libopkg.c)
-AM_INIT_AUTOMAKE([opkg], [0.1.2])
+AM_INIT_AUTOMAKE([opkg], [0.1.3])
AM_CONFIG_HEADER(libopkg/config.h)
AC_CANONICAL_HOST
Modified: trunk/src/target/opkg/libopkg/opkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.c 2008-05-08 20:28:53 UTC (rev
4417)
+++ trunk/src/target/opkg/libopkg/opkg.c 2008-05-09 10:52:43 UTC (rev
4418)
@@ -45,11 +45,33 @@
__FILE__, __LINE__, __PRETTY_FUNCTION__, # expr); abort (); }
#define progress(d, p) d.percentage = p; if (progress_callback)
progress_callback (opkg, &d, user_data);
-#define OLD_PKG_TO_NEW(pkg) opkg_package_new_with_values (pkg->name,
pkg->version, pkg->architecture, pkg->description, pkg->tags, pkg->url,
(pkg->size ? atoi (pkg->size) : 0), (pkg->state_status == SS_INSTALLED));
+#define SSTRCMP(x,y) (x && y) ? strcmp (x, y) : 0
/** Private Functions ***/
+static opkg_package_t*
+old_pkg_to_new (pkg_t *old)
+{
+ opkg_package_t *new;
+ new = opkg_package_new ();
+
+#define sstrdup(x) (x) ? strdup (x) : NULL;
+
+ new->name = sstrdup (old->name);
+ new->version = pkg_version_str_alloc (old);
+ new->architecture = sstrdup (old->architecture);
+ new->repository = sstrdup (old->src->name);
+ new->description = sstrdup (old->description);
+ new->tags = sstrdup (old->tags);
+ new->url = sstrdup (old->url);
+
+ new->size = (old->size) ? atoi (old->size) : 0;
+ new->installed = (old->state_status == SS_INSTALLED);
+
+ return new;
+}
+
static int
opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
{
@@ -143,28 +165,6 @@
return p;
}
-opkg_package_t *
-opkg_package_new_with_values (const char *name, const char *version,
- const char *arch, const char *desc, const char *tags, const char *url, int
size, int installed)
-{
- opkg_package_t *package;
- package = opkg_package_new ();
-
-#define sstrdup(x) (x) ? strdup (x) : NULL;
-
- package->name = sstrdup (name);
- package->version = sstrdup (version);
- package->architecture = sstrdup (arch);
- package->description = sstrdup (desc);
- package->tags = sstrdup (tags);
- package->url = sstrdup (url);
-
- package->size = size;
- package->installed = (installed != 0);
-
- return package;
-}
-
void
opkg_package_free (opkg_package_t *p)
{
@@ -376,7 +376,7 @@
return 1;
}
pdata.action = OPKG_INSTALL;
- pdata.package = OLD_PKG_TO_NEW (new);
+ pdata.package = old_pkg_to_new (new);
progress (pdata, 0);
@@ -441,7 +441,7 @@
}
pdata.action = OPKG_REMOVE;
- pdata.package = OLD_PKG_TO_NEW (pkg);
+ pdata.package = old_pkg_to_new (pkg);
progress (pdata, 0);
@@ -515,7 +515,7 @@
}
pdata.action = OPKG_INSTALL;
- pdata.package = OLD_PKG_TO_NEW (pkg);
+ pdata.package = old_pkg_to_new (pkg);
progress (pdata, 0);
opkg_upgrade_pkg (opkg->conf, pkg);
@@ -550,7 +550,7 @@
{
pkg = installed->pkgs[i];
- pdata.package = OLD_PKG_TO_NEW (pkg);
+ pdata.package = old_pkg_to_new (pkg);
progress (pdata, 99 * i / installed->len);
opkg_package_free (pdata.package);
@@ -759,7 +759,7 @@
pkg = all->pkgs[i];
- package = OLD_PKG_TO_NEW (pkg);
+ package = old_pkg_to_new (pkg);
callback (opkg, package, user_data);
}
@@ -800,7 +800,7 @@
if (cmp < 0)
{
- package = OLD_PKG_TO_NEW (new);
+ package = old_pkg_to_new (new);
callback (opkg, package, user_data);
}
}
@@ -810,3 +810,58 @@
return 0;
}
+opkg_package_t*
+opkg_find_package (opkg_t *opkg, const char *name, const char *ver, const char
*arch, const char *repo)
+{
+ pkg_vec_t *all;
+ opkg_package_t *package = NULL;
+ int i;
+#define sstrcmp(x,y) (x && y) ? strcmp (x, y) : 0
+
+ opkg_assert (opkg);
+
+ all = pkg_vec_alloc ();
+ pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+ for (i = 0; i < all->len; i++)
+ {
+ pkg_t *pkg;
+ char *pkgv;
+
+ pkg = all->pkgs[i];
+
+ /* check name */
+ if (sstrcmp (pkg->name, name))
+ continue;
+
+ /* check version */
+ pkgv = pkg_version_str_alloc (pkg);
+ if (sstrcmp (pkgv, ver))
+ {
+ free (pkgv);
+ continue;
+ }
+ free (pkgv);
+
+ /* check architecture */
+ if (arch)
+ {
+ if (sstrcmp (pkg->architecture, arch))
+ continue;
+ }
+
+ /* check repository */
+ if (repo)
+ {
+ if (sstrcmp (pkg->src->name, repo))
+ continue;
+ }
+
+ /* match found */
+ package = old_pkg_to_new (pkg);
+ break;
+ }
+
+ pkg_vec_free (all);
+
+ return package;
+}
Modified: trunk/src/target/opkg/libopkg/opkg.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.h 2008-05-08 20:28:53 UTC (rev
4417)
+++ trunk/src/target/opkg/libopkg/opkg.h 2008-05-09 10:52:43 UTC (rev
4418)
@@ -50,7 +50,6 @@
};
opkg_package_t* opkg_package_new ();
-opkg_package_t* opkg_package_new_with_values (const char *name, const char
*version, const char *arch, const char *desc, const char *tags, const char
*url, int size, int installed);
void opkg_package_free (opkg_package_t *package);
opkg_t* opkg_new ();
@@ -67,3 +66,4 @@
int opkg_list_packages (opkg_t *opkg, opkg_package_callback_t callback, void
*user_data);
int opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t
callback, void *user_data);
+opkg_package_t* opkg_find_package (opkg_t *opkg, const char *name, const char
*version, const char *architecture, const char *repository);
Modified: trunk/src/target/opkg/tests/libopkg_test.c
===================================================================
--- trunk/src/target/opkg/tests/libopkg_test.c 2008-05-08 20:28:53 UTC (rev
4417)
+++ trunk/src/target/opkg/tests/libopkg_test.c 2008-05-09 10:52:43 UTC (rev
4418)
@@ -2,6 +2,8 @@
#include <stdlib.h>
#include <stdio.h>
+opkg_package_t *find_pkg = NULL;
+
void
progress_callback (opkg_t *opkg, const opkg_progress_data_t *progress, void
*data)
{
@@ -23,7 +25,13 @@
printf ("\rPackage count: %d Installed, %d Total Available", install_count,
total_count);
fflush (stdout);
- opkg_package_free (pkg);
+ if (!find_pkg)
+ {
+ /* store the first package to print out later */
+ find_pkg = pkg;
+ }
+ else
+ opkg_package_free (pkg);
}
void
@@ -32,10 +40,36 @@
printf ("%s - %s\n", pkg->name, pkg->version);
}
+void
+print_package (opkg_package_t *pkg)
+{
+ printf (
+ "Name: %s\n"
+ "Version: %s\n"
+ "Repository: %s\n"
+ "Architecture: %s\n"
+ "Description: %s\n"
+ "Tags: %s\n"
+ "URL: %s\n"
+ "Size: %d\n"
+ "Installed: %s\n",
+ pkg->name,
+ pkg->version,
+ pkg->repository,
+ pkg->architecture,
+ pkg->description,
+ pkg->tags,
+ pkg->url,
+ pkg->size,
+ (pkg->installed ? "True" : "False")
+ );
+}
+
int
main (int argc, char **argv)
{
opkg_t *opkg;
+ opkg_package_t *pkg;
int err;
opkg = opkg_new ();
@@ -47,6 +81,25 @@
err = opkg_update_package_lists (opkg, progress_callback, "Updating...");
printf ("\nopkg_update_package_lists returned %d\n", err);
+ opkg_list_packages (opkg, package_list_callback, NULL);
+ printf ("\n");
+
+ if (find_pkg)
+ {
+ printf ("Finding package \"%s\"\n", find_pkg->name);
+ pkg = opkg_find_package (opkg, find_pkg->name, find_pkg->version,
find_pkg->architecture, find_pkg->repository);
+ if (pkg)
+ {
+ print_package (pkg);
+ opkg_package_free (find_pkg);
+ opkg_package_free (pkg);
+ }
+ else
+ printf ("Package \"%s\" not found!\n", find_pkg->name);
+ }
+ else
+ printf ("No package available to test find_package.\n");
+
err = opkg_install_package (opkg, "aspell", progress_callback,
"Installing...");
printf ("\nopkg_install_package returned %d\n", err);
@@ -62,8 +115,7 @@
err = opkg_upgrade_all (opkg, progress_callback, "Upgrading all...");
printf ("\nopkg_upgrade_all returned %d\n", err);
- opkg_list_packages (opkg, package_list_callback, NULL);
- printf ("\n");
+ opkg_free (opkg);
- opkg_free (opkg);
+ return 0;
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-05-09 13:50:02 +0200 (Fri, 09 May 2008)
New Revision: 4419
Modified:
trunk/src/target/opkg/libopkg/opkg.c
Log:
opkg: protect against NULL src
Modified: trunk/src/target/opkg/libopkg/opkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.c 2008-05-09 10:52:43 UTC (rev
4418)
+++ trunk/src/target/opkg/libopkg/opkg.c 2008-05-09 11:50:02 UTC (rev
4419)
@@ -61,7 +61,8 @@
new->name = sstrdup (old->name);
new->version = pkg_version_str_alloc (old);
new->architecture = sstrdup (old->architecture);
- new->repository = sstrdup (old->src->name);
+ if (old->src)
+ new->repository = sstrdup (old->src->name);
new->description = sstrdup (old->description);
new->tags = sstrdup (old->tags);
new->url = sstrdup (old->url);
--- End Message ---
--- Begin Message ---
gta02-dm2/src/tests-motion.c | 168 +++++++++++++-----------------------------
1 files changed, 52 insertions(+), 116 deletions(-)
New commits:
commit 3660f55e0944657a755ff8061d26757d7f666990
Author: Andy Green <[EMAIL PROTECTED]>
Date: Fri May 9 13:05:48 2008 +0100
fix-motion-sensor-limits.patch
From: Andy Green <[EMAIL PROTECTED]>
redo the sensor checking stuff
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
--- End Message ---
--- Begin Message ---
cpu/arm920t/s3c24x0/nand_read.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 7dc8a18752daa26e776748b264dd97267743d12e
Author: michael <[EMAIL PROTECTED]>
Date: Sun Apr 13 19:05:30 2008 +0100
nand_skip_bad.patch
Change the skip bad block. Avoid false positives by only checking
the beginning of a block and check the second page
Signed-off-by: michael <[EMAIL PROTECTED]>
--- End Message ---
--- Begin Message ---
Rebased ref, commits from common ancestor:
commit 4ec60973cf2e028de905f6ea1f81ef99ca60d834
Author: michael <[EMAIL PROTECTED]>
Date: Fri May 9 14:35:10 2008 +0100
nand_skip_bad.patch
Change the skip bad block. Avoid false positives by only checking
the beginning of a block and check the second page
Signed-off-by: michael <[EMAIL PROTECTED]>
--- End Message ---
--- Begin Message ---
defconfig-gta02 | 2 +-
drivers/power/bq27000_battery.c | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
New commits:
commit eca107a7ba968770f6ee0f342df365feb9fe0750
Author: Holger Freyther <[EMAIL PROTECTED]>
Date: Fri May 9 15:33:21 2008 +0200
[power] Use the bq27000 battery to provide charging values for apm
Built the apm emulation for gta02 and say that the gta02 battery
is supposed to be used for this apm emulation.
Signed-Off-By: Holger Freyther <[EMAIL PROTECTED]>
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
