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 ---------- meta/recipes-devtools/opkg/opkg_0.3.1.bb | 75 ---------------------- meta/recipes-devtools/opkg/opkg_0.3.2.bb | 73 +++++++++++++++++++++ 4 files changed, 73 insertions(+), 146 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 delete mode 100644 meta/recipes-devtools/opkg/opkg_0.3.1.bb create mode 100644 meta/recipes-devtools/opkg/opkg_0.3.2.bb 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 - diff --git a/meta/recipes-devtools/opkg/opkg_0.3.1.bb b/meta/recipes-devtools/opkg/opkg_0.3.1.bb deleted file mode 100644 index 577f495344..0000000000 --- a/meta/recipes-devtools/opkg/opkg_0.3.1.bb +++ /dev/null @@ -1,75 +0,0 @@ -SUMMARY = "Open Package Manager" -SUMMARY_libopkg = "Open Package Manager library" -SECTION = "base" -HOMEPAGE = "http://code.google.com/p/opkg/" -BUGTRACKER = "http://code.google.com/p/opkg/issues/list" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/opkg.c;beginline=2;endline=21;md5=90435a519c6ea69ef22e4a88bcc52fa0" - -DEPENDS = "libarchive" - -PE = "1" - -SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ - file://opkg-configure.service \ - file://opkg.conf \ - file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ - file://0001-libsolv_solver_set_arch_policy-use-correct-logic-dur.patch \ - file://0001-configure.ac-use-pkg-config-for-libsolv.patch \ -" - -SRC_URI[md5sum] = "43735e5dc1ebf46bd6ce56a7cdfdc720" -SRC_URI[sha256sum] = "d2c6c02a8384ec21168a1f0a186cb5e9f577d1452f491d02ed3e56b2ea8b87df" - -inherit autotools pkgconfig systemd - -SYSTEMD_SERVICE_${PN} = "opkg-configure.service" - -target_localstatedir := "${localstatedir}" -OPKGLIBDIR = "${target_localstatedir}/lib" - -PACKAGECONFIG ??= "" - -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg" -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" -PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" -PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" -PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder" -PACKAGECONFIG[libsolv] = "--enable-solver=libsolv,--disable-solver,libsolv" - -do_install_append () { - install -d ${D}${sysconfdir}/opkg - install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf - echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf - - # We need to create the lock directory - install -d ${D}${OPKGLIBDIR}/opkg - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@BINDIR@,${bindir},g' \ - -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \ - ${D}${systemd_unitdir}/system/opkg-configure.service - fi -} - -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts libarchive" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" -RREPLACES_${PN} = "opkg-nogpg opkg-collateral" -RCONFLICTS_${PN} = "opkg-collateral" -RPROVIDES_${PN} = "opkg-collateral" - -PACKAGES =+ "libopkg" - -FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" -FILES_${PN} += "${systemd_unitdir}/system/" - -BBCLASSEXTEND = "native nativesdk" - -CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" diff --git a/meta/recipes-devtools/opkg/opkg_0.3.2.bb b/meta/recipes-devtools/opkg/opkg_0.3.2.bb new file mode 100644 index 0000000000..0251b7dadc --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg_0.3.2.bb @@ -0,0 +1,73 @@ +SUMMARY = "Open Package Manager" +SUMMARY_libopkg = "Open Package Manager library" +SECTION = "base" +HOMEPAGE = "http://code.google.com/p/opkg/" +BUGTRACKER = "http://code.google.com/p/opkg/issues/list" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/opkg.c;beginline=2;endline=21;md5=90435a519c6ea69ef22e4a88bcc52fa0" + +DEPENDS = "libarchive" + +PE = "1" + +SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ + file://opkg-configure.service \ + file://opkg.conf \ + file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ +" + +SRC_URI[md5sum] = "b2cc1baa89d0b3d49e63ab002fd2e0a6" +SRC_URI[sha256sum] = "c9fa948a779a4e493b9669c239de317d43c43accbccbb0cf84056f9b269ba7b0" + +inherit autotools pkgconfig systemd + +SYSTEMD_SERVICE_${PN} = "opkg-configure.service" + +target_localstatedir := "${localstatedir}" +OPKGLIBDIR = "${target_localstatedir}/lib" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg" +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" +PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" +PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" +PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder" +PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" + +do_install_append () { + install -d ${D}${sysconfdir}/opkg + install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf + echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf + + # We need to create the lock directory + install -d ${D}${OPKGLIBDIR}/opkg + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/ + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@BINDIR@,${bindir},g' \ + -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \ + ${D}${systemd_unitdir}/system/opkg-configure.service + fi +} + +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts libarchive" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}_class-nativesdk = "" +RREPLACES_${PN} = "opkg-nogpg opkg-collateral" +RCONFLICTS_${PN} = "opkg-collateral" +RPROVIDES_${PN} = "opkg-collateral" + +PACKAGES =+ "libopkg" + +FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" +FILES_${PN} += "${systemd_unitdir}/system/" + +BBCLASSEXTEND = "native nativesdk" + +CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" -- cgit 1.2.3-korg