summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2017-04-21 12:15:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-28 11:26:06 +0100
commitdb2798d967dbffed834070b52fe778efa18cb4ae (patch)
tree37587ddf121981a169c7a8574098133c606574fa
parentda11fbde6f8164e2774068b99bab84e4b6084713 (diff)
downloadopenembedded-core-contrib-db2798d967dbffed834070b52fe778efa18cb4ae.tar.gz
openembedded-core-contrib-db2798d967dbffed834070b52fe778efa18cb4ae.tar.bz2
openembedded-core-contrib-db2798d967dbffed834070b52fe778efa18cb4ae.zip
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@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-extended/lsb/lsbtest/LSB_Test.sh4
1 files 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 c31a3eb462..0eb2793b10 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} ]