printf ("opkg: file %s: line %d (%s): Assertation '%s' failed",\
__FILE__, __LINE__, __PRETTY_FUNCTION__, # expr); abort (); }
-#define progress(percent) if (progress_callback) progress_callback (opkg, percent, user_data);
+#define progress(d, p) d.percentage = p; if (progress_callback) progress_callback (opkg, &d, user_data);
+#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);
+ if (old->src)
+ 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)
struct _curl_cb_data
{
opkg_progress_callback_t cb;
+ opkg_progress_data_t *progress_data;
opkg_t *opkg;
void *user_data;
int start_range;
{
int p = (t) ? d * 100 / t : 0;
static int prev = -1;
+ int progress = 0;
/* prevent the same value being sent twice (can occur due to rounding) */
if (p == prev)
if (t < 1)
return 0;
+ progress = cb_data->start_range + (d / t * ((cb_data->finish_range - cb_data->start_range)));
+ cb_data->progress_data->percentage = progress;
+
(cb_data->cb)(cb_data->opkg,
- cb_data->start_range + (d / t * ((cb_data->finish_range - cb_data->start_range))),
+ cb_data->progress_data,
cb_data->user_data);
return 0;
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, 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->installed = (installed != 0);
-
- return package;
-}
-
void
opkg_package_free (opkg_package_t *p)
{
free (p->architecture);
free (p->description);
free (p->tags);
+ free (p->url);
+ free (p->repository);
free (p);
}
opkg_conf_deinit (opkg->conf);
args_deinit (opkg->args);
+ free (opkg->options);
+ free (opkg->args);
+ free (opkg->conf);
+ free (opkg);
}
int
-opkg_read_config_files (opkg_t *opkg)
+opkg_re_read_config_files (opkg_t *opkg)
{
args_t *a;
opkg_conf_t *c;
a->nodeps = c->nodeps;
a->noaction = c->noaction;
a->query_all = c->query_all;
- a->multiple_providers = c->multiple_providers;
a->verbosity = c->verbosity;
if (c->offline_root)
opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
{
int err;
- char *package_id = NULL;
+ char *stripped_filename;
+ opkg_progress_data_t pdata;
+ pkg_t *old, *new;
+ pkg_vec_t *deps, *all;
+ int i, ndepends;
+ char **unresolved = NULL;
opkg_assert (opkg != NULL);
opkg_assert (package_name != NULL);
- progress (0);
+ /* ... */
+ pkg_info_preinstall_check (opkg->conf);
- /* download the package */
- opkg_prepare_url_for_install (opkg->conf, package_name, &package_id);
- progress (50);
+ /* check to ensure package is not already installed */
+ old = pkg_hash_fetch_installed_by_name(&opkg->conf->pkg_hash, package_name);
+ if (old)
+ {
+ /* XXX: Error: Package is already installed. */
+ return OPKG_PACKAGE_ALREADY_INSTALLED;
+ }
- /* ... */
- pkg_info_preinstall_check (opkg->conf);
+ new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, package_name);
+ if (!new)
+ {
+ /* XXX: Error: Could not find package to install */
+ return OPKG_PACKAGE_NOT_FOUND;
+ }
- if (!package_id)
- package_id = strdup (package_name);
+ new->state_flag |= SF_USER;
- /* unpack the package */
- if (opkg->conf->multiple_providers)
+ pdata.action = OPKG_INSTALL;
+ pdata.package = old_pkg_to_new (new);
+
+ progress (pdata, 0);
+
+ /* find dependancies and download them */
+ deps = pkg_vec_alloc ();
+ /* this function does not return the original package, so we insert it later */
+ ndepends = pkg_hash_fetch_unsatisfied_dependencies (opkg->conf, new, deps, &unresolved);
+ if (unresolved)
{
- err = opkg_install_multi_by_name (opkg->conf, package_id);
+ /* XXX: Error: Could not satisfy dependencies */
+ pkg_vec_free (deps);
+ return OPKG_DEPENDENCIES_FAILED;
}
- else
+
+ /* insert the package we are installing so that we download it */
+ pkg_vec_insert (deps, new);
+
+ /* download package and dependancies */
+ for (i = 0; i < deps->len; i++)
+ {
+ pkg_t *pkg;
+ struct _curl_cb_data cb_data;
+ char *url;
+
+ pkg = deps->pkgs[i];
+ if (pkg->local_filename)
+ continue;
+
+ opkg_package_free (pdata.package);
+ pdata.package = old_pkg_to_new (pkg);
+ pdata.action = OPKG_DOWNLOAD;
+
+ if (pkg->src == NULL)
+ {
+ /* XXX: Error: Package not available from any configured src */
+ return OPKG_PACKAGE_NOT_AVAILABLE;
+ }
+
+ sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
+
+ /* Get the filename part, without any directory */
+ stripped_filename = strrchr(pkg->filename, '/');
+ if ( ! stripped_filename )
+ stripped_filename = pkg->filename;
+
+ sprintf_alloc(&pkg->local_filename, "%s/%s", opkg->conf->tmp_dir, stripped_filename);
+
+ cb_data.cb = progress_callback;
+ cb_data.progress_data = &pdata;
+ cb_data.opkg = opkg;
+ cb_data.user_data = user_data;
+ /* 75% of "install" progress is for downloading */
+ cb_data.start_range = 75 * i / deps->len;
+ cb_data.finish_range = 75 * (i + 1) / deps->len;
+
+ err = opkg_download(opkg->conf, url, pkg->local_filename,
+ (curl_progress_func) curl_progress_cb, &cb_data);
+ free(url);
+
+ if (err)
+ {
+ pkg_vec_free (deps);
+ opkg_package_free (pdata.package);
+ return OPKG_DOWNLOAD_FAILED;
+ }
+
+ }
+ pkg_vec_free (deps);
+
+ /* clear depenacy checked marks, left by pkg_hash_fetch_unsatisfied_dependencies */
+ all = pkg_vec_alloc ();
+ pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+ for (i = 0; i < all->len; i++)
{
- err = opkg_install_by_name (opkg->conf, package_id);
+ all->pkgs[i]->parent->dependencies_checked = 0;
}
+ pkg_vec_free (all);
+
+
+ /* 75% of "install" progress is for downloading */
+ opkg_package_free (pdata.package);
+ pdata.package = old_pkg_to_new (new);
+ pdata.action = OPKG_INSTALL;
+ progress (pdata, 75);
+
+ /* unpack the package */
+ err = opkg_install_pkg(opkg->conf, new, 0);
if (err)
- return err;
+ {
+ opkg_package_free (pdata.package);
+ switch (err)
+ {
+ case PKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR;
+ case PKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED;
+ case PKG_INSTALL_ERR_DEPENDENCIES:
+ case PKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED;
+ case PKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
+ case PKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
+ case PKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
+ default: return OPKG_UNKNOWN_ERROR;
+ }
+ }
- progress (75);
+ progress (pdata, 75);
/* run configure scripts, etc. */
err = opkg_configure_packages (opkg->conf, NULL);
if (err)
- return err;
+ {
+ opkg_package_free (pdata.package);
+ return OPKG_UNKNOWN_ERROR;
+ }
/* write out status files and file lists */
opkg_conf_write_status_files (opkg->conf);
pkg_write_changed_filelists (opkg->conf);
- progress (100);
+ progress (pdata, 100);
+ opkg_package_free (pdata.package);
return 0;
}
int
opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
{
+ int err;
pkg_t *pkg = NULL;
pkg_t *pkg_to_remove;
+ opkg_progress_data_t pdata;
opkg_assert (opkg != NULL);
opkg_assert (package_name != NULL);
- progress (0);
-
pkg_info_preinstall_check (opkg->conf);
- pkg_vec_t *installed_pkgs = pkg_vec_alloc ();
-
- pkg_hash_fetch_all_installed (&opkg->conf->pkg_hash, installed_pkgs);
-
- progress (25);
-
pkg = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash, package_name);
if (pkg == NULL)
{
/* XXX: Error: Package not installed. */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
+ pdata.action = OPKG_REMOVE;
+ pdata.package = old_pkg_to_new (pkg);
+ progress (pdata, 0);
+
+
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 (75);
+ progress (pdata, 25);
if (opkg->conf->restrict_to_default_dest)
{
}
- progress (75);
+ progress (pdata, 75);
- opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
+ err = opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
/* write out status files and file lists */
opkg_conf_write_status_files (opkg->conf);
pkg_write_changed_filelists (opkg->conf);
- progress (100);
- return 0;
+ progress (pdata, 100);
+ opkg_package_free (pdata.package);
+ return (err) ? OPKG_UNKNOWN_ERROR : OPKG_NO_ERROR;
}
int
opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
{
+ int err;
pkg_t *pkg;
+ opkg_progress_data_t pdata;
+
+
opkg_assert (opkg != NULL);
opkg_assert (package_name != NULL);
- progress (0);
-
pkg_info_preinstall_check (opkg->conf);
if (opkg->conf->restrict_to_default_dest)
if (pkg == NULL)
{
/* XXX: Error: Package not installed in default_dest */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
}
else
if (!pkg)
{
/* XXX: Error: Package not installed */
- return 1;
+ return OPKG_PACKAGE_NOT_INSTALLED;
}
- progress (25);
+ pdata.action = OPKG_INSTALL;
+ pdata.package = old_pkg_to_new (pkg);
+ progress (pdata, 0);
- opkg_upgrade_pkg (opkg->conf, pkg);
- progress (75);
+ err = opkg_upgrade_pkg (opkg->conf, pkg);
+ if (err)
+ return OPKG_UNKNOWN_ERROR;
+ progress (pdata, 75);
- opkg_configure_packages (opkg->conf, NULL);
- progress (100);
+ err = opkg_configure_packages (opkg->conf, NULL);
+ if (err)
+ return OPKG_UNKNOWN_ERROR;
+ progress (pdata, 100);
+ opkg_package_free (pdata.package);
return 0;
}
int err = 0;
int i;
pkg_t *pkg;
+ opkg_progress_data_t pdata;
+
+ pdata.action = OPKG_INSTALL;
+ pdata.package = NULL;
opkg_assert (opkg != NULL);
- progress (0);
+ progress (pdata, 0);
installed = pkg_vec_alloc ();
pkg_info_preinstall_check (opkg->conf);
for (i = 0; i < installed->len; i++)
{
pkg = installed->pkgs[i];
+
+ pdata.package = old_pkg_to_new (pkg);
+ progress (pdata, 99 * i / installed->len);
+ opkg_package_free (pdata.package);
+
err += opkg_upgrade_pkg (opkg->conf, pkg);
- progress (100 * i / installed->len);
}
pkg_vec_free (installed);
if (err)
return 1;
- progress (100);
+ pdata.package = NULL;
+ progress (pdata, 100);
return 0;
}
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;
int sources_list_count, sources_done;
+ opkg_progress_data_t pdata;
opkg_assert (opkg != NULL);
- progress (0);
+ pdata.action = OPKG_DOWNLOAD;
+ pdata.package = NULL;
+ progress (pdata, 0);
sprintf_alloc (&lists_dir, "%s",
(opkg->conf->restrict_to_default_dest)
return 1;
}
- /* cout the number of sources so we can give some progress updates */
+ /* count the number of sources so we can give some progress updates */
sources_list_count = 0;
sources_done = 0;
iter = opkg->conf->pkg_src_list.head;
for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
{
- char *url, *list_file_name;
+ char *url, *list_file_name = NULL, *sig_file_name = NULL;
src = iter->data;
sprintf_alloc (&list_file_name, "%s/%s", lists_dir, src->name);
if (src->gzip)
{
- char *tmp_file_name;
FILE *in, *out;
struct _curl_cb_data cb_data;
+ char *tmp_file_name = NULL;
sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
/* XXX: Note: downloading url */
cb_data.cb = progress_callback;
+ cb_data.progress_data = &pdata;
cb_data.opkg = opkg;
cb_data.user_data = user_data;
cb_data.start_range = 100 * sources_done / sources_list_count;
fclose (out);
unlink (tmp_file_name);
}
+ free (tmp_file_name);
}
else
err = opkg_download (opkg->conf, url, list_file_name, NULL, NULL);
if (err)
{
/* XXX: Error: download error */
+ result = OPKG_DOWNLOAD_FAILED;
}
free (url);
else
sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
- /* create temporary file for it */
- char *tmp_file_name;
+ /* create filename for signature */
+ sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
- sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
+ /* make sure there is no existing signature file */
+ unlink (sig_file_name);
- err = opkg_download (opkg->conf, url, tmp_file_name, NULL, NULL);
+ err = opkg_download (opkg->conf, url, sig_file_name, NULL, NULL);
if (err)
{
/* XXX: Warning: Download failed */
else
{
int err;
- err = opkg_verify_file (opkg->conf, list_file_name, tmp_file_name);
+ err = opkg_verify_file (opkg->conf, list_file_name, sig_file_name);
if (err == 0)
{
/* XXX: Notice: Signature check passed */
/* XXX: Warning: Signature check failed */
}
}
- unlink (tmp_file_name);
- free (tmp_file_name);
+ free (sig_file_name);
+ free (list_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);
sources_done++;
- progress (100 * sources_done / sources_list_count);
+ progress (pdata, 100 * sources_done / sources_list_count);
}
rmdir (tmp);
free (tmp);
free (lists_dir);
- return 0;
+ /* Now re-read the package lists to update package hash tables. */
+ opkg_re_read_config_files (opkg);
+
+ return result;
}
pkg = all->pkgs[i];
- package = opkg_package_new_with_values (
- pkg->name,
- pkg->version,
- pkg->architecture,
- pkg->description,
- pkg->tags,
- (pkg->state_status == SS_INSTALLED));
-
+ package = old_pkg_to_new (pkg);
callback (opkg, package, user_data);
}
return 0;
}
+int
+opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
+{
+ pkg_vec_t *all;
+ int i;
+
+ opkg_assert (opkg);
+ opkg_assert (callback);
+
+ all = pkg_vec_alloc ();
+ pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+ for (i = 0; i < all->len; i++)
+ {
+ pkg_t *old, *new;
+ int cmp;
+ opkg_package_t *package;
+
+ old = all->pkgs[i];
+
+ if (old->state_status != SS_INSTALLED)
+ continue;
+
+ new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name);
+ if (new == NULL) {
+ /* XXX: Notice: Assuming locally install package is up to date */
+ continue;
+ }
+
+ cmp = pkg_compare_versions(old, new);
+
+ if (cmp < 0)
+ {
+ package = old_pkg_to_new (new);
+ callback (opkg, package, user_data);
+ }
+ }
+
+ pkg_vec_free (all);
+
+ 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;
+}
projects / oweals / opkg-lede.git / blobdiff