aboutsummaryrefslogtreecommitdiffstats
path: root/package/system/opkg/patches/290-clarify-download-errors.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2017-02-16 17:36:47 +0100
committerJo-Philipp Wich <jo@mein.io>2017-02-19 19:08:46 +0100
commitb65dc04712dfb8cc7bb9036c7c73b0cead6dd7c9 (patch)
tree6ebef4cc7d786698b57488d1d3d929dd7c398560 /package/system/opkg/patches/290-clarify-download-errors.patch
parent84ceca514841dd6d4705dc27d2104ee0aa18b9e1 (diff)
downloadupstream-b65dc04712dfb8cc7bb9036c7c73b0cead6dd7c9.tar.gz
upstream-b65dc04712dfb8cc7bb9036c7c73b0cead6dd7c9.tar.bz2
upstream-b65dc04712dfb8cc7bb9036c7c73b0cead6dd7c9.zip
opkg: switch to own fork to improve memory usage
Switch to our own fork of opkg to significantly reduce the required amount of memory when updating lists or installing packages. Preliminary tests showed a usage drop of about 90% during these operations, from ~3.7MB with unmodified opkg to ~360KB with our custom fork. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/system/opkg/patches/290-clarify-download-errors.patch')
-rw-r--r--package/system/opkg/patches/290-clarify-download-errors.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/package/system/opkg/patches/290-clarify-download-errors.patch b/package/system/opkg/patches/290-clarify-download-errors.patch
deleted file mode 100644
index 5512f675d8..0000000000
--- a/package/system/opkg/patches/290-clarify-download-errors.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/libopkg/opkg_cmd.c
-+++ b/libopkg/opkg_cmd.c
-@@ -85,6 +85,7 @@ opkg_update_cmd(int argc, char **argv)
- char *tmp;
- int err;
- int failures;
-+ int pkglist_dl_error;
- char *lists_dir;
- pkg_src_list_elt_t *iter;
- pkg_src_t *src;
-@@ -130,15 +131,19 @@ opkg_update_cmd(int argc, char **argv)
- sprintf_alloc(&url, "%s/%s", src->value, src->gzip ? "Packages.gz" : "Packages");
-
- sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
-+ pkglist_dl_error = 0;
- if (opkg_download(url, list_file_name, NULL, NULL, 0)) {
- failures++;
-+ pkglist_dl_error = 1;
-+ opkg_msg(NOTICE, "*** Failed to download the package list from %s\n\n",
-+ url);
- } else {
-- opkg_msg(NOTICE, "Updated list of available packages in %s.\n",
-+ opkg_msg(NOTICE, "Updated list of available packages in %s\n",
- list_file_name);
- }
- free(url);
- #if defined(HAVE_GPGME) || defined(HAVE_OPENSSL) || defined(HAVE_USIGN)
-- if (conf->check_signature) {
-+ if (pkglist_dl_error == 0 && conf->check_signature) {
- /* download detached signitures to verify the package lists */
- /* get the url for the sig file */
- if (src->extra_data) /* debian style? */
-@@ -156,7 +161,7 @@ opkg_update_cmd(int argc, char **argv)
- err = opkg_download(url, tmp_file_name, NULL, NULL, 0);
- if (err) {
- failures++;
-- opkg_msg(NOTICE, "Signature check failed.\n");
-+ opkg_msg(NOTICE, "Signature file download failed.\n");
- } else {
- err = opkg_verify_file (list_file_name, tmp_file_name);
- if (err == 0)
---- a/libopkg/opkg_download.c
-+++ b/libopkg/opkg_download.c
-@@ -91,7 +91,7 @@ opkg_download(const char *src, const cha
- char *src_base = basename(src_basec);
- char *tmp_file_location;
-
-- opkg_msg(NOTICE,"Downloading %s.\n", src);
-+ opkg_msg(NOTICE,"Downloading %s\n", src);
-
- if (str_starts_with(src, "file:")) {
- const char *file_src = src + 5;
-@@ -175,6 +175,8 @@ opkg_download(const char *src, const cha
-
- if (res) {
- opkg_msg(ERROR, "Failed to download %s, wget returned %d.\n", src, res);
-+ if (res == 4)
-+ opkg_msg(ERROR, "Check your network settings and connectivity.\n\n");
- free(tmp_file_location);
- return -1;
- }