From f88b51e10620075cb370a11f9aabac746df67fe5 Mon Sep 17 00:00:00 2001 From: Alejandro del Castillo Date: Wed, 15 Jun 2016 17:13:42 -0500 Subject: opkg: upgrade to v0.3.2 * Drop merged patches * Update libsolv PACKAGECONFIG config option Signed-off-by: Alejandro del Castillo Signed-off-by: Ross Burton --- ...1-configure.ac-use-pkg-config-for-libsolv.patch | 36 ---------------------- ...ver_set_arch_policy-use-correct-logic-dur.patch | 35 --------------------- 2 files changed, 71 deletions(-) delete mode 100644 meta/recipes-devtools/opkg/opkg/0001-configure.ac-use-pkg-config-for-libsolv.patch delete mode 100644 meta/recipes-devtools/opkg/opkg/0001-libsolv_solver_set_arch_policy-use-correct-logic-dur.patch (limited to 'meta/recipes-devtools/opkg/opkg') diff --git a/meta/recipes-devtools/opkg/opkg/0001-configure.ac-use-pkg-config-for-libsolv.patch b/meta/recipes-devtools/opkg/opkg/0001-configure.ac-use-pkg-config-for-libsolv.patch deleted file mode 100644 index e67ec7479e..0000000000 --- a/meta/recipes-devtools/opkg/opkg/0001-configure.ac-use-pkg-config-for-libsolv.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2a43027f7ecf2bb3ce73f95bcf575c56bc495d07 Mon Sep 17 00:00:00 2001 -From: Alejandro del Castillo -Date: Wed, 9 Dec 2015 17:38:05 -0600 -Subject: [PATCH] configure.ac: use pkg-config for libsolv - -Signed-off-by: Alejandro del Castillo ---- - configure.ac | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 52e1025..d17dc5c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -159,17 +159,7 @@ if test "x$want_solver" != "xno"; then - AC_MSG_ERROR(Specify which solver with --enable-solver=)], - [libsolv], - [AC_MSG_RESULT(libsolv) -- -- SOLVER_CFLAGS="-I/usr/local/include/" -- SOLVER_LIBS="-lsolv -lsolvext" -- AC_CHECK_LIB([solv], -- [solver_solve], -- [], -- [AC_MSG_ERROR(libsolv not found)]) -- dnl TODO: remove previous 6 lines and uncomment line below to use -- dnl pkg-config once there is a release of libsolv with pkg-config: -- dnl PKG_CHECK_MODULES(SOLVER, libsolv) -- -+ PKG_CHECK_MODULES(SOLVER, libsolv) - AC_DEFINE(HAVE_SOLVER_LIBSOLV,1,[Define if you want to use libsolv])], - # default - [AC_MSG_RESULT(no) --- -1.9.1 - diff --git a/meta/recipes-devtools/opkg/opkg/0001-libsolv_solver_set_arch_policy-use-correct-logic-dur.patch b/meta/recipes-devtools/opkg/opkg/0001-libsolv_solver_set_arch_policy-use-correct-logic-dur.patch deleted file mode 100644 index 1ab1790d6a..0000000000 --- a/meta/recipes-devtools/opkg/opkg/0001-libsolv_solver_set_arch_policy-use-correct-logic-dur.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3e562bed7dced25eb3e9174ca9395324b6c873c1 Mon Sep 17 00:00:00 2001 -From: Alejandro del Castillo -Date: Wed, 9 Dec 2015 13:36:14 -0600 -Subject: [PATCH] libsolv_solver_set_arch_policy: use correct logic during - archs resizing - -If there are more than INITIAL_ARCH_LIST_SIZE archs defined in the -configuration, libsolv_solver_set_arch_policy crashes due to flawed -logic when resizing the archs array. - -Signed-off-by: Alejandro del Castillo ---- - libopkg/opkg_solver_libsolv.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libopkg/opkg_solver_libsolv.c b/libopkg/opkg_solver_libsolv.c -index 1cdcf1f..b5af0fa 100644 ---- a/libopkg/opkg_solver_libsolv.c -+++ b/libopkg/opkg_solver_libsolv.c -@@ -66,8 +66,10 @@ static void libsolv_solver_set_arch_policy(libsolv_solver_t *libsolv_solver) - nv_pair_list_elt_t *arch_info; - - list_for_each_entry(arch_info, &opkg_config->arch_list.head, node) { -- if (arch_count > arch_list_size) -- archs = xrealloc(archs, arch_list_size *= 2); -+ if (arch_count >= arch_list_size) { -+ arch_list_size *= 2; -+ archs = xrealloc(archs, arch_list_size * sizeof(arch_data_t)); -+ } - - archs[arch_count].arch = ((nv_pair_t *)(arch_info->data))->name; - archs[arch_count].priority = atoi(((nv_pair_t *) --- -1.9.1 - -- cgit 1.2.3-korg