summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2014-02-02 12:38:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 22:37:42 +0000
commitb37dd451a52622d5b570183a81583cc34c2ff555 (patch)
treef636ce1e2083a69a3985366a6c18563658cf2a64
parent6d989d09d570e0fb91ee2076183e259ba415d64a (diff)
downloadpoky-b37dd451a52622d5b570183a81583cc34c2ff555.tar.gz
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. (From OE-Core rev: 12d7b44c817bdf6eea425bda607379594057c3fb) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs_ipk.bbclass8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index dbe1c798a6..f97f027804 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -44,13 +44,7 @@ fakeroot rootfs_ipk_do_rootfs () {
44 for i in ${BAD_RECOMMENDATIONS}; do 44 for i in ${BAD_RECOMMENDATIONS}; do
45 pkginfo="`opkg-cl ${OPKG_ARGS} info $i`" 45 pkginfo="`opkg-cl ${OPKG_ARGS} info $i`"
46 if [ ! -z "$pkginfo" ]; then 46 if [ ! -z "$pkginfo" ]; then
47 # Take just the first package stanza as otherwise only 47 echo "$pkginfo" | awk "/^Status:/ { print \"Status: deinstall hold not-installed\n\" }" - >> $STATUS
48 # the last one will have the right Status line.
49 echo "$pkginfo" | awk "/^Package:/ { print } \
50 /^Architecture:/ { print } \
51 /^Version:/ { print } \
52 /^$/ { exit } \
53 END { print \"Status: deinstall hold not-installed\n\" }" - >> $STATUS
54 else 48 else
55 echo "Requested ignored recommendation $i is not a package" 49 echo "Requested ignored recommendation $i is not a package"
56 fi 50 fi