summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/opkg/opkg/0001-configure.ac-use-pkg-config-for-libsolv.patch36
-rw-r--r--meta/recipes-devtools/opkg/opkg/0001-libsolv_solver_set_arch_policy-use-correct-logic-dur.patch35
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.3.2.bb (renamed from meta/recipes-devtools/opkg/opkg_0.3.1.bb)8
3 files changed, 3 insertions, 76 deletions
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 @@
1From 2a43027f7ecf2bb3ce73f95bcf575c56bc495d07 Mon Sep 17 00:00:00 2001
2From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
3Date: Wed, 9 Dec 2015 17:38:05 -0600
4Subject: [PATCH] configure.ac: use pkg-config for libsolv
5
6Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
7---
8 configure.ac | 12 +-----------
9 1 file changed, 1 insertion(+), 11 deletions(-)
10
11diff --git a/configure.ac b/configure.ac
12index 52e1025..d17dc5c 100644
13--- a/configure.ac
14+++ b/configure.ac
15@@ -159,17 +159,7 @@ if test "x$want_solver" != "xno"; then
16 AC_MSG_ERROR(Specify which solver with --enable-solver=<SOLVER>)],
17 [libsolv],
18 [AC_MSG_RESULT(libsolv)
19-
20- SOLVER_CFLAGS="-I/usr/local/include/"
21- SOLVER_LIBS="-lsolv -lsolvext"
22- AC_CHECK_LIB([solv],
23- [solver_solve],
24- [],
25- [AC_MSG_ERROR(libsolv not found)])
26- dnl TODO: remove previous 6 lines and uncomment line below to use
27- dnl pkg-config once there is a release of libsolv with pkg-config:
28- dnl PKG_CHECK_MODULES(SOLVER, libsolv)
29-
30+ PKG_CHECK_MODULES(SOLVER, libsolv)
31 AC_DEFINE(HAVE_SOLVER_LIBSOLV,1,[Define if you want to use libsolv])],
32 # default
33 [AC_MSG_RESULT(no)
34--
351.9.1
36
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 @@
1From 3e562bed7dced25eb3e9174ca9395324b6c873c1 Mon Sep 17 00:00:00 2001
2From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
3Date: Wed, 9 Dec 2015 13:36:14 -0600
4Subject: [PATCH] libsolv_solver_set_arch_policy: use correct logic during
5 archs resizing
6
7If there are more than INITIAL_ARCH_LIST_SIZE archs defined in the
8configuration, libsolv_solver_set_arch_policy crashes due to flawed
9logic when resizing the archs array.
10
11Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
12---
13 libopkg/opkg_solver_libsolv.c | 6 ++++--
14 1 file changed, 4 insertions(+), 2 deletions(-)
15
16diff --git a/libopkg/opkg_solver_libsolv.c b/libopkg/opkg_solver_libsolv.c
17index 1cdcf1f..b5af0fa 100644
18--- a/libopkg/opkg_solver_libsolv.c
19+++ b/libopkg/opkg_solver_libsolv.c
20@@ -66,8 +66,10 @@ static void libsolv_solver_set_arch_policy(libsolv_solver_t *libsolv_solver)
21 nv_pair_list_elt_t *arch_info;
22
23 list_for_each_entry(arch_info, &opkg_config->arch_list.head, node) {
24- if (arch_count > arch_list_size)
25- archs = xrealloc(archs, arch_list_size *= 2);
26+ if (arch_count >= arch_list_size) {
27+ arch_list_size *= 2;
28+ archs = xrealloc(archs, arch_list_size * sizeof(arch_data_t));
29+ }
30
31 archs[arch_count].arch = ((nv_pair_t *)(arch_info->data))->name;
32 archs[arch_count].priority = atoi(((nv_pair_t *)
33--
341.9.1
35
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.1.bb b/meta/recipes-devtools/opkg/opkg_0.3.2.bb
index 577f495344..0251b7dadc 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.1.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.2.bb
@@ -15,12 +15,10 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
15 file://opkg-configure.service \ 15 file://opkg-configure.service \
16 file://opkg.conf \ 16 file://opkg.conf \
17 file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ 17 file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
18 file://0001-libsolv_solver_set_arch_policy-use-correct-logic-dur.patch \
19 file://0001-configure.ac-use-pkg-config-for-libsolv.patch \
20" 18"
21 19
22SRC_URI[md5sum] = "43735e5dc1ebf46bd6ce56a7cdfdc720" 20SRC_URI[md5sum] = "b2cc1baa89d0b3d49e63ab002fd2e0a6"
23SRC_URI[sha256sum] = "d2c6c02a8384ec21168a1f0a186cb5e9f577d1452f491d02ed3e56b2ea8b87df" 21SRC_URI[sha256sum] = "c9fa948a779a4e493b9669c239de317d43c43accbccbb0cf84056f9b269ba7b0"
24 22
25inherit autotools pkgconfig systemd 23inherit autotools pkgconfig systemd
26 24
@@ -37,7 +35,7 @@ PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
37PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" 35PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
38PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" 36PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
39PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder" 37PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder"
40PACKAGECONFIG[libsolv] = "--enable-solver=libsolv,--disable-solver,libsolv" 38PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
41 39
42do_install_append () { 40do_install_append () {
43 install -d ${D}${sysconfdir}/opkg 41 install -d ${D}${sysconfdir}/opkg