[PATCH 0/1] fix RPM rootfs issue for ATTEMPTONLY

[PATCH 0/1] fix RPM rootfs issue for ATTEMPTONLY

[Saul Wold]

Richard:

This issue was introduced with the recent IMAGE_FEATURES changes, 
since the ATTEMPTONLY was not really being used it had not been updated 
for some of the MultiLib changes, this fixes that situation.

Thanks
	Sau!

The following changes since commit a92d56058b21913570bb17ae416c3b00afce055e:

  gnome-doc-utils: respect python-dir setting EXTRA_OECONF (2011-08-11 19:13:38 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/fix
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (1):
  package_rpm: fix up attemptonly code

 meta/classes/package_rpm.bbclass |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

-- 
1.7.3.4

[PATCH 1/1] package_rpm: fix up attemptonly code

[Saul Wold]

[YOCTO #1366]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/package_rpm.bbclass |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 59e8d48..5b76c5d 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -249,7 +249,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
-- 
1.7.3.4

Re: [PATCH 0/1] fix RPM rootfs issue for ATTEMPTONLY

[Mark Hatle]

I have a similar fix coming.  This one is close, but there are a few other
changes that are needed still.

--Mark

On 8/11/11 7:09 PM, Saul Wold wrote:
> Richard:
> 
> This issue was introduced with the recent IMAGE_FEATURES changes, 
> since the ATTEMPTONLY was not really being used it had not been updated 
> for some of the MultiLib changes, this fixes that situation.
> 
> Thanks
> 	Sau!
> 
> The following changes since commit a92d56058b21913570bb17ae416c3b00afce055e:
> 
>   gnome-doc-utils: respect python-dir setting EXTRA_OECONF (2011-08-11 19:13:38 +0100)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib sgw/fix
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
> 
> Saul Wold (1):
>   package_rpm: fix up attemptonly code
> 
>  meta/classes/package_rpm.bbclass |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)
>