From 9183987e6b6302a40bed83dc0bcf908d9a00b86b 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. (From OE-Core rev: 354e25fe51a8e85122898d1849008ace5dbe9461) Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- .../opkg/opkg/no-install-recommends.patch | 53 ++++++++++++++-------- 1 file changed, 33 insertions(+), 20 deletions(-) (limited to 'meta/recipes-devtools/opkg/opkg/no-install-recommends.patch') 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 + -- cgit v1.2.3-54-g00ecf