From 514c349bac19608e65f566c989f1971ca58f6944 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Sat, 15 Nov 2014 20:15:41 +0000 Subject: opkg: Upgrade to v0.2.4 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: Ross Burton --- meta/recipes-devtools/opkg/opkg/add-exclude.patch | 22 ++++++++++---------- .../opkg/opkg/no-install-recommends.patch | 24 +++++++++++----------- meta/recipes-devtools/opkg/opkg_0.2.2.bb | 13 ------------ meta/recipes-devtools/opkg/opkg_0.2.4.bb | 13 ++++++++++++ 4 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-devtools/opkg/opkg_0.2.2.bb create mode 100644 meta/recipes-devtools/opkg/opkg_0.2.4.bb (limited to 'meta/recipes-devtools/opkg') diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch index c684534efb..a10014dee9 100644 --- a/meta/recipes-devtools/opkg/opkg/add-exclude.patch +++ b/meta/recipes-devtools/opkg/opkg/add-exclude.patch @@ -1,4 +1,4 @@ -From 5d707bbfcafd88b8b5b5821972c8c958fc3b2039 Mon Sep 17 00:00:00 2001 +From 60c3f93e95a3ca54ef0a7eebc5ef29a5d92d3110 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 @@ -28,10 +28,10 @@ Signed-off-by: Paul Barker 4 files changed, 34 insertions(+) diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c -index 1e65bad..9c4c854 100644 +index 4eee37b..1ab63fb 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c -@@ -442,6 +442,7 @@ opkg_conf_init(void) +@@ -447,6 +447,7 @@ opkg_conf_init(void) pkg_dest_list_init(&conf->pkg_dest_list); pkg_dest_list_init(&conf->tmp_dest_list); nv_pair_list_init(&conf->arch_list); @@ -40,7 +40,7 @@ index 1e65bad..9c4c854 100644 return 0; } diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index 6045a58..ad58849 100644 +index 2f189e0..6d6e613 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -51,6 +51,8 @@ struct opkg_conf @@ -53,10 +53,10 @@ index 6045a58..ad58849 100644 int restrict_to_default_dest; pkg_dest_t *default_dest; diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index d2d279e..b572e18 100644 +index 41bf206..eb630d1 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, +@@ -204,6 +204,22 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, continue; } @@ -80,7 +80,7 @@ index d2d279e..b572e18 100644 if (satisfying_pkg != NULL) { satisfier_entry_pkg = satisfying_pkg; diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index 0315d41..67366b9 100644 +index 6378380..f10d10b 100644 --- a/src/opkg-cl.c +++ b/src/opkg-cl.c @@ -45,6 +45,7 @@ enum { @@ -91,7 +91,7 @@ index 0315d41..67366b9 100644 ARGS_OPT_NOACTION, ARGS_OPT_DOWNLOAD_ONLY, ARGS_OPT_NODEPS, -@@ -95,6 +96,7 @@ static struct option long_options[] = { +@@ -97,6 +98,7 @@ static struct option long_options[] = { {"offline-root", 1, 0, 'o'}, {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, {"add-dest", 1, 0, ARGS_OPT_ADD_DEST}, @@ -99,7 +99,7 @@ index 0315d41..67366b9 100644 {"test", 0, 0, ARGS_OPT_NOACTION}, {"tmp-dir", 1, 0, 't'}, {"tmp_dir", 1, 0, 't'}, -@@ -198,6 +200,18 @@ args_parse(int argc, char *argv[]) +@@ -200,6 +202,18 @@ args_parse(int argc, char *argv[]) } free(tuple); break; @@ -118,7 +118,7 @@ index 0315d41..67366b9 100644 case ARGS_OPT_NOACTION: conf->noaction = 1; break; -@@ -282,6 +296,7 @@ usage() +@@ -287,6 +301,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"); @@ -127,5 +127,5 @@ index 0315d41..67366b9 100644 printf("\t than the higher version one if more\n"); printf("\t than one candidate is found.\n"); -- -2.0.4 +2.1.3 diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch index bcca56c6ce..b4aed9cd6b 100644 --- a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch +++ b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch @@ -1,4 +1,4 @@ -From 610207c9bc82f20c77d6f234465e36857c997ea0 Mon Sep 17 00:00:00 2001 +From 2e2ccc7e7fc81a7eee2d004d3644efbc1be1ad73 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 @@ -15,7 +15,7 @@ Signed-off-by: Mark Hatle 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index 38fa375..6045a58 100644 +index e0e045a..2f189e0 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -82,6 +82,7 @@ struct opkg_conf @@ -27,10 +27,10 @@ index 38fa375..6045a58 100644 char *overlay_root; int query_all; diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index a4df7de..d2d279e 100644 +index 8ab6508..41bf206 100644 --- a/libopkg/pkg_depends.c +++ b/libopkg/pkg_depends.c -@@ -19,6 +19,7 @@ +@@ -21,6 +21,7 @@ #include #include "pkg.h" @@ -38,7 +38,7 @@ index a4df7de..d2d279e 100644 #include "opkg_utils.h" #include "pkg_hash.h" #include "opkg_message.h" -@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, +@@ -196,7 +197,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) @@ -48,18 +48,18 @@ index a4df7de..d2d279e 100644 "%s at user request\n", pkg->name, satisfying_pkg->name); diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index b711511..0315d41 100644 +index a1d121f..6378380 100644 --- a/src/opkg-cl.c +++ b/src/opkg-cl.c -@@ -50,6 +50,7 @@ enum { - ARGS_OPT_NODEPS, +@@ -51,6 +51,7 @@ enum { ARGS_OPT_AUTOREMOVE, ARGS_OPT_CACHE, + ARGS_OPT_COMBINE, + ARGS_OPT_NOINSTALL_RECOMMENDS, }; static struct option long_options[] = { -@@ -89,6 +90,7 @@ static struct option long_options[] = { +@@ -91,6 +92,7 @@ static struct option long_options[] = { {"noaction", 0, 0, ARGS_OPT_NOACTION}, {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY}, {"nodeps", 0, 0, ARGS_OPT_NODEPS}, @@ -67,7 +67,7 @@ index b711511..0315d41 100644 {"offline", 1, 0, 'o'}, {"offline-root", 1, 0, 'o'}, {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, -@@ -199,6 +201,9 @@ args_parse(int argc, char *argv[]) +@@ -201,6 +203,9 @@ args_parse(int argc, char *argv[]) case ARGS_OPT_NOACTION: conf->noaction = 1; break; @@ -77,7 +77,7 @@ index b711511..0315d41 100644 case ARGS_OPT_DOWNLOAD_ONLY: conf->download_only = 1; break; -@@ -293,6 +298,8 @@ usage() +@@ -300,6 +305,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"); @@ -87,5 +87,5 @@ index b711511..0315d41 100644 printf("\t Remove package and all dependencies\n"); printf("\t--autoremove Remove packages that were installed\n"); -- -1.9.1 +2.1.3 diff --git a/meta/recipes-devtools/opkg/opkg_0.2.2.bb b/meta/recipes-devtools/opkg/opkg_0.2.2.bb deleted file mode 100644 index 867ff7a8ee..0000000000 --- a/meta/recipes-devtools/opkg/opkg_0.2.2.bb +++ /dev/null @@ -1,13 +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 \ - file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \ -" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "b3ecef90d67d2aed2a14c2116a027482" -SRC_URI[sha256sum] = "aa554ce7538544aac4f69e8274a0f9b8b433b8c3b1d00704bd393f713303a12b" diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb new file mode 100644 index 0000000000..2cca63c560 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb @@ -0,0 +1,13 @@ +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 \ + file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \ +" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "40ed2aee15abc8d550539449630091bd" +SRC_URI[sha256sum] = "0f40c7e457d81edf9aedc07c778f4697111ab163a38ef95999faece015453086" -- cgit 1.2.3-korg