opkg: make .opk as the default opkg file extension

[oweals/opkg-lede.git] / libopkg / opkg_download.c

diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c
index 629aa798aa181f500b55fbc13127fd95efb987bf..a8f03e27f1b11244de336d4c01da849867cd8379 100644 (file)
--- a/libopkg/opkg_download.c
+++ b/libopkg/opkg_download.c
@@ -154,7 +154,7 @@ int opkg_download_pkg(opkg_conf_t *conf, pkg_t *pkg, const char *dir)
     sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
 
     /* XXX: BUG: The pkg->filename might be something like
     sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
 
     /* XXX: BUG: The pkg->filename might be something like

-       "../../foo.ipk". While this is correct, and exactly what we
+       "../../foo.opk". While this is correct, and exactly what we

        want to use to construct url above, here we actually need to
        use just the filename part, without any directory. */
 
        want to use to construct url above, here we actually need to
        use just the filename part, without any directory. */
 


@@ -202,6 +202,7 @@ int opkg_prepare_url_for_install(opkg_conf_t *conf, const char *url, char **name
          free(file_basec);
 
      } else if (strcmp(&url[strlen(url) - 4], OPKG_PKG_EXTENSION) == 0
          free(file_basec);
 
      } else if (strcmp(&url[strlen(url) - 4], OPKG_PKG_EXTENSION) == 0

+                || strcmp(&url[strlen(url) - 4], IPKG_PKG_EXTENSION) == 0

                || strcmp(&url[strlen(url) - 4], DPKG_PKG_EXTENSION) == 0) {
 
          err = pkg_init_from_file(pkg, url);
                || strcmp(&url[strlen(url) - 4], DPKG_PKG_EXTENSION) == 0) {
 
          err = pkg_init_from_file(pkg, url);