| Summary: | Adding packages via attempt only fails in package_rpm | ||
|---|---|---|---|
| Product: | [Build System, Metadata & Runtime] Meta-yocto | Reporter: | Saul Wold <sgw> |
| Component: | meta-yocto | Assignee: | Mark Hatle <mark.hatle> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | High | CC: | mark.hatle, poky.bs.watcher, poky.watcher |
| Version: | 1.0 | ||
| Target Milestone: | 1.1 | ||
| Hardware: | x86 | ||
| OS: | Multiple | ||
| Whiteboard: | |||
| OS type for building Yocto: | --- | Type of Regression: | --- |
| Verified: | Documentation change: | --- | |
|
Description
Saul Wold
2011-08-11 16:38:57 UTC
The code in package_rpm for adding attempt only packages has not been updated to for the changes to resolve_package_rpm(), this change was due to the Chris Larson change that started to use ATTEMPTONLY.
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 5c67f69..a6da5fd 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -257,7 +257,14 @@ package_install_internal_rpm () {
echo "Adding attempt only packages..."
for pkg in ${package_attemptonly} ; do
echo "Processing $pkg..."
- pkg_name=$(resolve_package_rpm $pkg ${confbase}.conf)
+
+ archvar=base_archs
+ ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
+ if [ "${ml_pkg}" != "${pkg}" ]; then
+ archvar=ml_archs
+ fi
+
+ pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg})
if [ -z "$pkg_name" ]; then
echo "Unable to find package $pkg!"
exit 1
Patch is not complete. I've sent an updated version.. (We were working on this in parallel without knowing it.) The missing part of the fix attached to this defect is that the exit 1 should be a continue. It's likely that this defect is related to 1325... Thanks to Mark for the proper fix! http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=3e8a98489dddb3bfc26309adcf83434852238445 |