X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libopkg%2Fopkg_configure.c;h=dc05f1e491f704521844721bbc42730ed0025726;hb=271d485c10f2070573b25e740b93839945dbcd9d;hp=bc8101542527cced24dfcc17603d2b07924f4c4d;hpb=3523443344809d2f357a5008931c9f79e91a3de3;p=oweals%2Fopkg-lede.git diff --git a/libopkg/opkg_configure.c b/libopkg/opkg_configure.c index bc81015..dc05f1e 100644 --- a/libopkg/opkg_configure.c +++ b/libopkg/opkg_configure.c @@ -15,34 +15,28 @@ General Public License for more details. */ -#include "includes.h" +#include + #include "sprintf_alloc.h" #include "opkg_configure.h" -#include "opkg_state.h" +#include "opkg_message.h" +#include "opkg_cmd.h" -int opkg_configure(opkg_conf_t *conf, pkg_t *pkg) +int opkg_configure(pkg_t * pkg) { - int err; - - /* DPKG_INCOMPATIBILITY: - dpkg actually does some conffile handling here, rather than at the - end of opkg_install(). Do we care? */ - /* DPKG_INCOMPATIBILITY: - dpkg actually includes a version number to this script call */ - - char *pkgid; - sprintf_alloc (&pkgid, "%s;%s;%s;", pkg->name, pkg->version, pkg->architecture); - opkg_set_current_state (conf, OPKG_STATE_CONFIGURING_PKG, pkgid); - free (pkgid); - - err = pkg_run_script(conf, pkg, "postinst", "configure"); - if (err) { - opkg_message(conf, OPKG_ERROR, "ERROR: %s.postinst returned %d\n", pkg->name, err); - return err; - } - - opkg_state_changed++; - opkg_set_current_state (conf, OPKG_STATE_NONE, NULL); - return 0; -} + int err; + + /* DPKG_INCOMPATIBILITY: + dpkg actually does some conffile handling here, rather than at the + end of opkg_install(). Do we care? */ + /* DPKG_INCOMPATIBILITY: + dpkg actually includes a version number to this script call */ + err = pkg_run_script(pkg, "postinst", "configure"); + if (err) { + opkg_msg(ERROR, "%s.postinst returned %d.\n", pkg->name, err); + return err; + } + + return 0; +}