* [PATCH] rootfs_ipkg: fix BAD_RECOMMENDATIONS handling
@ 2013-02-19 21:31 Ross Burton
0 siblings, 0 replies; only message in thread
From: Ross Burton @ 2013-02-19 21:31 UTC (permalink / raw)
To: openembedded-core
If multiple versions of the same package are in the package feed then the
generate status file would only contains a "deinstall" status for the last one,
which meant that BAD_RECOMMENDATIONS wouldn't actually work.
Use awk instead of grep and stop reading when we reach a newline, so we only
ever output a single stanza.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/rootfs_ipk.bbclass | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 135bb60..a609944 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -46,9 +46,13 @@ fakeroot rootfs_ipk_do_rootfs () {
for i in ${BAD_RECOMMENDATIONS}; do
pkginfo="`opkg-cl ${OPKG_ARGS} info $i`"
if [ ! -z "$pkginfo" ]; then
- echo "$pkginfo" | grep -e '^Package:' -e '^Architecture:' -e '^Version:' >> $STATUS
- echo "Status: deinstall hold not-installed" >> $STATUS
- echo >> $STATUS
+ # 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
else
echo "Requested ignored recommendation $i is not a package"
fi
--
1.7.10.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-19 21:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-19 21:31 [PATCH] rootfs_ipkg: fix BAD_RECOMMENDATIONS handling Ross Burton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox