diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-12 06:47:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-12 08:23:41 +0100 |
commit | 01db559abdf37003f72f3a00cd9114eb981e7c31 (patch) | |
tree | 6e725f89ff36cbf425dd92305384c20ec0bcd3a1 /meta/classes | |
parent | 566ca1e4769b4ec7e3f6c6a98bb817db2221cf82 (diff) | |
download | poky-01db559abdf37003f72f3a00cd9114eb981e7c31.tar.gz |
populate_sdk_rpm: Only remove trailing whitespace, not all whitespace
(From OE-Core rev: 06cb4deba6e4df4ffe3015602d5997b26d28778b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_rpm.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass index 9caa6f6e10..b0105931a1 100644 --- a/meta/classes/populate_sdk_rpm.bbclass +++ b/meta/classes/populate_sdk_rpm.bbclass | |||
@@ -41,7 +41,7 @@ populate_sdk_rpm () { | |||
41 | export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" | 41 | export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" |
42 | export INSTALL_PLATFORM_RPM="$(echo ${TARGET_ARCH} | tr - _)${TARGET_VENDOR}-${TARGET_OS}" | 42 | export INSTALL_PLATFORM_RPM="$(echo ${TARGET_ARCH} | tr - _)${TARGET_VENDOR}-${TARGET_OS}" |
43 | export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}" | 43 | export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}" |
44 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}' | tr -d ' ')" | 44 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}' | sed 's/ *$//g')" |
45 | export INSTALL_PACKAGES_LINGUAS_RPM="" | 45 | export INSTALL_PACKAGES_LINGUAS_RPM="" |
46 | # We don't need any of these runtime items for the SDK, so | 46 | # We don't need any of these runtime items for the SDK, so |
47 | # just make the system assume they exist. | 47 | # just make the system assume they exist. |
@@ -98,7 +98,7 @@ populate_sdk_rpm () { | |||
98 | export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}" | 98 | export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}" |
99 | export INSTALL_PLATFORM_RPM="$(echo ${TARGET_ARCH} | tr - _)${SDK_VENDOR}-${SDK_OS}" | 99 | export INSTALL_PLATFORM_RPM="$(echo ${TARGET_ARCH} | tr - _)${SDK_VENDOR}-${SDK_OS}" |
100 | export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}" | 100 | export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}" |
101 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}' | tr -d ' ')" | 101 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}' | sed 's/ *$//g')" |
102 | export INSTALL_PACKAGES_LINGUAS_RPM="" | 102 | export INSTALL_PACKAGES_LINGUAS_RPM="" |
103 | export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so" | 103 | export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so" |
104 | export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk" | 104 | export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk" |