populate_sdk_rpm: Ensure empty strings aren't passed to attemponly rpm code

If empty strings are passed to the rpm attemptonly code, it breaks. This
ensures we don't do that.

(From OE-Core rev: 6a0d5a3158608364f6baa11fe9ab7fa1f8e251ab)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index dd5f39a100..9caa6f6e10 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -41,7 +41,7 @@ populate_sdk_rpm () {
         export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
         export INSTALL_PLATFORM_RPM="$(echo ${TARGET_ARCH} | tr - _)${TARGET_VENDOR}-${TARGET_OS}"
         export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}"
-        export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}"
+        export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}' | tr -d ' ')"
         export INSTALL_PACKAGES_LINGUAS_RPM=""
         # We don't need any of these runtime items for the SDK, so
         # just make the system assume they exist.
@@ -98,7 +98,7 @@ populate_sdk_rpm () {
         export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}"
         export INSTALL_PLATFORM_RPM="$(echo ${TARGET_ARCH} | tr - _)${SDK_VENDOR}-${SDK_OS}"
         export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}"
-        export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${TOOLCHAIN_TARGET_HOST_ATTEMPTONLY}"
+        export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}' | tr -d ' ')"
         export INSTALL_PACKAGES_LINGUAS_RPM=""
         export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so"
         export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk"