summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_rpm.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 22:27:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 23:31:01 +0100
commit4496e34aaf2c177c32d9ec8e5d7f459cfaf744e6 (patch)
treeb55e6c526bf97ffb576dac9f19a2ab9a33ddfd93 /meta/classes/populate_sdk_rpm.bbclass
parent46597b54570e4e96ed84fa2ba02bc996c632c0ba (diff)
downloadpoky-4496e34aaf2c177c32d9ec8e5d7f459cfaf744e6.tar.gz
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>
Diffstat (limited to 'meta/classes/populate_sdk_rpm.bbclass')
-rw-r--r--meta/classes/populate_sdk_rpm.bbclass4
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 () {
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="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" 44 export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}' | tr -d ' ')"
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="${TOOLCHAIN_TARGET_HOST_ATTEMPTONLY}" 101 export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}' | tr -d ' ')"
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"