sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Phil Blundell 2014-02-02 12:38:07 +00:00 committed by Richard Purdie
parent 6d989d09d5
commit b37dd451a5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/classes/rootfs_ipk.bbclass
View File

@ -44,13 +44,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