From 354e25fe51a8e85122898d1849008ace5dbe9461 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Thu, 24 Apr 2014 21:56:14 +0000 Subject: opkg: Upgrade to v0.2.2 The patches for opkg have been rebased using git so that they apply cleanly onto the new release. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg/opkg/add-exclude.patch | 64 +++++++++++++--------- .../opkg/opkg/no-install-recommends.patch | 53 +++++++++++------- meta/recipes-devtools/opkg/opkg_0.2.1.bb | 12 ---- meta/recipes-devtools/opkg/opkg_0.2.2.bb | 12 ++++ 4 files changed, 84 insertions(+), 57 deletions(-) delete mode 100644 meta/recipes-devtools/opkg/opkg_0.2.1.bb create mode 100644 meta/recipes-devtools/opkg/opkg_0.2.2.bb diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch index 8d328d5b86..cf95ee22c6 100644 --- a/meta/recipes-devtools/opkg/opkg/add-exclude.patch +++ b/meta/recipes-devtools/opkg/opkg/add-exclude.patch @@ -1,3 +1,8 @@ +From 45a1e33a048f479b15b99d09df3dd1b62fef0253 Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Fri, 28 Mar 2014 15:20:22 +0000 +Subject: [PATCH 2/2] opkg-0.2.x: add-exclude + Add a way to exclude specific packages from the install When an excluded package is required by another package an error @@ -11,11 +16,17 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle Signed-off-by: Jonathan Liu +--- + libopkg/opkg_conf.c | 1 + + libopkg/opkg_conf.h | 2 ++ + libopkg/pkg_depends.c | 16 ++++++++++++++++ + src/opkg-cl.c | 15 +++++++++++++++ + 4 files changed, 34 insertions(+) -Index: trunk/libopkg/opkg_conf.c -=================================================================== ---- trunk.orig/libopkg/opkg_conf.c -+++ trunk/libopkg/opkg_conf.c +diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c +index 1e65bad..9c4c854 100644 +--- a/libopkg/opkg_conf.c ++++ b/libopkg/opkg_conf.c @@ -442,6 +442,7 @@ opkg_conf_init(void) pkg_dest_list_init(&conf->pkg_dest_list); pkg_dest_list_init(&conf->tmp_dest_list); @@ -24,11 +35,11 @@ Index: trunk/libopkg/opkg_conf.c return 0; } -Index: trunk/libopkg/opkg_conf.h -=================================================================== ---- trunk.orig/libopkg/opkg_conf.h -+++ trunk/libopkg/opkg_conf.h -@@ -49,6 +49,8 @@ struct opkg_conf +diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h +index 6045a58..ad58849 100644 +--- a/libopkg/opkg_conf.h ++++ b/libopkg/opkg_conf.h +@@ -51,6 +51,8 @@ struct opkg_conf pkg_dest_list_t pkg_dest_list; pkg_dest_list_t tmp_dest_list; nv_pair_list_t arch_list; @@ -37,11 +48,11 @@ Index: trunk/libopkg/opkg_conf.h int restrict_to_default_dest; pkg_dest_t *default_dest; -Index: trunk/libopkg/pkg_depends.c -=================================================================== ---- trunk.orig/libopkg/pkg_depends.c -+++ trunk/libopkg/pkg_depends.c -@@ -212,6 +212,22 @@ pkg_hash_fetch_unsatisfied_dependencies( +diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c +index d2d279e..b572e18 100644 +--- a/libopkg/pkg_depends.c ++++ b/libopkg/pkg_depends.c +@@ -212,6 +212,22 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, continue; } @@ -64,10 +75,10 @@ Index: trunk/libopkg/pkg_depends.c opkg_msg(DEBUG, "satisfying_pkg=%p\n", satisfying_pkg); if (satisfying_pkg != NULL) { satisfier_entry_pkg = satisfying_pkg; -Index: trunk/src/opkg-cl.c -=================================================================== ---- trunk.orig/src/opkg-cl.c -+++ trunk/src/opkg-cl.c +diff --git a/src/opkg-cl.c b/src/opkg-cl.c +index 0315d41..0db2794 100644 +--- a/src/opkg-cl.c ++++ b/src/opkg-cl.c @@ -45,6 +45,7 @@ enum { ARGS_OPT_PREFER_ARCH_TO_VERSION, ARGS_OPT_ADD_ARCH, @@ -104,10 +115,13 @@ Index: trunk/src/opkg-cl.c conf->noaction = 1; break; @@ -282,6 +296,7 @@ usage() - printf("\t--offline-root offline installation of packages.\n"); - printf("\t--add-arch : Register architecture with given priority\n"); - printf("\t--add-dest : Register destination with given path\n"); -+ printf("\t--add-exclude Register package to be excluded from install\n"); - printf("\t--prefer-arch-to-version\t Use the architecture priority package rather\n"); - printf("\t than the higher version one if more\n"); - printf("\t than one candidate is found.\n"); + printf("\t--offline-root offline installation of packages.\n"); + printf("\t--add-arch : Register architecture with given priority\n"); + printf("\t--add-dest : Register destination with given path\n"); ++ printf("\t--add-exclude Register package to be excluded from install\n"); + printf("\t--prefer-arch-to-version Use the architecture priority package rather\n"); + printf("\t than the higher version one if more\n"); + printf("\t than one candidate is found.\n"); +-- +1.9.1 + diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch index 6d1ccecbf4..bcca56c6ce 100644 --- a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch +++ b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch @@ -1,14 +1,24 @@ +From 610207c9bc82f20c77d6f234465e36857c997ea0 Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Fri, 28 Mar 2014 15:19:08 +0000 +Subject: [PATCH 1/2] opkg-0.2.x: no-install-recommends + Add the ability to not install ANY recommended packages. Upstream-Status: Pending Signed-off-by: Mark Hatle +--- + libopkg/opkg_conf.h | 1 + + libopkg/pkg_depends.c | 3 ++- + src/opkg-cl.c | 7 +++++++ + 3 files changed, 10 insertions(+), 1 deletion(-) -Index: trunk/libopkg/opkg_conf.h -=================================================================== ---- trunk.orig/libopkg/opkg_conf.h -+++ trunk/libopkg/opkg_conf.h -@@ -80,6 +80,7 @@ struct opkg_conf +diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h +index 38fa375..6045a58 100644 +--- a/libopkg/opkg_conf.h ++++ b/libopkg/opkg_conf.h +@@ -82,6 +82,7 @@ struct opkg_conf int prefer_arch_to_version; int check_signature; int nodeps; /* do not follow dependencies */ @@ -16,10 +26,10 @@ Index: trunk/libopkg/opkg_conf.h char *offline_root; char *overlay_root; int query_all; -Index: trunk/libopkg/pkg_depends.c -=================================================================== ---- trunk.orig/libopkg/pkg_depends.c -+++ trunk/libopkg/pkg_depends.c +diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c +index a4df7de..d2d279e 100644 +--- a/libopkg/pkg_depends.c ++++ b/libopkg/pkg_depends.c @@ -19,6 +19,7 @@ #include @@ -28,7 +38,7 @@ Index: trunk/libopkg/pkg_depends.c #include "opkg_utils.h" #include "pkg_hash.h" #include "opkg_message.h" -@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies( +@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, /* user request overrides package recommendation */ if (satisfying_pkg != NULL && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST) @@ -37,10 +47,10 @@ Index: trunk/libopkg/pkg_depends.c opkg_msg(NOTICE, "%s: ignoring recommendation for " "%s at user request\n", pkg->name, satisfying_pkg->name); -Index: trunk/src/opkg-cl.c -=================================================================== ---- trunk.orig/src/opkg-cl.c -+++ trunk/src/opkg-cl.c +diff --git a/src/opkg-cl.c b/src/opkg-cl.c +index b711511..0315d41 100644 +--- a/src/opkg-cl.c ++++ b/src/opkg-cl.c @@ -50,6 +50,7 @@ enum { ARGS_OPT_NODEPS, ARGS_OPT_AUTOREMOVE, @@ -68,11 +78,14 @@ Index: trunk/src/opkg-cl.c conf->download_only = 1; break; @@ -293,6 +298,8 @@ usage() - printf("\t--noaction No action -- test only\n"); - printf("\t--download-only No action -- download only\n"); - printf("\t--nodeps Do not follow dependencies\n"); + printf("\t--noaction No action -- test only\n"); + printf("\t--download-only No action -- download only\n"); + printf("\t--nodeps Do not follow dependencies\n"); + printf("\t--no-install-recommends\n"); -+ printf("\t Do not install any recommended packages\n"); ++ printf("\t Do not install any recommended packages\n"); printf("\t--force-removal-of-dependent-packages\n"); - printf("\t Remove package and all dependencies\n"); - printf("\t--autoremove Remove packages that were installed\n"); + printf("\t Remove package and all dependencies\n"); + printf("\t--autoremove Remove packages that were installed\n"); +-- +1.9.1 + diff --git a/meta/recipes-devtools/opkg/opkg_0.2.1.bb b/meta/recipes-devtools/opkg/opkg_0.2.1.bb deleted file mode 100644 index 09c0ccad4d..0000000000 --- a/meta/recipes-devtools/opkg/opkg_0.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require opkg.inc - -SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ - file://no-install-recommends.patch \ - file://add-exclude.patch \ - file://opkg-configure.service \ -" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "1881d170b9dfbd7ecf0aa468cb9779c0" -SRC_URI[sha256sum] = "43c2d95e4cd3ef5e341e233e63de78698ec7522bca446972963160bb0f1e62db" diff --git a/meta/recipes-devtools/opkg/opkg_0.2.2.bb b/meta/recipes-devtools/opkg/opkg_0.2.2.bb new file mode 100644 index 0000000000..3dd74898b3 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg_0.2.2.bb @@ -0,0 +1,12 @@ +require opkg.inc + +SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ + file://no-install-recommends.patch \ + file://add-exclude.patch \ + file://opkg-configure.service \ +" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "b3ecef90d67d2aed2a14c2116a027482" +SRC_URI[sha256sum] = "aa554ce7538544aac4f69e8274a0f9b8b433b8c3b1d00704bd393f713303a12b" -- cgit 1.2.3-korg