diff options
author | Dengke Du <dengke.du@windriver.com> | 2017-04-21 12:15:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-29 11:17:23 +0100 |
commit | 495c395bb4c753ba83d8d41869b896ba13ab8806 (patch) | |
tree | 42a0afcac48afbdc7704fd967929732d31dd5cbf | |
parent | 475786d0f324301307e923bca1e75ef9d0faa408 (diff) | |
download | poky-495c395bb4c753ba83d8d41869b896ba13ab8806.tar.gz |
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]
(From OE-Core rev: db2798d967dbffed834070b52fe778efa18cb4ae)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 4 |
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" | |||
252 | 252 | ||
253 | PLATFORM_FILE="/etc/rpm/platform" | 253 | PLATFORM_FILE="/etc/rpm/platform" |
254 | 254 | ||
255 | RPM_INSTALL_CMD="rpm --quiet --nodeps --replacepkgs --nosignature -i" | 255 | RPM_INSTALL_CMD="rpm --quiet --nodeps --replacepkgs --nosignature -i --ignoreos" |
256 | RPM_INSTALL_CMD_NOSCRIPTS="rpm --quiet --nodeps --replacepkgs --noscripts --nosignature -i" | 256 | RPM_INSTALL_CMD_NOSCRIPTS="rpm --quiet --nodeps --replacepkgs --noscripts --nosignature -i --ignoreos" |
257 | 257 | ||
258 | # If the lsb has been started, stop it first. | 258 | # If the lsb has been started, stop it first. |
259 | if [ -x ${LSB_STOP_CMD} ] | 259 | if [ -x ${LSB_STOP_CMD} ] |