From patchwork Wed Dec 12 18:31:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3, 06/13] package_rpm.bbclass: Fix the way the RPM platform file is generated Date: Wed, 12 Dec 2012 18:31:30 -0000 From: Paul Eggleton X-Patchwork-Id: 40839 Message-Id: <12fac0f79c482879c42dc433dd3311edc8ef3f9f.1355337025.git.paul.eggleton@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Mark Hatle When generating an SDK, we need to use either the SDK or TARGET version of the OS. They are not interchangable! Signed-off-by: Mark Hatle --- meta/classes/package_rpm.bbclass | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 4f60daf..fdca2c3 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -262,16 +262,26 @@ package_install_internal_rpm () { if [ "${INSTALL_COMPLEMENTARY_RPM}" != "1" ] ; then # Setup base system configuration mkdir -p ${target_rootfs}/etc/rpm/ - echo "${platform}${TARGET_VENDOR}-${TARGET_OS}" > ${target_rootfs}/etc/rpm/platform + if [ -n "${sdk_mode}" ]; then + platform_vendor="${SDK_VENDOR}" + platform_os="${SDK_OS}" + else + platform_vendor="${TARGET_VENDOR}" + platform_os="${TARGET_OS}" + fi + + echo "${platform}${platform_vendor}-${platform_os}" > ${target_rootfs}/etc/rpm/platform + + if [ ! -z "$platform_extra" ]; then for pt in $platform_extra ; do channel_priority=$(expr $channel_priority + 5) case $pt in noarch | any | all) - os="`echo ${TARGET_OS} | sed "s,-.*,,"`.*" + os="`echo ${platform_os} | sed "s,-.*,,"`.*" ;; *) - os="${TARGET_OS}" + os="${platform_os}" ;; esac echo "$pt-.*-$os" >> ${target_rootfs}/etc/rpm/platform