* [PATCH 1/2] opkg: Upgrade to v0.2.3
@ 2014-10-31 10:34 Paul Barker
2014-10-31 10:34 ` [PATCH 2/2] opkg-utils: Update SRCREV Paul Barker
2014-11-10 15:27 ` [PATCH 1/2] opkg: Upgrade to v0.2.3 Burton, Ross
0 siblings, 2 replies; 6+ messages in thread
From: Paul Barker @ 2014-10-31 10:34 UTC (permalink / raw)
To: openembedded-core
The patches for opkg have been rebased using git so that they apply cleanly onto
the new release.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
meta/recipes-devtools/opkg/opkg/add-exclude.patch | 22 ++++++++++----------
.../opkg/opkg/no-install-recommends.patch | 24 +++++++++++-----------
.../opkg/{opkg_0.2.2.bb => opkg_0.2.3.bb} | 4 ++--
3 files changed, 25 insertions(+), 25 deletions(-)
rename meta/recipes-devtools/opkg/{opkg_0.2.2.bb => opkg_0.2.3.bb} (65%)
diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch
index c684534..29376f1 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 02475a036e577d2378530e766e4a2d501a4bdd6c Mon Sep 17 00:00:00 2001
From: Paul Barker <paul@paulbarker.me.uk>
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 <paul@paulbarker.me.uk>
4 files changed, 34 insertions(+)
diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
-index 1e65bad..9c4c854 100644
+index f9b362d..c6d6bcd 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 098fa60..4c21a2f 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 <dir> offline installation of packages.\n");
printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n");
printf("\t--add-dest <name>:<path> 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.0
diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
index bcca56c..afe7525 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 c7d38f394a0d2141b27153f2a39e23fc0625ab0a Mon Sep 17 00:00:00 2001
From: Paul Barker <paul@paulbarker.me.uk>
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 <mark.hatle@windriver.com>
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 9f4713c..098fa60 100644
--- a/libopkg/pkg_depends.c
+++ b/libopkg/pkg_depends.c
-@@ -19,6 +19,7 @@
+@@ -21,6 +21,7 @@
#include <ctype.h>
#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.0
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.2.bb b/meta/recipes-devtools/opkg/opkg_0.2.3.bb
similarity index 65%
rename from meta/recipes-devtools/opkg/opkg_0.2.2.bb
rename to meta/recipes-devtools/opkg/opkg_0.2.3.bb
index 3dd7489..2d8b880 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.2.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.3.bb
@@ -8,5 +8,5 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
S = "${WORKDIR}/${BPN}-${PV}"
-SRC_URI[md5sum] = "b3ecef90d67d2aed2a14c2116a027482"
-SRC_URI[sha256sum] = "aa554ce7538544aac4f69e8274a0f9b8b433b8c3b1d00704bd393f713303a12b"
+SRC_URI[md5sum] = "ead461c08fa0dfb7aca205375195cbbe"
+SRC_URI[sha256sum] = "8c49d40a92ee4bda482ba34ba59971073fc6f574078a04eb06e22b32f8fa4c61"
--
2.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] opkg-utils: Update SRCREV
2014-10-31 10:34 [PATCH 1/2] opkg: Upgrade to v0.2.3 Paul Barker
@ 2014-10-31 10:34 ` Paul Barker
2014-11-10 15:27 ` [PATCH 1/2] opkg: Upgrade to v0.2.3 Burton, Ross
1 sibling, 0 replies; 6+ messages in thread
From: Paul Barker @ 2014-10-31 10:34 UTC (permalink / raw)
To: openembedded-core
update-alternatives now escapes '[' in expressions passed to sed.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 693c216..72dc98e 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
PROVIDES += "virtual/update-alternatives"
-SRCREV = "eae0d8fa44e8594aa90eadf06e5f4fbeef314509"
+SRCREV = "762d9dadce548108d4204c2113461a7dd6f57e60"
PV = "0.1.8+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/opkg-utils"
--
2.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] opkg: Upgrade to v0.2.3
2014-10-31 10:34 [PATCH 1/2] opkg: Upgrade to v0.2.3 Paul Barker
2014-10-31 10:34 ` [PATCH 2/2] opkg-utils: Update SRCREV Paul Barker
@ 2014-11-10 15:27 ` Burton, Ross
2014-11-10 15:50 ` Paul Barker
1 sibling, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2014-11-10 15:27 UTC (permalink / raw)
To: Paul Barker; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
On 31 October 2014 10:34, Paul Barker <paul@paulbarker.me.uk> wrote:
> The patches for opkg have been rebased using git so that they apply
> cleanly onto
> the new release.
>
Something appears to be broken with 0.2.3:
* satisfy_dependencies_for: Cannot satisfy the following dependencies for
packagegroup-core-sdk:
* perl-module-config * perl-module-config * (repeat)
https://autobuilder.yoctoproject.org/main/builders/nightly-ipk/builds/97 is
a build on the autobuilder using current master, and
https://autobuilder.yoctoproject.org/main/builders/nightly-ipk/builds/96 is
master plus your two opkg patches.
Ross
[-- Attachment #2: Type: text/html, Size: 1839 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] opkg: Upgrade to v0.2.3
2014-11-10 15:27 ` [PATCH 1/2] opkg: Upgrade to v0.2.3 Burton, Ross
@ 2014-11-10 15:50 ` Paul Barker
2014-11-11 20:19 ` Paul Barker
0 siblings, 1 reply; 6+ messages in thread
From: Paul Barker @ 2014-11-10 15:50 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 10 November 2014 15:27, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 31 October 2014 10:34, Paul Barker <paul@paulbarker.me.uk> wrote:
>>
>> The patches for opkg have been rebased using git so that they apply
>> cleanly onto
>> the new release.
>
>
> Something appears to be broken with 0.2.3:
> * satisfy_dependencies_for: Cannot satisfy the following dependencies for
> packagegroup-core-sdk:
> * perl-module-config * perl-module-config * (repeat)
>
> https://autobuilder.yoctoproject.org/main/builders/nightly-ipk/builds/97 is
> a build on the autobuilder using current master, and
> https://autobuilder.yoctoproject.org/main/builders/nightly-ipk/builds/96 is
> master plus your two opkg patches.
>
> Ross
I'll try building core-image-sato-sdk myself tomorrow and see if I can
reproduce this locally. I've probably introduced new bugs while
solving old bugs in the dependency resolution code.
I probably need a more comprehensive pre-release test for opkg. I
currently build core-image-minimal, rebuild a few packages then check
'opkg update && opkg upgrade' works as expected. I'll expand that to
build core-image-sato and core-image-sato-sdk for multiple
architectures for the v0.2.4 release.
Cheers,
--
Paul Barker
Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] opkg: Upgrade to v0.2.3
2014-11-10 15:50 ` Paul Barker
@ 2014-11-11 20:19 ` Paul Barker
2014-11-11 20:24 ` Burton, Ross
0 siblings, 1 reply; 6+ messages in thread
From: Paul Barker @ 2014-11-11 20:19 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 10 November 2014 15:50, Paul Barker <paul@paulbarker.me.uk> wrote:
> On 10 November 2014 15:27, Burton, Ross <ross.burton@intel.com> wrote:
>>
>> On 31 October 2014 10:34, Paul Barker <paul@paulbarker.me.uk> wrote:
>>>
>>> The patches for opkg have been rebased using git so that they apply
>>> cleanly onto
>>> the new release.
>>
>>
>> Something appears to be broken with 0.2.3:
>> * satisfy_dependencies_for: Cannot satisfy the following dependencies for
>> packagegroup-core-sdk:
>> * perl-module-config * perl-module-config * (repeat)
>>
>> https://autobuilder.yoctoproject.org/main/builders/nightly-ipk/builds/97 is
>> a build on the autobuilder using current master, and
>> https://autobuilder.yoctoproject.org/main/builders/nightly-ipk/builds/96 is
>> master plus your two opkg patches.
>>
>> Ross
>
> I'll try building core-image-sato-sdk myself tomorrow and see if I can
> reproduce this locally. I've probably introduced new bugs while
> solving old bugs in the dependency resolution code.
>
> I probably need a more comprehensive pre-release test for opkg. I
> currently build core-image-minimal, rebuild a few packages then check
> 'opkg update && opkg upgrade' works as expected. I'll expand that to
> build core-image-sato and core-image-sato-sdk for multiple
> architectures for the v0.2.4 release.
>
I've reproduced this and tracked the cause down to the
pkg_hash_fetch_best_installation_candidate function mis-handling an
obscure edge case. There are two providers of perl-module-config
(libperl5 and perl), but neither is actually called
'perl-module-config'. This triggers an "if (nmatching > 1)" branch
which causes the function to immediately return NULL instead of
selecting one of the matching packages to return. I kept this when
refactoring the old code but never understood why it was there in the
first place. Removing this branch fixes the problem but I need to
think through what other consequences that change may have.
I'll roll this fix into opkg v0.2.4 which I'm planning to release
ASAP. Then I'll resubmit a patch against oe-core which upgrades opkg
to v0.2.4.
In the meantime, the opkg-utils patch should be mergeable on its own.
Cheers,
--
Paul Barker
Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] opkg: Upgrade to v0.2.3
2014-11-11 20:19 ` Paul Barker
@ 2014-11-11 20:24 ` Burton, Ross
0 siblings, 0 replies; 6+ messages in thread
From: Burton, Ross @ 2014-11-11 20:24 UTC (permalink / raw)
To: Paul Barker; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1023 bytes --]
On 11 November 2014 20:19, Paul Barker <paul@paulbarker.me.uk> wrote:
> I've reproduced this and tracked the cause down to the
> pkg_hash_fetch_best_installation_candidate function mis-handling an
> obscure edge case. There are two providers of perl-module-config
> (libperl5 and perl), but neither is actually called
> 'perl-module-config'. This triggers an "if (nmatching > 1)" branch
> which causes the function to immediately return NULL instead of
> selecting one of the matching packages to return. I kept this when
> refactoring the old code but never understood why it was there in the
> first place. Removing this branch fixes the problem but I need to
> think through what other consequences that change may have.
>
> I'll roll this fix into opkg v0.2.4 which I'm planning to release
> ASAP. Then I'll resubmit a patch against oe-core which upgrades opkg
> to v0.2.4.
>
> In the meantime, the opkg-utils patch should be mergeable on its own.
>
Thanks for the prompt debugging Paul!
Ross
[-- Attachment #2: Type: text/html, Size: 1496 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-11 20:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-31 10:34 [PATCH 1/2] opkg: Upgrade to v0.2.3 Paul Barker
2014-10-31 10:34 ` [PATCH 2/2] opkg-utils: Update SRCREV Paul Barker
2014-11-10 15:27 ` [PATCH 1/2] opkg: Upgrade to v0.2.3 Burton, Ross
2014-11-10 15:50 ` Paul Barker
2014-11-11 20:19 ` Paul Barker
2014-11-11 20:24 ` Burton, Ross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.