package_rpm.bbclass: Fix the way the RPM platform file is generated
When generating an SDK, we need to use either the SDK or TARGET version of the OS. They are not interchangable! (From OE-Core rev: 8f6e33231439c9c2c1584b2790f62f833439e3c1) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a6aa74817c
commit
06afdb8928
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue