diff options
author | Jo-Philipp Wich <jo@mein.io> | 2017-02-16 17:36:47 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2017-04-08 14:31:27 +0200 |
commit | 5aa97e35dec1783c98d0f28502b2d16879ffc8ee (patch) | |
tree | 3bcf69f7cbc2c6b7574e8b4ce8de9dc41331e470 /package/system/opkg/patches/290-clarify-download-errors.patch | |
parent | 7099bb19b50d74d3a400aa3a60e0b7ba0157bc1e (diff) | |
download | mtk-20170518-5aa97e35dec1783c98d0f28502b2d16879ffc8ee.zip mtk-20170518-5aa97e35dec1783c98d0f28502b2d16879ffc8ee.tar.gz mtk-20170518-5aa97e35dec1783c98d0f28502b2d16879ffc8ee.tar.bz2 |
opkg: switch to LEDE fork (#120, #551, #571)
Cherry-pick the following commits from master to bump opkg in LEDE 17.01:
b65dc04712 opkg: switch to own fork to improve memory usage
55ffc38004 opkg: re-enable usign support
19720a6f03 opkg: fix handling conffiles in status lists
9e4555f58d opkg: fix stray printf() (#551)
ebf846b005 opkg: mark as essential (FS#571)
aedd5d5cb0 opkg: fix several package installation bugs
48ae44d033 opkg: gracefully handle missing $PATH, fix build warnings
1449b52f02 opkg: backport upstream fixes, code cleanups
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.patch | 61 |
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 5512f67..0000000 --- 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; - } |