|
|
@@ -0,0 +1,73 @@
|
|
|
+From a8555d352d2851ee1482b74b57ba9eacfb354c18 Mon Sep 17 00:00:00 2001
|
|
|
+From: Peter Urbanec <[email protected]>
|
|
|
+Date: Thu, 23 Oct 2014 01:05:35 +1100
|
|
|
+Subject: [PATCH] opkg_install: Call prerm and postrm scripts on package
|
|
|
+ upgrade
|
|
|
+
|
|
|
+When upgrading a package from v1 to v2, run "v1-prerm upgrade v2" and
|
|
|
+"v1-postrm upgrade v2", similarly to what dpkg does.
|
|
|
+
|
|
|
+This patch fixes issue 104.
|
|
|
+
|
|
|
+Signed-off-by: Peter Urbanec <[email protected]>
|
|
|
+Signed-off-by: Paul Barker <[email protected]>
|
|
|
+---
|
|
|
+ libopkg/opkg_install.c | 40 ++++++++++++++++++++++++++++++++++++++--
|
|
|
+ 1 file changed, 38 insertions(+), 2 deletions(-)
|
|
|
+
|
|
|
+--- a/libopkg/opkg_install.c
|
|
|
++++ b/libopkg/opkg_install.c
|
|
|
+@@ -528,7 +528,25 @@ prerm_upgrade_old_pkg(pkg_t *pkg, pkg_t
|
|
|
+ Error unwind, for both the above cases:
|
|
|
+ old-postinst abort-upgrade new-version
|
|
|
+ */
|
|
|
+- return 0;
|
|
|
++ int err;
|
|
|
++ char *script_args;
|
|
|
++ char *new_version;
|
|
|
++
|
|
|
++ if (!old_pkg || !pkg)
|
|
|
++ return 0;
|
|
|
++
|
|
|
++ new_version = pkg_version_str_alloc(pkg);
|
|
|
++
|
|
|
++ sprintf_alloc(&script_args, "upgrade %s", new_version);
|
|
|
++ free(new_version);
|
|
|
++ err = pkg_run_script(old_pkg, "prerm", script_args);
|
|
|
++ free(script_args);
|
|
|
++ if (err != 0) {
|
|
|
++ opkg_msg(ERROR, "prerm script for package \"%s\" failed\n",
|
|
|
++ old_pkg->name);
|
|
|
++ return -1;
|
|
|
++ }
|
|
|
++ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ static int
|
|
|
+@@ -925,7 +943,25 @@ postrm_upgrade_old_pkg(pkg_t *pkg, pkg_t
|
|
|
+ new-postrm failed-upgrade old-version
|
|
|
+ Error unwind, for both cases:
|
|
|
+ old-preinst abort-upgrade new-version */
|
|
|
+- return 0;
|
|
|
++ int err;
|
|
|
++ char *script_args;
|
|
|
++ char *new_version;
|
|
|
++
|
|
|
++ if (!old_pkg || !pkg)
|
|
|
++ return 0;
|
|
|
++
|
|
|
++ new_version = pkg_version_str_alloc(pkg);
|
|
|
++
|
|
|
++ sprintf_alloc(&script_args, "upgrade %s", new_version);
|
|
|
++ free(new_version);
|
|
|
++ err = pkg_run_script(old_pkg, "postrm", script_args);
|
|
|
++ free(script_args);
|
|
|
++ if (err != 0) {
|
|
|
++ opkg_msg(ERROR, "postrm script for package \"%s\" failed\n",
|
|
|
++ old_pkg->name);
|
|
|
++ return -1;
|
|
|
++ }
|
|
|
++ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ static int
|