Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
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. r4434 - in trunk/src/target/opkg: . libopkg
([EMAIL PROTECTED])
2. org.openmoko.april-update:
568c22f89e802bfa2941b3ff64c9b8b8fb590bfd ([EMAIL PROTECTED])
3. org.openmoko.april-update:
568c22f89e802bfa2941b3ff64c9b8b8fb590bfd ([EMAIL PROTECTED])
4. org.openmoko.dev: 89bf2246d9717a428b59f1673f19dce0248cdd0f
([EMAIL PROTECTED])
5. org.openmoko.dev: 89bf2246d9717a428b59f1673f19dce0248cdd0f
([EMAIL PROTECTED])
6. org.openmoko.dev: 5a5e955c4e067a5ab216f6e9a28c27f869862051
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2008-05-14 13:00:10 +0200 (Wed, 14 May 2008)
New Revision: 4434
Modified:
trunk/src/target/opkg/configure.ac
trunk/src/target/opkg/libopkg/opkg.c
trunk/src/target/opkg/libopkg/opkg.h
Log:
opkg: add some error codes to libopkg
Modified: trunk/src/target/opkg/configure.ac
===================================================================
--- trunk/src/target/opkg/configure.ac 2008-05-14 09:44:16 UTC (rev 4433)
+++ trunk/src/target/opkg/configure.ac 2008-05-14 11:00:10 UTC (rev 4434)
@@ -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.3])
+AM_INIT_AUTOMAKE([opkg], [0.1.4])
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-14 09:44:16 UTC (rev
4433)
+++ trunk/src/target/opkg/libopkg/opkg.c 2008-05-14 11:00:10 UTC (rev
4434)
@@ -378,14 +378,14 @@
if (old)
{
/* XXX: Error: Package is already installed. */
- return 1;
+ return OPKG_PACKAGE_ALREADY_INSTALLED;
}
new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf,
package_name);
if (!new)
{
/* XXX: Error: Could not find package to install */
- return 1;
+ return OPKG_PACKAGE_NOT_FOUND;
}
new->state_flag |= SF_USER;
@@ -403,7 +403,7 @@
{
/* XXX: Error: Could not satisfy dependencies */
pkg_vec_free (deps);
- return 1;
+ return OPKG_DEPENDANCIES_FAILED;
}
/* insert the package we are installing so that we download it */
@@ -427,7 +427,7 @@
if (pkg->src == NULL)
{
/* XXX: Error: Package not available from any configured src */
- return 1;
+ return OPKG_PACKAGE_NOT_AVAILABLE;
}
sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
@@ -515,7 +515,7 @@
if (pkg == NULL)
{
/* XXX: Error: Package not installed. */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
pdata.action = OPKG_REMOVE;
@@ -526,7 +526,7 @@
if (pkg->state_status == SS_NOT_INSTALLED)
{
/* XXX: Error: Package seems to be not installed (STATUS =
NOT_INSTALLED). */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
progress (pdata, 25);
@@ -577,7 +577,7 @@
if (pkg == NULL)
{
/* XXX: Error: Package not installed in default_dest */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
}
else
@@ -589,7 +589,7 @@
if (!pkg)
{
/* XXX: Error: Package not installed */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
pdata.action = OPKG_INSTALL;
@@ -652,7 +652,7 @@
opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t
progress_callback, void *user_data)
{
char *tmp;
- int err;
+ int err, result = 0;
char *lists_dir;
pkg_src_list_elt_t *iter;
pkg_src_t *src;
@@ -762,6 +762,7 @@
if (err)
{
/* XXX: Error: download error */
+ result = OPKG_DOWNLOAD_FAILED;
}
free (url);
@@ -815,7 +816,7 @@
free (tmp);
free (lists_dir);
- return 0;
+ return result;
}
Modified: trunk/src/target/opkg/libopkg/opkg.h
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.h 2008-05-14 09:44:16 UTC (rev
4433)
+++ trunk/src/target/opkg/libopkg/opkg.h 2008-05-14 11:00:10 UTC (rev
4434)
@@ -32,6 +32,18 @@
OPKG_DOWNLOAD
};
+enum _opkg_error_code_t
+{
+ OPKG_NO_ERROR,
+ OPKG_UNKNOWN_ERROR,
+ OPKG_DOWNLOAD_FAILED,
+ OPKG_DEPENDANCIES_FAILED,
+ OPKG_PACKAGE_ALREADY_INSTALLED,
+ OPKG_PACKAGE_NOT_AVAILABLE,
+ OPKG_PACKAGE_NOT_FOUND,
+ OPKG_PACKAGE_NOT_INSTALLED
+};
+
struct _opkg_package_t
{
char *name;
--- End Message ---
--- Begin Message ---
revision: 568c22f89e802bfa2941b3ff64c9b8b8fb590bfd
date: 2008-05-14T12:06:22
author: [EMAIL PROTECTED]
branch: org.openmoko.april-update
changelog:
classes/om-utils.bbclass : a utility bbclass that contains a task to
list all the WORKDIRS. This is so we can know on an autobuild which
dirs were used and clean out old ones.
manifest:
format_version "1"
new_manifest [536c375f6201f87570ae845ff3a03b26ab783737]
old_revision [f3f4e7b9203565a659a39722af8487203ef264c6]
add_file "classes/om-utils.bbclass"
content [a2d8a98660fedee362fc8da5628f26077268540a]
#
#
# add_file "classes/om-utils.bbclass"
# content [a2d8a98660fedee362fc8da5628f26077268540a]
#
============================================================
--- classes/om-utils.bbclass a2d8a98660fedee362fc8da5628f26077268540a
+++ classes/om-utils.bbclass a2d8a98660fedee362fc8da5628f26077268540a
@@ -0,0 +1,19 @@
+addtask showworkdir
+do_showworkdir[nostamp] = "1"
+python do_showworkdir() {
+ import sys
+
+ localdata = bb.data.createCopy(d)
+ bb.data.update_data(localdata)
+
+ workdirs = open("%s/workdirs.txt" % bb.data.getVar("TMPDIR", d, 1), "a")
+ print >> workdirs, "%s" % bb.data.getVar("WORKDIR", d, True)
+ workdirs.close()
+}
+
+addtask listworkdirs
+do_listworkdirs[nostamp]= "1"
+do_listworkdirs[recrdeptask] = "do_showworkdir"
+python do_listworkdirs() {
+}
+
--- End Message ---
--- Begin Message ---
revision: 568c22f89e802bfa2941b3ff64c9b8b8fb590bfd
date: 2008-05-14T12:06:22
author: [EMAIL PROTECTED]
branch: org.openmoko.april-update
changelog:
classes/om-utils.bbclass : a utility bbclass that contains a task to
list all the WORKDIRS. This is so we can know on an autobuild which
dirs were used and clean out old ones.
manifest:
format_version "1"
new_manifest [536c375f6201f87570ae845ff3a03b26ab783737]
old_revision [f3f4e7b9203565a659a39722af8487203ef264c6]
add_file "classes/om-utils.bbclass"
content [a2d8a98660fedee362fc8da5628f26077268540a]
#
#
# add_file "classes/om-utils.bbclass"
# content [a2d8a98660fedee362fc8da5628f26077268540a]
#
============================================================
--- classes/om-utils.bbclass a2d8a98660fedee362fc8da5628f26077268540a
+++ classes/om-utils.bbclass a2d8a98660fedee362fc8da5628f26077268540a
@@ -0,0 +1,19 @@
+addtask showworkdir
+do_showworkdir[nostamp] = "1"
+python do_showworkdir() {
+ import sys
+
+ localdata = bb.data.createCopy(d)
+ bb.data.update_data(localdata)
+
+ workdirs = open("%s/workdirs.txt" % bb.data.getVar("TMPDIR", d, 1), "a")
+ print >> workdirs, "%s" % bb.data.getVar("WORKDIR", d, True)
+ workdirs.close()
+}
+
+addtask listworkdirs
+do_listworkdirs[nostamp]= "1"
+do_listworkdirs[recrdeptask] = "do_showworkdir"
+python do_listworkdirs() {
+}
+
--- End Message ---
--- Begin Message ---
revision: 89bf2246d9717a428b59f1673f19dce0248cdd0f
date: 2008-05-14T12:53:20
author: [EMAIL PROTECTED]
branch: org.openmoko.dev
changelog:
classes/om-utils.bbclass : a utility bbclass that contains a task to
list all the WORKDIRS. This is so we can know on an autobuild which
dirs were used and clean out old ones.
manifest:
format_version "1"
new_manifest [4768279e8fd79edd6ed933ce102369e3e7cbc3d9]
old_revision [20726041dfe55043987b3030b6ceea2c8818aebb]
add_file "classes/om-utils.bbclass"
content [a2d8a98660fedee362fc8da5628f26077268540a]
#
#
# add_file "classes/om-utils.bbclass"
# content [a2d8a98660fedee362fc8da5628f26077268540a]
#
============================================================
--- classes/om-utils.bbclass a2d8a98660fedee362fc8da5628f26077268540a
+++ classes/om-utils.bbclass a2d8a98660fedee362fc8da5628f26077268540a
@@ -0,0 +1,19 @@
+addtask showworkdir
+do_showworkdir[nostamp] = "1"
+python do_showworkdir() {
+ import sys
+
+ localdata = bb.data.createCopy(d)
+ bb.data.update_data(localdata)
+
+ workdirs = open("%s/workdirs.txt" % bb.data.getVar("TMPDIR", d, 1), "a")
+ print >> workdirs, "%s" % bb.data.getVar("WORKDIR", d, True)
+ workdirs.close()
+}
+
+addtask listworkdirs
+do_listworkdirs[nostamp]= "1"
+do_listworkdirs[recrdeptask] = "do_showworkdir"
+python do_listworkdirs() {
+}
+
--- End Message ---
--- Begin Message ---
revision: 89bf2246d9717a428b59f1673f19dce0248cdd0f
date: 2008-05-14T12:53:20
author: [EMAIL PROTECTED]
branch: org.openmoko.dev
changelog:
classes/om-utils.bbclass : a utility bbclass that contains a task to
list all the WORKDIRS. This is so we can know on an autobuild which
dirs were used and clean out old ones.
manifest:
format_version "1"
new_manifest [4768279e8fd79edd6ed933ce102369e3e7cbc3d9]
old_revision [20726041dfe55043987b3030b6ceea2c8818aebb]
add_file "classes/om-utils.bbclass"
content [a2d8a98660fedee362fc8da5628f26077268540a]
#
#
# add_file "classes/om-utils.bbclass"
# content [a2d8a98660fedee362fc8da5628f26077268540a]
#
============================================================
--- classes/om-utils.bbclass a2d8a98660fedee362fc8da5628f26077268540a
+++ classes/om-utils.bbclass a2d8a98660fedee362fc8da5628f26077268540a
@@ -0,0 +1,19 @@
+addtask showworkdir
+do_showworkdir[nostamp] = "1"
+python do_showworkdir() {
+ import sys
+
+ localdata = bb.data.createCopy(d)
+ bb.data.update_data(localdata)
+
+ workdirs = open("%s/workdirs.txt" % bb.data.getVar("TMPDIR", d, 1), "a")
+ print >> workdirs, "%s" % bb.data.getVar("WORKDIR", d, True)
+ workdirs.close()
+}
+
+addtask listworkdirs
+do_listworkdirs[nostamp]= "1"
+do_listworkdirs[recrdeptask] = "do_showworkdir"
+python do_listworkdirs() {
+}
+
--- End Message ---
--- Begin Message ---
revision: 5a5e955c4e067a5ab216f6e9a28c27f869862051
date: 2008-05-15T04:23:15
author: [EMAIL PROTECTED]
branch: org.openmoko.dev
changelog:
meta-toolchain-openmoko: a gross hack to put pkg-config in.
* We need the OE version of pkg-config that uses PKG_CONFIG_SYSROOT_DIR
to make toolchain work properly. However, there's no facility to
install native stuffs in it. First, native recipes don't generate
ipkg. Second, native feed does not exist in opkg-sdk.conf. I don't
won't to fix these yet so at the moment I just copy the native
pkg-config into the toolchain.
* meta-toolchain: add a hook variable POPULATE_SDK_EXTRA_TASK
* meta-toolchain-openmoko: cp native pkg-config from staging dir into
toolchain.
* openmoko-toolchain-scripts: use ${prefix} instead of hardcode path.
manifest:
format_version "1"
new_manifest [d344d39b5731d99472f978ad70766177f1af257a]
old_revision [fba9e32c8adbdf5cb4cac4f5dd30b830efe70c04]
patch "packages/meta/meta-toolchain-openmoko.bb"
from [76d692ed056a9397df52f5d27a16c97f29b032cd]
to [f863c373260a0e447f82489950183fed3cacbca5]
patch "packages/meta/meta-toolchain.bb"
from [653be1fcb3f433216d391a1e48cde9fd4e56e7a3]
to [154f3d231b84fcfc3bb4298097864f5f205225df]
patch "packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb"
from [1e7c5255fcac0c151d8e27c90678b60a96ba86cc]
to [602d1e114432c290bee5ea5c879d890625819c12]
#
#
# patch "packages/meta/meta-toolchain-openmoko.bb"
# from [76d692ed056a9397df52f5d27a16c97f29b032cd]
# to [f863c373260a0e447f82489950183fed3cacbca5]
#
# patch "packages/meta/meta-toolchain.bb"
# from [653be1fcb3f433216d391a1e48cde9fd4e56e7a3]
# to [154f3d231b84fcfc3bb4298097864f5f205225df]
#
# patch "packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb"
# from [1e7c5255fcac0c151d8e27c90678b60a96ba86cc]
# to [602d1e114432c290bee5ea5c879d890625819c12]
#
============================================================
--- packages/meta/meta-toolchain-openmoko.bb
76d692ed056a9397df52f5d27a16c97f29b032cd
+++ packages/meta/meta-toolchain-openmoko.bb
f863c373260a0e447f82489950183fed3cacbca5
@@ -1,7 +1,11 @@
-PR = "r1"
+require meta-toolchain.bb
+DEPENDS += "pkgconfig-native"
+PR = "r1.01"
+
+SDK_SUFFIX = "toolchain-openmoko"
+
TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
+POPULATE_SDK_EXTRA_TASK = "cp ${STAGING_BINDIR_NATIVE}/pkg-config
${SDK_OUTPUT}/${bindir}"
-require meta-toolchain.bb
-SDK_SUFFIX = "toolchain-openmoko"
============================================================
--- packages/meta/meta-toolchain.bb 653be1fcb3f433216d391a1e48cde9fd4e56e7a3
+++ packages/meta/meta-toolchain.bb 154f3d231b84fcfc3bb4298097864f5f205225df
@@ -20,6 +20,8 @@ RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${T
RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
+POPULATE_SDK_EXTRA_TASK ?= ""
+
do_populate_sdk() {
rm -rf ${SDK_OUTPUT}
mkdir -p ${SDK_OUTPUT}
@@ -93,6 +95,8 @@ do_populate_sdk() {
done
rm -f ${SDK_OUTPUT}/${prefix}/lib/*.la
+ ${POPULATE_SDK_EXTRA_TASK}
+
# Setup site file for external use
siteconfig=${SDK_OUTPUT}/${prefix}/site-config
touch $siteconfig
============================================================
--- packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb
1e7c5255fcac0c151d8e27c90678b60a96ba86cc
+++ packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb
602d1e114432c290bee5ea5c879d890625819c12
@@ -1,15 +1,15 @@ DESCRIPTION = "Convenient scripts to be
DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
-PR = "r1.03"
+PR = "r1.04"
SRC_URI =
"svn://svn.openmoko.org/trunk/src/host;module=toolchain-scripts;proto=http"
S = "${WORKDIR}/toolchain-scripts"
do_install () {
- install -d ${D}/usr/local/openmoko/arm
- cp -dr ${S}/* ${D}/usr/local/openmoko/arm
+ install -d ${D}/${prefix}
+ cp -dr ${S}/* ${D}/${prefix}
find ${D} -name ".svn" | xargs rm -rf
- rm -r ${D}/usr/local/openmoko/arm/patches
+ rm -rf ${D}/${prefix}/patches
}
PACKAGE_ARCH = "all"
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
