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. r4371 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
2. r4372 - trunk/src/target/opkg/tests ([EMAIL PROTECTED])
3. r4373 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
4. r4374 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2008-04-17 12:56:46 +0200 (Thu, 17 Apr 2008)
New Revision: 4371
Modified:
trunk/src/target/opkg/libopkg/Makefile.am
trunk/src/target/opkg/libopkg/opkg.c
Log:
opkg: various white space cleanups and implement opkg_update_package_lists
Modified: trunk/src/target/opkg/libopkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/libopkg/Makefile.am 2008-04-16 15:40:55 UTC (rev
4370)
+++ trunk/src/target/opkg/libopkg/Makefile.am 2008-04-17 10:56:46 UTC (rev
4371)
@@ -1,5 +1,5 @@
-ALL_CFLAGS=-g -O -Wall -Werror -DHOST_CPU_STR=\"@[EMAIL PROTECTED]" [EMAIL
PROTECTED]@ -DLIBDIR=\"@[EMAIL PROTECTED]" -DOPKGLIBDIR=\"@[EMAIL PROTECTED]"
-DDATADIR=\"@[EMAIL PROTECTED]" -I$(top_srcdir)
+ALL_CFLAGS=-g -O -Wall -Werror -DHOST_CPU_STR=\"@[EMAIL PROTECTED]" [EMAIL
PROTECTED]@ -DLIBDIR=\"@[EMAIL PROTECTED]" -DOPKGLIBDIR=\"@[EMAIL PROTECTED]"
-DDATADIR=\"@[EMAIL PROTECTED]" -I$(top_srcdir)/libbb
libopkg_includedir=$(includedir)/libopkg
Modified: trunk/src/target/opkg/libopkg/opkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.c 2008-04-16 15:40:55 UTC (rev
4370)
+++ trunk/src/target/opkg/libopkg/opkg.c 2008-04-17 10:56:46 UTC (rev
4371)
@@ -24,7 +24,13 @@
#include "opkg_install.h"
#include "opkg_configure.h"
+#include "opkg_download.h"
+#include "sprintf_alloc.h"
+#include "file_util.h"
+
+#include "libbb.h"
+
struct _opkg_t
{
args_t *args;
@@ -43,19 +49,19 @@
pkg_t *pkg;
int r, err = 0;
- all = pkg_vec_alloc();
- pkg_hash_fetch_available(&conf->pkg_hash, all);
+ all = pkg_vec_alloc ();
+ pkg_hash_fetch_available (&conf->pkg_hash, all);
for (i = 0; i < all->len; i++)
{
pkg = all->pkgs[i];
- if (pkg_name && fnmatch(pkg_name, pkg->name, 0))
+ if (pkg_name && fnmatch (pkg_name, pkg->name, 0))
continue;
if (pkg->state_status == SS_UNPACKED)
{
- r = opkg_configure(conf, pkg);
+ r = opkg_configure (conf, pkg);
if (r == 0)
{
pkg->state_status = SS_INSTALLED;
@@ -70,7 +76,7 @@
}
}
- pkg_vec_free(all);
+ pkg_vec_free (all);
return err;
}
@@ -111,7 +117,7 @@
*/
while (options[i]->name)
{
- if (strcmp(options[i]->name, option) != 0)
+ if (strcmp (options[i]->name, option) != 0)
{
i++;
continue;
@@ -121,18 +127,18 @@
/* get the option */
switch (options[i]->type)
{
- case OPKG_OPT_TYPE_BOOL:
- *((int *) value) = *((int *) options[i]->value);
- return;
+ case OPKG_OPT_TYPE_BOOL:
+ *((int *) value) = *((int *) options[i]->value);
+ return;
- case OPKG_OPT_TYPE_INT:
- *((int *) value) = *((int *) options[i]->value);
- return;
+ case OPKG_OPT_TYPE_INT:
+ *((int *) value) = *((int *) options[i]->value);
+ return;
- case OPKG_OPT_TYPE_STRING:
- *((char **)value) = strdup (options[i]->value);
- return;
- }
+ case OPKG_OPT_TYPE_STRING:
+ *((char **)value) = strdup (options[i]->value);
+ return;
+ }
}
@@ -151,7 +157,7 @@
*/
while (options[i]->name)
{
- if (strcmp(options[i]->name, option) != 0)
+ if (strcmp (options[i]->name, option) != 0)
{
i++;
continue;
@@ -161,21 +167,21 @@
/* set the option */
switch (options[i]->type)
{
- case OPKG_OPT_TYPE_BOOL:
- if (*((int *) value) == 0)
- *((int *)options[i]->value) = 0;
- else
- *((int *)options[i]->value) = 1;
- return;
+ case OPKG_OPT_TYPE_BOOL:
+ if (*((int *) value) == 0)
+ *((int *)options[i]->value) = 0;
+ else
+ *((int *)options[i]->value) = 1;
+ return;
- case OPKG_OPT_TYPE_INT:
- *((int *) options[i]->value) = *((int *) value);
- return;
+ case OPKG_OPT_TYPE_INT:
+ *((int *) options[i]->value) = *((int *) value);
+ return;
- case OPKG_OPT_TYPE_STRING:
- *((char **)options[i]->value) = strdup(value);
- return;
- }
+ case OPKG_OPT_TYPE_STRING:
+ *((char **)options[i]->value) = strdup (value);
+ return;
+ }
}
@@ -184,7 +190,7 @@
{
int err;
- pkg_info_preinstall_check(opkg->conf);
+ pkg_info_preinstall_check (opkg->conf);
if (opkg->conf->multiple_providers)
{
@@ -227,5 +233,140 @@
int
opkg_update_package_lists (opkg_t *opkg)
{
- return 1;
+ char *tmp;
+ int err;
+ char *lists_dir;
+ pkg_src_list_elt_t *iter;
+ pkg_src_t *src;
+
+
+ sprintf_alloc (&lists_dir, "%s",
+ (opkg->conf->restrict_to_default_dest)
+ ? opkg->conf->default_dest->lists_dir
+ : opkg->conf->lists_dir);
+
+ if (!file_is_dir (lists_dir))
+ {
+ if (file_exists (lists_dir))
+ {
+ /* XXX: Error: file exists but is not a directory */
+ free (lists_dir);
+ return 1;
+ }
+
+ err = file_mkdir_hier (lists_dir, 0755);
+ if (err)
+ {
+ /* XXX: Error: failed to create directory */
+ free (lists_dir);
+ return 1;
+ }
+ }
+
+ tmp = strdup ("/tmp/opkg.XXXXXX");
+
+ if (mkdtemp (tmp) == NULL)
+ {
+ /* XXX: Error: could not create temporary file name */
+ free (lists_dir);
+ free (tmp);
+ return 1;
+ }
+
+
+ for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
+ {
+ char *url, *list_file_name;
+
+ src = iter->data;
+
+ if (src->extra_data) /* debian style? */
+ sprintf_alloc (&url, "%s/%s/%s", src->value, src->extra_data,
+ src->gzip ? "Packages.gz" : "Packages");
+ else
+ sprintf_alloc (&url, "%s/%s", src->value, src->gzip ? "Packages.gz" :
"Packages");
+
+ sprintf_alloc (&list_file_name, "%s/%s", lists_dir, src->name);
+ if (src->gzip)
+ {
+ char *tmp_file_name;
+ FILE *in, *out;
+
+ sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
+
+ /* XXX: Note: downloading url */
+ err = opkg_download (opkg->conf, url, tmp_file_name);
+
+ if (err == 0)
+ {
+ /* XXX: Note: Inflating downloaded file */
+ in = fopen (tmp_file_name, "r");
+ out = fopen (list_file_name, "w");
+ if (in && out)
+ unzip (in, out);
+ else
+ err = 1;
+ if (in)
+ fclose (in);
+ if (out)
+ fclose (out);
+ unlink (tmp_file_name);
+ }
+ }
+ else
+ err = opkg_download (opkg->conf, url, list_file_name);
+
+ if (err)
+ {
+ /* XXX: Error: download error */
+ }
+ free (url);
+
+#ifdef HAVE_GPGME
+ /* download detached signitures to verify the package lists */
+ /* get the url for the sig file */
+ if (src->extra_data) /* debian style? */
+ sprintf_alloc (&url, "%s/%s/%s", src->value, src->extra_data,
+ "Packages.sig");
+ else
+ sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
+
+ /* create temporary file for it */
+ char *tmp_file_name;
+
+ sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
+
+ err = opkg_download (opkg->conf, url, tmp_file_name);
+ if (err)
+ {
+ /* XXX: Warning: Download failed */
+ }
+ else
+ {
+ int err;
+ err = opkg_verify_file (opkg->conf, list_file_name, tmp_file_name);
+ if (err == 0)
+ {
+ /* XXX: Notice: Signature check passed */
+ }
+ else
+ {
+ /* XXX: Warning: Signature check failed */
+ }
+ }
+ unlink (tmp_file_name);
+ free (tmp_file_name);
+ free (url);
+#else
+ /* XXX: Note: Signiture check for %s skipped because GPG support was not
+ * enabled in this build
+ */
+#endif
+ free (list_file_name);
+ }
+ rmdir (tmp);
+ free (tmp);
+ free (lists_dir);
+
+ return 0;
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-17 13:14:37 +0200 (Thu, 17 Apr 2008)
New Revision: 4372
Added:
trunk/src/target/opkg/tests/libopkg_test.c
Modified:
trunk/src/target/opkg/tests/Makefile.am
Log:
opkg: add libopkg test application
Modified: trunk/src/target/opkg/tests/Makefile.am
===================================================================
--- trunk/src/target/opkg/tests/Makefile.am 2008-04-17 10:56:46 UTC (rev
4371)
+++ trunk/src/target/opkg/tests/Makefile.am 2008-04-17 11:14:37 UTC (rev
4372)
@@ -1,12 +1,17 @@
-noinst_PROGRAMS = opkg_hash_test opkg_extract_test
+#noinst_PROGRAMS = opkg_hash_test opkg_extract_test
+noinst_PROGRAMS = libopkg_test
-opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la
$(top_builddir)/libopkg/libopkg.la
-opkg_hash_test_SOURCES = opkg_hash_test.c
-opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
+#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la
$(top_builddir)/libopkg/libopkg.la
+#opkg_hash_test_SOURCES = opkg_hash_test.c
+#opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
-opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la
$(top_builddir)/libopkg/libopkg.la
-opkg_extract_test_SOURCES = opkg_extract_test.c
-opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
+#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la
$(top_builddir)/libopkg/libopkg.la
+#opkg_extract_test_SOURCES = opkg_extract_test.c
+#opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
+libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la
+libopkg_test_SOURCE = libopkg_test.c
+libopkg_test_CFLAGS = $(ALL_CFLAGS)
+
Added: trunk/src/target/opkg/tests/libopkg_test.c
===================================================================
--- trunk/src/target/opkg/tests/libopkg_test.c 2008-04-17 10:56:46 UTC (rev
4371)
+++ trunk/src/target/opkg/tests/libopkg_test.c 2008-04-17 11:14:37 UTC (rev
4372)
@@ -0,0 +1,15 @@
+#include <opkg.h>
+
+
+int
+main (int argc, char **argv)
+{
+ opkg_t *opkg;
+
+ opkg = opkg_new ();
+
+ opkg_set_option (opkg, "offline_root", "/tmp/");
+
+
+ opkg_free (opkg);
+}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-17 16:51:25 +0200 (Thu, 17 Apr 2008)
New Revision: 4373
Modified:
trunk/src/target/opkg/libopkg/opkg.c
Log:
opkg: fix option array handling
Modified: trunk/src/target/opkg/libopkg/opkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.c 2008-04-17 11:14:37 UTC (rev
4372)
+++ trunk/src/target/opkg/libopkg/opkg.c 2008-04-17 14:51:25 UTC (rev
4373)
@@ -35,7 +35,7 @@
{
args_t *args;
opkg_conf_t *conf;
- opkg_option_t *options[];
+ opkg_option_t *options;
};
/** Private Functions ***/
@@ -89,9 +89,14 @@
{
opkg_t *opkg;
opkg = malloc (sizeof (opkg_t));
+
+ opkg->args = malloc (sizeof (args_t));
args_init (opkg->args);
+
+ opkg->conf = malloc (sizeof (opkg_conf_t));
opkg_conf_init (opkg->conf, opkg->args);
- opkg_init_options_array (opkg->conf, opkg->options);
+
+ opkg_init_options_array (opkg->conf, &opkg->options);
return opkg;
}
@@ -106,7 +111,7 @@
opkg_get_option (opkg_t *opkg, char *option, void **value)
{
int i = 0;
- opkg_option_t **options = opkg->options;
+ opkg_option_t *options = opkg->options;
/* can't store a value in a NULL pointer! */
if (!value)
@@ -115,9 +120,9 @@
/* look up the option
* TODO: this would be much better as a hash table
*/
- while (options[i]->name)
+ while (options[i].name)
{
- if (strcmp (options[i]->name, option) != 0)
+ if (strcmp (options[i].name, option) != 0)
{
i++;
continue;
@@ -125,18 +130,18 @@
}
/* get the option */
- switch (options[i]->type)
+ switch (options[i].type)
{
case OPKG_OPT_TYPE_BOOL:
- *((int *) value) = *((int *) options[i]->value);
+ *((int *) value) = *((int *) options[i].value);
return;
case OPKG_OPT_TYPE_INT:
- *((int *) value) = *((int *) options[i]->value);
+ *((int *) value) = *((int *) options[i].value);
return;
case OPKG_OPT_TYPE_STRING:
- *((char **)value) = strdup (options[i]->value);
+ *((char **)value) = strdup (options[i].value);
return;
}
@@ -146,7 +151,7 @@
opkg_set_option (opkg_t *opkg, char *option, void *value)
{
int i = 0;
- opkg_option_t **options = opkg->options;
+ opkg_option_t *options = opkg->options;
/* NULL values are not defined */
if (!value)
@@ -155,31 +160,31 @@
/* look up the option
* TODO: this would be much better as a hash table
*/
- while (options[i]->name)
+ while (options[i].name)
{
- if (strcmp (options[i]->name, option) != 0)
+ if (strcmp (options[i].name, option) == 0)
{
- i++;
- continue;
+ break;
}
+ i++;
}
/* set the option */
- switch (options[i]->type)
+ switch (options[i].type)
{
case OPKG_OPT_TYPE_BOOL:
if (*((int *) value) == 0)
- *((int *)options[i]->value) = 0;
+ *((int *)options[i].value) = 0;
else
- *((int *)options[i]->value) = 1;
+ *((int *)options[i].value) = 1;
return;
case OPKG_OPT_TYPE_INT:
- *((int *) options[i]->value) = *((int *) value);
+ *((int *) options[i].value) = *((int *) value);
return;
case OPKG_OPT_TYPE_STRING:
- *((char **)options[i]->value) = strdup (value);
+ *((char **)options[i].value) = strdup (value);
return;
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-17 17:09:46 +0200 (Thu, 17 Apr 2008)
New Revision: 4374
Modified:
trunk/src/target/opkg/libopkg/Makefile.am
trunk/src/target/opkg/libopkg/opkg.c
Log:
opkg: fix header include path issues
Modified: trunk/src/target/opkg/libopkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/libopkg/Makefile.am 2008-04-17 14:51:25 UTC (rev
4373)
+++ trunk/src/target/opkg/libopkg/Makefile.am 2008-04-17 15:09:46 UTC (rev
4374)
@@ -1,5 +1,5 @@
-ALL_CFLAGS=-g -O -Wall -Werror -DHOST_CPU_STR=\"@[EMAIL PROTECTED]" [EMAIL
PROTECTED]@ -DLIBDIR=\"@[EMAIL PROTECTED]" -DOPKGLIBDIR=\"@[EMAIL PROTECTED]"
-DDATADIR=\"@[EMAIL PROTECTED]" -I$(top_srcdir)/libbb
+ALL_CFLAGS=-g -O -Wall -Werror -DHOST_CPU_STR=\"@[EMAIL PROTECTED]" [EMAIL
PROTECTED]@ -DLIBDIR=\"@[EMAIL PROTECTED]" -DOPKGLIBDIR=\"@[EMAIL PROTECTED]"
-DDATADIR=\"@[EMAIL PROTECTED]" -I$(top_srcdir)
libopkg_includedir=$(includedir)/libopkg
Modified: trunk/src/target/opkg/libopkg/opkg.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg.c 2008-04-17 14:51:25 UTC (rev
4373)
+++ trunk/src/target/opkg/libopkg/opkg.c 2008-04-17 15:09:46 UTC (rev
4374)
@@ -29,7 +29,7 @@
#include "sprintf_alloc.h"
#include "file_util.h"
-#include "libbb.h"
+#include <libbb/libbb.h>
struct _opkg_t
{
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
