Skip to contentSkip to conversation

rootfs_ipk: Ensure that BAD_RECOMMENDATIONS are honoured for all architectures

PATCH New Phil Blundell 1 participant 1 message Feb 2, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rootfs_ipk: Ensure that BAD_RECOMMENDATIONS are honoured for all architectures

Commit a5362de60c0051f16b88a40bd9cb41915bee0b0f restricted us to writing only a single entry to the status file for any given package. This avoids writing garbage entries (with no Status) when multiple versions of the same package exist in the feed. However, in the case where the same version exists for multiple architectures (for example, has been built for both cortexa15 and generic armv7a), we do need to write out status file entries for all of them since we can't trivially determine which one opkg will decide to install.

Fix this by undoing a5362de60c0051f16b88a40bd9cb41915bee0b0f and writing out an entry for everything that matches, but ensuring that we force the Status to the correct value for each one.

---
 meta/classes/rootfs_ipk.bbclass | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
meta/classes/rootfs_ipk.bbclass +1 -7
index ce88c32..8d78cb0 100644
@@ -46,13 +46,7 @@ fakeroot rootfs_ipk_do_rootfs () {
 	for i in ${BAD_RECOMMENDATIONS}; do
 		pkginfo="`opkg-cl ${OPKG_ARGS} info $i`"
 		if [ ! -z "$pkginfo" ]; then
-			# Take just the first package stanza as otherwise only
-			# the last one will have the right Status line.
-			echo "$pkginfo" | awk "/^Package:/ { print } \
-                        		       /^Architecture:/ { print } \
-                        		       /^Version:/ { print } \
-                        		       /^$/ { exit } \
-                        		       END { print \"Status: deinstall hold not-installed\n\" }" - >> $STATUS
+			echo "$pkginfo" | awk "/^Status:/ { print \"Status: deinstall hold not-installed\n\" }" - >> $STATUS
 		else
 			echo "Requested ignored recommendation $i is not a package"
 		fi
Signature · 1 line
1.8.4.3