[PATCH] Revert "opkg svn: respect to the arch priority"

[PATCH] Revert "opkg svn: respect to the arch priority"

[Koen Kooi]

This completely breaks installing packages from feeds:

root@bone-mainline:~# opkg install libgtk-2.0
Installing libgtk-2.0 (2.24.8-r7.1) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/libgtk-2.0_2.24.8-r7.1_armv7a-vfp-neon.ipk.
Installing pango (1.30.0-r1.1) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango_1.30.0-r1.1_armv7a-vfp-neon.ipk.
Installing pango-module-basic-x (1.30.0-r1.1) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-x_1.30.0-r1.1_armv7a-vfp-neon.ipk.
Installing pango-module-basic-fc (1.30.0-r1.1) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-fc_1.30.0-r1.1_armv7a-vfp-neon.ipk.
Installing shared-mime-info (0.91-r4.9) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/shared-mime-info_0.91-r4.9_armv7a-vfp-neon.ipk.
Installing gdk-pixbuf-loader-png (2.24.1-r7.1) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-png_2.24.1-r7.1_armv7a-vfp-neon.ipk.
Installing gdk-pixbuf-loader-jpeg (2.24.1-r7.1) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-jpeg_2.24.1-r7.1_armv7a-vfp-neon.ipk.
Installing libjpeg8 (8d+1.2.1-r1.1) to root...
Configuring pango-module-basic-x.
Configuring pango.
Configuring pango-module-basic-fc.
Configuring shared-mime-info.
Configuring hicolor-icon-theme.
//var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
Configuring gdk-pixbuf-loader-png.
Collected errors:
 * opkg_download_pkg: Package libjpeg8 is not available from any configured src.
 * opkg_install_pkg: Failed to download libjpeg8. Perhaps you need to run 'opkg update'?
 * opkg_install_cmd: Cannot install package libgtk-2.0.
 * pkg_run_script: package "hicolor-icon-theme" postinst script returned status 127.
 * opkg_configure: hicolor-icon-theme.postinst returned 127.

root@bone-mainline:~# opkg install libjpeg8
Installing libjpeg8 (8d+1.2.1-r1.2) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/libjpeg8_8d+1.2.1-r1.2_armv7a-vfp-neon.ipk.
Configuring libjpeg8.
Configuring hicolor-icon-theme.
//var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
Collected errors:
 * pkg_run_script: package "hicolor-icon-theme" postinst script returned status 127.
 * opkg_configure: hicolor-icon-theme.postinst returned 127.

root@bone-mainline:~# opkg install libgtk-2.0
Installing libgtk-2.0 (2.24.8-r7.1) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/libgtk-2.0_2.24.8-r7.1_armv7a-vfp-neon.ipk.
Installing gdk-pixbuf-loader-jpeg (2.24.1-r7.1) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-jpeg_2.24.1-r7.1_armv7a-vfp-neon.ipk.
Installing liberation-fonts (1:1.04-r2.1) to root...
Downloading http://feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/all/liberation-fonts_1.04-r2.1_all.ipk.
Installing fontconfig-utils (2.9.0-r0.8) to root...
Configuring hicolor-icon-theme.
//var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
Configuring gdk-pixbuf-loader-jpeg.
Collected errors:
 * opkg_download_pkg: Package fontconfig-utils is not available from any configured src.
 * opkg_install_pkg: Failed to download fontconfig-utils. Perhaps you need to run 'opkg update'?
 * opkg_install_cmd: Cannot install package libgtk-2.0.
 * pkg_run_script: package "hicolor-icon-theme" postinst script returned status 127.
 * opkg_configure: hicolor-icon-theme.postinst returned 127.

root@bone-mainline:~# opkg install fontconfig-utils
Installing fontconfig-utils (2.9.0-r0.9) to root...
Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/fontconfig-utils_2.9.0-r0.9_armv7a-vfp-neon.ipk.
Configuring hicolor-icon-theme.
//var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
Configuring fontconfig-utils.

And on ...

This reverts commit 0a80a02644f624443cef8cc4f604edb5ef8e6975.
---
 .../opkg/opkg/0008-select_higher_version.patch     |  102 --------------------
 meta/recipes-devtools/opkg/opkg_svn.bb             |    3 +-
 2 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/0008-select_higher_version.patch

diff --git a/meta/recipes-devtools/opkg/opkg/0008-select_higher_version.patch b/meta/recipes-devtools/opkg/opkg/0008-select_higher_version.patch
deleted file mode 100644
index 46d11b0..0000000
--- a/meta/recipes-devtools/opkg/opkg/0008-select_higher_version.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Add the --select-higher-version option
-
-If there were more than one candidate which had the same pkg name in the
-candidate list, for example, the same pkg with different versions, then
-it would use the last one which was the highest version one in the past,
-but it will use the higher arch priority one now.
-
-Add the "--select-higher-version" option to let it use the higher
-version package when enabled. the default is no.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- libopkg/opkg_conf.h |    1 +
- libopkg/pkg_hash.c  |   18 +++++++++++++++---
- src/opkg-cl.c       |    9 +++++++++
- 3 files changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
---- a/libopkg/opkg_conf.h
-+++ b/libopkg/opkg_conf.h
-@@ -77,6 +77,7 @@ struct opkg_conf
-      int force_removal_of_essential_packages;
-      int force_postinstall;
-      int force_remove;
-+     int select_higher_version;
-      int check_signature;
-      int nodeps; /* do not follow dependencies */
-      char *offline_root;
-diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c
---- a/libopkg/pkg_hash.c
-+++ b/libopkg/pkg_hash.c
-@@ -376,10 +376,22 @@ pkg_hash_fetch_best_installation_candidate(abstract_pkg_t *apkg,
-           if (constraint_fcn(matching, cdata)) {
-              opkg_msg(DEBUG, "Candidate: %s %s.\n",
- 			     matching->name, matching->version) ;
--             good_pkg_by_name = matching;
- 	     /* It has been provided by hand, so it is what user want */
--             if (matching->provided_by_hand == 1)
--                break;
-+             if (matching->provided_by_hand == 1) {
-+                 good_pkg_by_name = matching;
-+                 break;
-+             }
-+             /* Respect to the arch priorities when given alternatives */
-+             if (good_pkg_by_name && !conf->select_higher_version) {
-+                 if (matching->arch_priority >= good_pkg_by_name->arch_priority) {
-+                     good_pkg_by_name = matching;
-+                     opkg_msg(DEBUG, "%s %s wins by priority.\n",
-+                         matching->name, matching->version) ;
-+                 } else
-+                     opkg_msg(DEBUG, "%s %s wins by priority.\n",
-+                         good_pkg_by_name->name, good_pkg_by_name->version) ;
-+             } else
-+                 good_pkg_by_name = matching;
-           }
-      }
- 
-diff --git a/src/opkg-cl.c b/src/opkg-cl.c
---- a/src/opkg-cl.c
-+++ b/src/opkg-cl.c
-@@ -42,6 +42,7 @@ enum {
- 	ARGS_OPT_FORCE_SPACE,
- 	ARGS_OPT_FORCE_POSTINSTALL,
- 	ARGS_OPT_FORCE_REMOVE,
-+	ARGS_OPT_SELECT_HIGHER_VERSION,
- 	ARGS_OPT_ADD_ARCH,
- 	ARGS_OPT_ADD_DEST,
- 	ARGS_OPT_NOACTION,
-@@ -83,6 +84,8 @@ static struct option long_options[] = {
- 	{"force_postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
- 	{"force-remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
- 	{"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
-+	{"select-higher-version", 0, 0, ARGS_OPT_SELECT_HIGHER_VERSION},
-+	{"select_higher_version", 0, 0, ARGS_OPT_SELECT_HIGHER_VERSION},
- 	{"noaction", 0, 0, ARGS_OPT_NOACTION},
- 	{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
- 	{"nodeps", 0, 0, ARGS_OPT_NODEPS},
-@@ -173,6 +176,9 @@ args_parse(int argc, char *argv[])
- 		case ARGS_OPT_FORCE_REMOVE:
- 			conf->force_remove = 1;
- 			break;
-+		case ARGS_OPT_SELECT_HIGHER_VERSION:
-+			conf->select_higher_version = 1;
-+			break;
- 		case ARGS_OPT_NODEPS:
- 			conf->nodeps = 1;
- 			break;
-@@ -271,6 +277,9 @@ 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");
-+	printf("\t--select-higher-version\t 	Use the higher version package rather\n");
-+	printf("\t				than the higher arch priority one if more\n");
-+	printf("\t				than one candidate is found.\n");
- 
- 	printf("\nForce Options:\n");
- 	printf("\t--force-depends		Install/remove despite failed dependencies\n");
--- 
-1.7.1
-
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 820a224..9a03f2e 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -8,7 +8,6 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
   file://0005-Do-not-read-etc-opkg-.conf-if-f-is-specified.patch \
   file://0006-detect-circular-dependencies.patch \
   file://0007-merge-newpkg-provides-even-when-oldpkg-provides-exis.patch \
-  file://0008-select_higher_version.patch \
 "
 
 S = "${WORKDIR}/trunk"
@@ -16,4 +15,4 @@ S = "${WORKDIR}/trunk"
 SRCREV = "633"
 PV = "0.1.8+svnr${SRCPV}"
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.3"
-- 
1.7.10

Re: [PATCH] Revert "opkg svn: respect to the arch priority"

[Richard Purdie]

On Fri, 2012-09-28 at 23:04 +0200, Koen Kooi wrote:
> This completely breaks installing packages from feeds:
> 
> root@bone-mainline:~# opkg install libgtk-2.0
> Installing libgtk-2.0 (2.24.8-r7.1) to root...
> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/libgtk-2.0_2.24.8-r7.1_armv7a-vfp-neon.ipk.
> Installing pango (1.30.0-r1.1) to root...
> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> Installing pango-module-basic-x (1.30.0-r1.1) to root...
> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-x_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> Installing pango-module-basic-fc (1.30.0-r1.1) to root...
> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-fc_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> Installing shared-mime-info (0.91-r4.9) to root...
> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/shared-mime-info_0.91-r4.9_armv7a-vfp-neon.ipk.
> Installing gdk-pixbuf-loader-png (2.24.1-r7.1) to root...
> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-png_2.24.1-r7.1_armv7a-vfp-neon.ipk.
> Installing gdk-pixbuf-loader-jpeg (2.24.1-r7.1) to root...
> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-jpeg_2.24.1-r7.1_armv7a-vfp-neon.ipk.
> Installing libjpeg8 (8d+1.2.1-r1.1) to root...
> Configuring pango-module-basic-x.
> Configuring pango.
> Configuring pango-module-basic-fc.
> Configuring shared-mime-info.
> Configuring hicolor-icon-theme.
> //var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
> Configuring gdk-pixbuf-loader-png.
> Collected errors:
>  * opkg_download_pkg: Package libjpeg8 is not available from any configured src.
>  * opkg_install_pkg: Failed to download libjpeg8. Perhaps you need to run 'opkg update'?
>  * opkg_install_cmd: Cannot install package libgtk-2.0.
>  * pkg_run_script: package "hicolor-icon-theme" postinst script returned status 127.
>  * opkg_configure: hicolor-icon-theme.postinst returned 127.

I'm not entirely seeing the connection to this patch based on the above
errors. 

Also did you try opkg with the new options? I'm not saying there isn't a
problem but some help in figuring out how to resolve this would be good.

Cheers,

Richard

Re: [PATCH] Revert "opkg svn: respect to the arch priority"

[Koen Kooi]

Op 28 sep. 2012, om 23:27 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> On Fri, 2012-09-28 at 23:04 +0200, Koen Kooi wrote:
>> This completely breaks installing packages from feeds:
>> 
>> root@bone-mainline:~# opkg install libgtk-2.0
>> Installing libgtk-2.0 (2.24.8-r7.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/libgtk-2.0_2.24.8-r7.1_armv7a-vfp-neon.ipk.
>> Installing pango (1.30.0-r1.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango_1.30.0-r1.1_armv7a-vfp-neon.ipk.
>> Installing pango-module-basic-x (1.30.0-r1.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-x_1.30.0-r1.1_armv7a-vfp-neon.ipk.
>> Installing pango-module-basic-fc (1.30.0-r1.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-fc_1.30.0-r1.1_armv7a-vfp-neon.ipk.
>> Installing shared-mime-info (0.91-r4.9) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/shared-mime-info_0.91-r4.9_armv7a-vfp-neon.ipk.
>> Installing gdk-pixbuf-loader-png (2.24.1-r7.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-png_2.24.1-r7.1_armv7a-vfp-neon.ipk.
>> Installing gdk-pixbuf-loader-jpeg (2.24.1-r7.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-jpeg_2.24.1-r7.1_armv7a-vfp-neon.ipk.
>> Installing libjpeg8 (8d+1.2.1-r1.1) to root...
>> Configuring pango-module-basic-x.
>> Configuring pango.
>> Configuring pango-module-basic-fc.
>> Configuring shared-mime-info.
>> Configuring hicolor-icon-theme.
>> //var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
>> Configuring gdk-pixbuf-loader-png.
>> Collected errors:
>> * opkg_download_pkg: Package libjpeg8 is not available from any configured src.
>> * opkg_install_pkg: Failed to download libjpeg8. Perhaps you need to run 'opkg update'?
>> * opkg_install_cmd: Cannot install package libgtk-2.0.
>> * pkg_run_script: package "hicolor-icon-theme" postinst script returned status 127.
>> * opkg_configure: hicolor-icon-theme.postinst returned 127.
> 
> I'm not entirely seeing the connection to this patch based on the above
> errors. 
> 
> Also did you try opkg with the new options? I'm not saying there isn't a
> problem but some help in figuring out how to resolve this would be good.

Doing the revert and installing a new (old) opkg does seem to fix the problems.

Re: [PATCH] Revert "opkg svn: respect to the arch priority"

[Koen Kooi]

Op 28 sep. 2012, om 23:27 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> On Fri, 2012-09-28 at 23:04 +0200, Koen Kooi wrote:
>> This completely breaks installing packages from feeds:
>> 
>> root@bone-mainline:~# opkg install libgtk-2.0
>> Installing libgtk-2.0 (2.24.8-r7.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/libgtk-2.0_2.24.8-r7.1_armv7a-vfp-neon.ipk.
>> Installing pango (1.30.0-r1.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango_1.30.0-r1.1_armv7a-vfp-neon.ipk.
>> Installing pango-module-basic-x (1.30.0-r1.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-x_1.30.0-r1.1_armv7a-vfp-neon.ipk.
>> Installing pango-module-basic-fc (1.30.0-r1.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-fc_1.30.0-r1.1_armv7a-vfp-neon.ipk.
>> Installing shared-mime-info (0.91-r4.9) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/shared-mime-info_0.91-r4.9_armv7a-vfp-neon.ipk.
>> Installing gdk-pixbuf-loader-png (2.24.1-r7.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-png_2.24.1-r7.1_armv7a-vfp-neon.ipk.
>> Installing gdk-pixbuf-loader-jpeg (2.24.1-r7.1) to root...
>> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-jpeg_2.24.1-r7.1_armv7a-vfp-neon.ipk.
>> Installing libjpeg8 (8d+1.2.1-r1.1) to root...
>> Configuring pango-module-basic-x.
>> Configuring pango.
>> Configuring pango-module-basic-fc.
>> Configuring shared-mime-info.
>> Configuring hicolor-icon-theme.
>> //var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
>> Configuring gdk-pixbuf-loader-png.
>> Collected errors:
>> * opkg_download_pkg: Package libjpeg8 is not available from any configured src.
>> * opkg_install_pkg: Failed to download libjpeg8. Perhaps you need to run 'opkg update'?
>> * opkg_install_cmd: Cannot install package libgtk-2.0.
>> * pkg_run_script: package "hicolor-icon-theme" postinst script returned status 127.
>> * opkg_configure: hicolor-icon-theme.postinst returned 127.
> 
> I'm not entirely seeing the connection to this patch based on the above
> errors. 
> 
> Also did you try opkg with the new options? I'm not saying there isn't a
> problem but some help in figuring out how to resolve this would be good.

I'll see if the new option help next week, but even if they do, needing to use opkg install --unbreak-me is unacceptable.

Re: [PATCH] Revert "opkg svn: respect to the arch priority"

[Richard Purdie]

On Sat, 2012-09-29 at 15:34 +0200, Koen Kooi wrote:
> Op 28 sep. 2012, om 23:27 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:
> 
> > On Fri, 2012-09-28 at 23:04 +0200, Koen Kooi wrote:
> >> This completely breaks installing packages from feeds:
> >> 
> >> root@bone-mainline:~# opkg install libgtk-2.0
> >> Installing libgtk-2.0 (2.24.8-r7.1) to root...
> >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/libgtk-2.0_2.24.8-r7.1_armv7a-vfp-neon.ipk.
> >> Installing pango (1.30.0-r1.1) to root...
> >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> >> Installing pango-module-basic-x (1.30.0-r1.1) to root...
> >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-x_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> >> Installing pango-module-basic-fc (1.30.0-r1.1) to root...
> >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-fc_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> >> Installing shared-mime-info (0.91-r4.9) to root...
> >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/shared-mime-info_0.91-r4.9_armv7a-vfp-neon.ipk.
> >> Installing gdk-pixbuf-loader-png (2.24.1-r7.1) to root...
> >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-png_2.24.1-r7.1_armv7a-vfp-neon.ipk.
> >> Installing gdk-pixbuf-loader-jpeg (2.24.1-r7.1) to root...
> >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-jpeg_2.24.1-r7.1_armv7a-vfp-neon.ipk.
> >> Installing libjpeg8 (8d+1.2.1-r1.1) to root...
> >> Configuring pango-module-basic-x.
> >> Configuring pango.
> >> Configuring pango-module-basic-fc.
> >> Configuring shared-mime-info.
> >> Configuring hicolor-icon-theme.
> >> //var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
> >> Configuring gdk-pixbuf-loader-png.
> >> Collected errors:
> >> * opkg_download_pkg: Package libjpeg8 is not available from any configured src.
> >> * opkg_install_pkg: Failed to download libjpeg8. Perhaps you need to run 'opkg update'?
> >> * opkg_install_cmd: Cannot install package libgtk-2.0.
> >> * pkg_run_script: package "hicolor-icon-theme" postinst script returned status 127.
> >> * opkg_configure: hicolor-icon-theme.postinst returned 127.
> > 
> > I'm not entirely seeing the connection to this patch based on the above
> > errors. 
> > 
> > Also did you try opkg with the new options? I'm not saying there isn't a
> > problem but some help in figuring out how to resolve this would be good.
> 
> I'll see if the new option help next week, but even if they do, needing to use opkg install --unbreak-me is unacceptable.

What I'm wondering if whether we can change the default and make
everyone happy. I'm waiting to hear back on the test to decide what to
do here.

Cheers,

Richard

Re: [PATCH] Revert "opkg svn: respect to the arch priority"

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3874 bytes --]

On Mon, Oct 01, 2012 at 02:21:21PM +0100, Richard Purdie wrote:
> On Sat, 2012-09-29 at 15:34 +0200, Koen Kooi wrote:
> > Op 28 sep. 2012, om 23:27 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:
> > 
> > > On Fri, 2012-09-28 at 23:04 +0200, Koen Kooi wrote:
> > >> This completely breaks installing packages from feeds:
> > >> 
> > >> root@bone-mainline:~# opkg install libgtk-2.0
> > >> Installing libgtk-2.0 (2.24.8-r7.1) to root...
> > >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/libgtk-2.0_2.24.8-r7.1_armv7a-vfp-neon.ipk.
> > >> Installing pango (1.30.0-r1.1) to root...
> > >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> > >> Installing pango-module-basic-x (1.30.0-r1.1) to root...
> > >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-x_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> > >> Installing pango-module-basic-fc (1.30.0-r1.1) to root...
> > >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/pango-module-basic-fc_1.30.0-r1.1_armv7a-vfp-neon.ipk.
> > >> Installing shared-mime-info (0.91-r4.9) to root...
> > >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/shared-mime-info_0.91-r4.9_armv7a-vfp-neon.ipk.
> > >> Installing gdk-pixbuf-loader-png (2.24.1-r7.1) to root...
> > >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-png_2.24.1-r7.1_armv7a-vfp-neon.ipk.
> > >> Installing gdk-pixbuf-loader-jpeg (2.24.1-r7.1) to root...
> > >> Downloading http://eu.feeds.angstrom-distribution.org/feeds/core/ipk/eglibc/armv7a-vfp-neon/base/gdk-pixbuf-loader-jpeg_2.24.1-r7.1_armv7a-vfp-neon.ipk.
> > >> Installing libjpeg8 (8d+1.2.1-r1.1) to root...
> > >> Configuring pango-module-basic-x.
> > >> Configuring pango.
> > >> Configuring pango-module-basic-fc.
> > >> Configuring shared-mime-info.
> > >> Configuring hicolor-icon-theme.
> > >> //var/lib/opkg/info/hicolor-icon-theme.postinst: line 11: gtk-update-icon-cache: command not found
> > >> Configuring gdk-pixbuf-loader-png.
> > >> Collected errors:
> > >> * opkg_download_pkg: Package libjpeg8 is not available from any configured src.
> > >> * opkg_install_pkg: Failed to download libjpeg8. Perhaps you need to run 'opkg update'?
> > >> * opkg_install_cmd: Cannot install package libgtk-2.0.
> > >> * pkg_run_script: package "hicolor-icon-theme" postinst script returned status 127.
> > >> * opkg_configure: hicolor-icon-theme.postinst returned 127.
> > > 
> > > I'm not entirely seeing the connection to this patch based on the above
> > > errors. 
> > > 
> > > Also did you try opkg with the new options? I'm not saying there isn't a
> > > problem but some help in figuring out how to resolve this would be good.
> > 
> > I'll see if the new option help next week, but even if they do, needing to use opkg install --unbreak-me is unacceptable.
> 
> What I'm wondering if whether we can change the default and make
> everyone happy. I'm waiting to hear back on the test to decide what to
> do here.

I can confirm that opkg upgrades and images are broken now.

e.g. tzdata is now allarch, since
http://git.openembedded.org/openembedded-core/commit/?id=23bf856215fa7c34a71d6086ee355f7c0672dbab

but opkg is installing old 2012d-r0 and trying to downgrade it on images
built with older opkg:
"Not downgrading package tzdata on root from 2012d-r2 to 2012d-r0."

It was in arch with higher prio (exactly the use-case I said in original discussion of this patch).

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

[PATCH] opkg: Convert select-higher-version option to prefer-arch-to-version

[Richard Purdie]

This converts the option to maintain the existing behaviour unless the option is
specified. We do specify the option during the builds themselves to ensure what
the users expects is built.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 019bd7c..4bf1b10 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -139,7 +139,7 @@ package_install_internal_ipk() {
 
 	mkdir -p ${target_rootfs}${localstatedir}/lib/opkg/
 
-	local ipkg_args="-f ${conffile} -o ${target_rootfs} --force-overwrite --force_postinstall"
+	local ipkg_args="-f ${conffile} -o ${target_rootfs} --force-overwrite --force_postinstall --prefer-arch-to-version"
 
 	opkg-cl ${ipkg_args} update
 
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 46e8d60..9d716fb 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -14,9 +14,9 @@ do_rootfs[recrdeptask] += "do_package_write_ipk"
 
 do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock"
 
-IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} --force-overwrite"
+IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} --force-overwrite --prefer-arch-to-version"
 # The _POST version also works when constructing the matching SDK
-IPKG_ARGS_POST = "-f ${IPKGCONF_TARGET} -o $INSTALL_ROOTFS_IPK --force-overwrite"
+IPKG_ARGS_POST = "-f ${IPKGCONF_TARGET} -o $INSTALL_ROOTFS_IPK --force-overwrite --prefer-arch-to-version"
 
 OPKG_PREPROCESS_COMMANDS = "package_update_index_ipk; package_generate_ipkg_conf"
 
diff --git a/meta/recipes-devtools/opkg/opkg/0008-select_higher_version.patch b/meta/recipes-devtools/opkg/opkg/0008-select_higher_version.patch
index 46d11b0..a9b039c 100644
--- a/meta/recipes-devtools/opkg/opkg/0008-select_higher_version.patch
+++ b/meta/recipes-devtools/opkg/opkg/0008-select_higher_version.patch
@@ -1,12 +1,9 @@
-Add the --select-higher-version option
+Add the --prefer-arch-to-version option
 
 If there were more than one candidate which had the same pkg name in the
 candidate list, for example, the same pkg with different versions, then
 it would use the last one which was the highest version one in the past,
-but it will use the higher arch priority one now.
-
-Add the "--select-higher-version" option to let it use the higher
-version package when enabled. the default is no.
+but it will use the higher arch priority when this option is specified.
 
 Upstream-Status: Pending
 
@@ -24,7 +21,7 @@ diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
       int force_removal_of_essential_packages;
       int force_postinstall;
       int force_remove;
-+     int select_higher_version;
++     int prefer_arch_to_version;
       int check_signature;
       int nodeps; /* do not follow dependencies */
       char *offline_root;
@@ -44,7 +41,7 @@ diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c
 +                 break;
 +             }
 +             /* Respect to the arch priorities when given alternatives */
-+             if (good_pkg_by_name && !conf->select_higher_version) {
++             if (good_pkg_by_name && conf->prefer_arch_to_version) {
 +                 if (matching->arch_priority >= good_pkg_by_name->arch_priority) {
 +                     good_pkg_by_name = matching;
 +                     opkg_msg(DEBUG, "%s %s wins by priority.\n",
@@ -64,7 +61,7 @@ diff --git a/src/opkg-cl.c b/src/opkg-cl.c
  	ARGS_OPT_FORCE_SPACE,
  	ARGS_OPT_FORCE_POSTINSTALL,
  	ARGS_OPT_FORCE_REMOVE,
-+	ARGS_OPT_SELECT_HIGHER_VERSION,
++	ARGS_OPT_PREFER_ARCH_TO_VERSION,
  	ARGS_OPT_ADD_ARCH,
  	ARGS_OPT_ADD_DEST,
  	ARGS_OPT_NOACTION,
@@ -72,8 +69,8 @@ diff --git a/src/opkg-cl.c b/src/opkg-cl.c
  	{"force_postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
  	{"force-remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
  	{"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
-+	{"select-higher-version", 0, 0, ARGS_OPT_SELECT_HIGHER_VERSION},
-+	{"select_higher_version", 0, 0, ARGS_OPT_SELECT_HIGHER_VERSION},
++	{"prefer-arch-to-version", 0, 0, ARGS_OPT_PREFER_ARCH_TO_VERSION},
++	{"prefer-arch-to-version", 0, 0, ARGS_OPT_PREFER_ARCH_TO_VERSION},
  	{"noaction", 0, 0, ARGS_OPT_NOACTION},
  	{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
  	{"nodeps", 0, 0, ARGS_OPT_NODEPS},
@@ -81,8 +78,8 @@ diff --git a/src/opkg-cl.c b/src/opkg-cl.c
  		case ARGS_OPT_FORCE_REMOVE:
  			conf->force_remove = 1;
  			break;
-+		case ARGS_OPT_SELECT_HIGHER_VERSION:
-+			conf->select_higher_version = 1;
++		case ARGS_OPT_PREFER_ARCH_TO_VERSION:
++			conf->prefer_arch_to_version = 1;
 +			break;
  		case ARGS_OPT_NODEPS:
  			conf->nodeps = 1;
@@ -91,8 +88,8 @@ diff --git a/src/opkg-cl.c b/src/opkg-cl.c
  	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");
-+	printf("\t--select-higher-version\t 	Use the higher version package rather\n");
-+	printf("\t				than the higher arch priority one if more\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("\nForce Options:\n");
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 59bb2d9..4e83cfb 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -19,4 +19,4 @@ S = "${WORKDIR}/trunk"
 SRCREV = "633"
 PV = "0.1.8+svnr${SRCPV}"
 
-PR = "${INC_PR}.6"
+PR = "${INC_PR}.7"