libopkg: remove support for "dist" config

The "dist" config option is legacy to imitate Debians repository
structure. However this is never used within the OpenWrt ecosystem and
can therefore be removed.

Signed-off-by: Paul Spooren <mail@aparcar.org>

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 38703ee587abed2b2ae4494a28eba3b942d04092..ee151f574f3f09dc68fb705c8b1fb6564a130985 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -184,8 +184,7 @@ static int opkg_conf_set_option(const char *name, const char *value)
 
 static int
 opkg_conf_parse_file(const char *filename,
-                    pkg_src_list_t * pkg_src_list,
-                    pkg_src_list_t * dist_src_list)
+                    pkg_src_list_t * pkg_src_list)
 {
        int line_num = 0;
        int err = 0;
@@ -291,26 +290,6 @@ opkg_conf_parse_file(const char *filename,
                           tmp_src_nv_pair_list for sake of symmetry.) */
                        if (strcmp(type, "option") == 0) {
                                opkg_conf_set_option(name, value);
-                       } else if (strcmp(type, "dist") == 0) {
-                               if (!nv_pair_list_find
-                                   ((nv_pair_list_t *) dist_src_list, name)) {
-                                       pkg_src_list_append(dist_src_list, name,
-                                                           value, extra, 0);
-                               } else {
-                                       opkg_msg(ERROR,
-                                                "Duplicate dist declaration (%s %s). "
-                                                "Skipping.\n", name, value);
-                               }
-                       } else if (strcmp(type, "dist/gz") == 0) {
-                               if (!nv_pair_list_find
-                                   ((nv_pair_list_t *) dist_src_list, name)) {
-                                       pkg_src_list_append(dist_src_list, name,
-                                                           value, extra, 1);
-                               } else {
-                                       opkg_msg(ERROR,
-                                                "Duplicate dist declaration (%s %s). "
-                                                "Skipping.\n", name, value);
-                               }
                        } else if (strcmp(type, "src") == 0) {
                                if (!nv_pair_list_find
                                    ((nv_pair_list_t *) pkg_src_list, name)) {
@@ -458,7 +437,6 @@ static int glob_errfunc(const char *epath, int eerrno)
 int opkg_conf_init(void)
 {
        pkg_src_list_init(&conf->pkg_src_list);
-       pkg_src_list_init(&conf->dist_src_list);
        pkg_dest_list_init(&conf->pkg_dest_list);
        pkg_dest_list_init(&conf->tmp_dest_list);
        nv_pair_list_init(&conf->arch_list);
@@ -486,8 +464,7 @@ int opkg_conf_load(void)
                        goto err0;
                }
                if (opkg_conf_parse_file(conf->conf_file,
-                                        &conf->pkg_src_list,
-                                        &conf->dist_src_list))
+                                        &conf->pkg_src_list))
                        goto err1;
        }
 
@@ -518,8 +495,7 @@ int opkg_conf_load(void)
                            !strcmp(conf->conf_file, globbuf.gl_pathv[i]))
                                continue;
                if (opkg_conf_parse_file(globbuf.gl_pathv[i],
-                                        &conf->pkg_src_list,
-                                        &conf->dist_src_list) < 0) {
+                                        &conf->pkg_src_list) < 0) {
                        globfree(&globbuf);
                        goto err1;
                }
@@ -629,7 +605,6 @@ err2:
        }
 err1:
        pkg_src_list_deinit(&conf->pkg_src_list);
-       pkg_src_list_deinit(&conf->dist_src_list);
        pkg_dest_list_deinit(&conf->pkg_dest_list);
        nv_pair_list_deinit(&conf->arch_list);
 
@@ -670,7 +645,6 @@ void opkg_conf_deinit(void)
                free(conf->conf_file);
 
        pkg_src_list_deinit(&conf->pkg_src_list);
-       pkg_src_list_deinit(&conf->dist_src_list);
        pkg_dest_list_deinit(&conf->pkg_dest_list);
        nv_pair_list_deinit(&conf->arch_list);
 

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index 91190b37d3fd319e20334ad37ee119a614b8b198..d38fd735905bf034d29b3c83a07688f897d3f2e2 100644 (file)
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -45,7 +45,6 @@ extern opkg_conf_t *conf;
 
 struct opkg_conf {
        pkg_src_list_t pkg_src_list;
-       pkg_src_list_t dist_src_list;
        pkg_dest_list_t pkg_dest_list;
        pkg_dest_list_t tmp_dest_list;
        nv_pair_list_t arch_list;

diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c
index 6b408729d8553020082999b6a1eea935b892944b..879c0ec0e693a62ce507c303f6c1fa2249895a23 100644 (file)
--- a/libopkg/pkg_hash.c
+++ b/libopkg/pkg_hash.c
@@ -69,31 +69,6 @@ void pkg_hash_deinit(void)
        hash_table_deinit(&conf->pkg_hash);
 }
 
-int dist_hash_add_from_file(const char *lists_dir, pkg_src_t * dist)
-{
-       nv_pair_list_elt_t *l;
-       char *list_file, *subname;
-
-       list_for_each_entry(l, &conf->arch_list.head, node) {
-               nv_pair_t *nv = (nv_pair_t *) l->data;
-               sprintf_alloc(&subname, "%s-%s", dist->name, nv->name);
-               sprintf_alloc(&list_file, "%s/%s", lists_dir, subname);
-
-               if (file_exists(list_file)) {
-                       if (pkg_hash_add_from_file(list_file, dist, NULL, 0, 0, NULL, NULL)) {
-                               free(list_file);
-                               return -1;
-                       }
-                       pkg_src_list_append(&conf->pkg_src_list, subname,
-                                           dist->value, "__dummy__", 0);
-               }
-
-               free(list_file);
-       }
-
-       return 0;
-}
-
 int
 pkg_hash_add_from_file(const char *file_name,
                       pkg_src_t * src, pkg_dest_t * dest, int is_status_file, int state_flags,

diff --git a/libopkg/pkg_hash.h b/libopkg/pkg_hash.h
index e5ab2e0974fe1ac59576eecab0f3bb9dfcaa29af..b10c878207f6de225170a030b562f72ce1c0c251 100644 (file)
--- a/libopkg/pkg_hash.h
+++ b/libopkg/pkg_hash.h
@@ -28,7 +28,6 @@ void pkg_hash_deinit(void);
 
 void pkg_hash_fetch_available(pkg_vec_t * available);
 
-int dist_hash_add_from_file(const char *file_name, pkg_src_t * dist);
 int pkg_hash_add_from_file(const char *file_name, pkg_src_t * src,
                           pkg_dest_t * dest, int is_status_file, int state_flags,
                           void (*cb)(pkg_t *, void *), void *priv);