[oe-commits] [openembedded-core] 13/22: lsbtest: add option --ignoreos to rpm install command

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit db2798d967dbffed834070b52fe778efa18cb4ae
Author: Dengke Du <dengke.du at windriver.com>
AuthorDate: Fri Apr 21 12:15:53 2017 +0800

    lsbtest: add option --ignoreos to rpm install command
    
    After change to the rpm4, the rpm packages in lsbtest, such as:
    
        lsb-setup-4.1.0-1.noarch.rpm
        lsb-dist-checker-5.0.0.1-1.x86_64.rpm
        ......
        lsb-cmdchk-5.0.3-1.x86_64.rpm
    
    When install above rpm packages, the error log appears:
    
        package lsb-setup-4.1.0-1.noarch is intended for a different operating system
        ......
    
    So we should add option "--ignoreos" to the rpm install command in LSB_Test.sh
    in ./meta/recipes-extended/lsb/lsbtest directory. In this way we can make sure
    the correct installation of those rpm packages.
    
    The YOCTO bug #11224 didn't create logs, this is because the above test rpm
    packages didn't install.
    
    [YOCTO #11224]
    
    Signed-off-by: Dengke Du <dengke.du at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index c31a3eb..0eb2793 100644
--- a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
+++ b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
@@ -252,8 +252,8 @@ LSB_STOP_CMD="/opt/lsb/test/manager/bin/dist-checker-stop.pl"
 
 PLATFORM_FILE="/etc/rpm/platform"
 
-RPM_INSTALL_CMD="rpm --quiet --nodeps --replacepkgs --nosignature -i"
-RPM_INSTALL_CMD_NOSCRIPTS="rpm --quiet --nodeps --replacepkgs --noscripts --nosignature -i"
+RPM_INSTALL_CMD="rpm --quiet --nodeps --replacepkgs --nosignature -i --ignoreos"
+RPM_INSTALL_CMD_NOSCRIPTS="rpm --quiet --nodeps --replacepkgs --noscripts --nosignature -i --ignoreos"
 
 # If the lsb has been started, stop it first.
 if [ -x ${LSB_STOP_CMD} ]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.