mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

lsbtest: minor fixes for LSB 5.0

Browse Source 
* 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>
This commit is contained in:
Yi Zhao
2018-01-25 11:14:04 +08:00
committed by Richard Purdie
parent 992d580743
commit 6dae7fae8b
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
+2 -2
View File
@@ -60,7 +60,7 @@ fi
PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb" PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb"
BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/${LSB_RELEASE}/binary" BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/released-all/binary"
RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime" RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime"
RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime" RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime"
APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}" APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}"
@@ -98,7 +98,7 @@ then
fi fi
# Official download server list. You can replace them with your own server. # Official download server list. You can replace them with your own server.
SERVER_IPADDR="140.211.169.23" SERVER_IPADDR="140.211.169.28"
SERVER_NAME="ftp.linuxfoundation.org" SERVER_NAME="ftp.linuxfoundation.org"
if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then
meta/recipes-extended/lsb/lsbtest/session
+1 -10
View File
@@ -2,7 +2,7 @@
VERBOSE_LEVEL: 1 VERBOSE_LEVEL: 1
ARCHITECTURE: targetarch ARCHITECTURE: targetarch
USE_INTERNET: 1 USE_INTERNET: 1
STD_VERSION: LSB 4.1 STD_VERSION: LSB 5.0
STD_PROFILE: no STD_PROFILE: no
[cmdchk] [cmdchk]
RUN: 1 RUN: 1
@@ -126,15 +126,6 @@ VERSION: local|*
AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python
AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results
[qt4-azov]
RUN: 1
VERSION: local|*
[qt4-azov|local|*]
AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/qt4-azov
AUTOREPLY_X11_FONT_PATH: [default]
AUTOREPLY_RESULTS_DIR: /opt/lsb/test/qt4-azov/results
[xml2-azov] [xml2-azov]
RUN: 1 RUN: 1
VERSION: local|* VERSION: local|*
meta/recipes-extended/lsb/lsbtest_1.0.bb
+2 -3
View File
@@ -10,14 +10,13 @@ SRC_URI = "file://LSB_Test.sh \
file://packages_list \ file://packages_list \
file://session \ file://session \
" "
RDEPENDS_${PN} = "rpm" RDEPENDS_${PN} = "lsb rpm"
S = "${WORKDIR}" S = "${WORKDIR}"
do_install() { do_install() {
install -d ${D}${bindir}
install -m 0755 ${S}/LSB_Test.sh ${D}${bindir}
install -d ${D}/opt/lsb-test install -d ${D}/opt/lsb-test
install -m 0755 ${S}/LSB_Test.sh ${D}/opt/lsb-test/LSB_Test.sh
install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list
install -m 0644 ${S}/session ${D}/opt/lsb-test/session install -m 0644 ${S}/session ${D}/opt/lsb-test/session
if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then