From 5aa97e35dec1783c98d0f28502b2d16879ffc8ee Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 16 Feb 2017 17:36:47 +0100 Subject: 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 --- package/system/opkg/patches/110-upgrade.patch | 50 --------------------------- 1 file changed, 50 deletions(-) delete mode 100644 package/system/opkg/patches/110-upgrade.patch (limited to 'package/system/opkg/patches/110-upgrade.patch') diff --git a/package/system/opkg/patches/110-upgrade.patch b/package/system/opkg/patches/110-upgrade.patch deleted file mode 100644 index 61f454ae1c..0000000000 --- a/package/system/opkg/patches/110-upgrade.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/libopkg/opkg_install.c -+++ b/libopkg/opkg_install.c -@@ -1405,9 +1405,11 @@ opkg_install_pkg(pkg_t *pkg, int from_up - opkg_state_changed++; - pkg->state_flag |= SF_FILELIST_CHANGED; - -- if (old_pkg) -+ if (old_pkg) { - pkg_remove_orphan_dependent(pkg, old_pkg); -- -+ old_pkg->is_upgrade = 1; -+ pkg->is_upgrade = 1; -+ } - /* XXX: BUG: we really should treat replacement more like an upgrade - * Instead, we're going to remove the replacees - */ -@@ -1466,7 +1468,7 @@ opkg_install_pkg(pkg_t *pkg, int from_up - } - - -- opkg_msg(INFO, "Installing maintainer scripts.\n"); -+ opkg_msg(INFO, "%s maintainer scripts.\n", (pkg->is_upgrade) ? ("Upgrading") : ("Installing")); - if (install_maintainer_scripts(pkg, old_pkg)) { - opkg_msg(ERROR, "Failed to extract maintainer scripts for %s." - " Package debris may remain!\n", ---- a/libopkg/pkg.c -+++ b/libopkg/pkg.c -@@ -1285,6 +1285,12 @@ pkg_run_script(pkg_t *pkg, const char *s - setenv("PKG_ROOT", - pkg->dest ? pkg->dest->root_dir : conf->default_dest->root_dir, 1); - -+ if (pkg->is_upgrade) -+ setenv("PKG_UPGRADE", "1", 1); -+ else -+ setenv("PKG_UPGRADE", "0", 1); -+ -+ - if (! file_exists(path)) { - free(path); - return 0; ---- a/libopkg/pkg.h -+++ b/libopkg/pkg.h -@@ -184,6 +184,7 @@ struct pkg - /* this flag specifies whether the package was installed to satisfy another - * package's dependancies */ - int auto_installed; -+ int is_upgrade; - }; - - pkg_t *pkg_new(void); -- cgit v1.2.3