summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-01-25 11:14:04 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-29 08:49:50 +0000
commit6dae7fae8be8641cbc79a6bcda4723e2b2725fcf (patch)
tree316031a4cd169930cee45a04f9d4431b127169b2 /meta
parent992d58074359c1f1dd3532c65e4b64c23ad57a9b (diff)
downloadpoky-6dae7fae8be8641cbc79a6bcda4723e2b2725fcf.tar.gz
lsbtest: minor fixes for LSB 5.0
* Remove qt4 test component in test list since qt4 isn't installed to lsb image by default. * Update package directory, server IP address and version. * Move LSB_Test.sh from /usr/bin to /opt/lsb-test. * Add lsb as runtime dependency. (From OE-Core rev: c5a9c64d271aec57959d70a83d0967e00a155908) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/lsb/lsbtest/LSB_Test.sh4
-rw-r--r--meta/recipes-extended/lsb/lsbtest/session11
-rw-r--r--meta/recipes-extended/lsb/lsbtest_1.0.bb5
3 files changed, 5 insertions, 15 deletions
diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index 0eb2793b10..073e247a58 100644
--- a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
+++ b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
@@ -60,7 +60,7 @@ fi
60 60
61PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb" 61PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb"
62 62
63BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/${LSB_RELEASE}/binary" 63BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/released-all/binary"
64RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime" 64RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime"
65RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime" 65RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime"
66APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}" 66APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}"
@@ -98,7 +98,7 @@ then
98fi 98fi
99 99
100# Official download server list. You can replace them with your own server. 100# Official download server list. You can replace them with your own server.
101SERVER_IPADDR="140.211.169.23" 101SERVER_IPADDR="140.211.169.28"
102SERVER_NAME="ftp.linuxfoundation.org" 102SERVER_NAME="ftp.linuxfoundation.org"
103 103
104if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then 104if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then
diff --git a/meta/recipes-extended/lsb/lsbtest/session b/meta/recipes-extended/lsb/lsbtest/session
index 3abcca740b..4d47e40f7d 100644
--- a/meta/recipes-extended/lsb/lsbtest/session
+++ b/meta/recipes-extended/lsb/lsbtest/session
@@ -2,7 +2,7 @@
2VERBOSE_LEVEL: 1 2VERBOSE_LEVEL: 1
3ARCHITECTURE: targetarch 3ARCHITECTURE: targetarch
4USE_INTERNET: 1 4USE_INTERNET: 1
5STD_VERSION: LSB 4.1 5STD_VERSION: LSB 5.0
6STD_PROFILE: no 6STD_PROFILE: no
7[cmdchk] 7[cmdchk]
8RUN: 1 8RUN: 1
@@ -126,15 +126,6 @@ VERSION: local|*
126AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python 126AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python
127AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results 127AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results
128 128
129[qt4-azov]
130RUN: 1
131VERSION: local|*
132
133[qt4-azov|local|*]
134AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/qt4-azov
135AUTOREPLY_X11_FONT_PATH: [default]
136AUTOREPLY_RESULTS_DIR: /opt/lsb/test/qt4-azov/results
137
138[xml2-azov] 129[xml2-azov]
139RUN: 1 130RUN: 1
140VERSION: local|* 131VERSION: local|*
diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/meta/recipes-extended/lsb/lsbtest_1.0.bb
index 36f52fd73a..a90c023d52 100644
--- a/meta/recipes-extended/lsb/lsbtest_1.0.bb
+++ b/meta/recipes-extended/lsb/lsbtest_1.0.bb
@@ -10,14 +10,13 @@ SRC_URI = "file://LSB_Test.sh \
10 file://packages_list \ 10 file://packages_list \
11 file://session \ 11 file://session \
12 " 12 "
13RDEPENDS_${PN} = "rpm" 13RDEPENDS_${PN} = "lsb rpm"
14 14
15S = "${WORKDIR}" 15S = "${WORKDIR}"
16 16
17do_install() { 17do_install() {
18 install -d ${D}${bindir}
19 install -m 0755 ${S}/LSB_Test.sh ${D}${bindir}
20 install -d ${D}/opt/lsb-test 18 install -d ${D}/opt/lsb-test
19 install -m 0755 ${S}/LSB_Test.sh ${D}/opt/lsb-test/LSB_Test.sh
21 install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list 20 install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list
22 install -m 0644 ${S}/session ${D}/opt/lsb-test/session 21 install -m 0644 ${S}/session ${D}/opt/lsb-test/session
23 if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then 22 if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then