diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 4 | ||||
-rw-r--r-- | meta/recipes-extended/lsb/lsbtest/session | 11 | ||||
-rw-r--r-- | meta/recipes-extended/lsb/lsbtest_1.0.bb | 5 |
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 | ||
61 | PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb" | 61 | PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb" |
62 | 62 | ||
63 | BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/${LSB_RELEASE}/binary" | 63 | BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/released-all/binary" |
64 | RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime" | 64 | RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime" |
65 | RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime" | 65 | RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime" |
66 | APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}" | 66 | APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}" |
@@ -98,7 +98,7 @@ then | |||
98 | fi | 98 | fi |
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. |
101 | SERVER_IPADDR="140.211.169.23" | 101 | SERVER_IPADDR="140.211.169.28" |
102 | SERVER_NAME="ftp.linuxfoundation.org" | 102 | SERVER_NAME="ftp.linuxfoundation.org" |
103 | 103 | ||
104 | if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then | 104 | if ! `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 @@ | |||
2 | VERBOSE_LEVEL: 1 | 2 | VERBOSE_LEVEL: 1 |
3 | ARCHITECTURE: targetarch | 3 | ARCHITECTURE: targetarch |
4 | USE_INTERNET: 1 | 4 | USE_INTERNET: 1 |
5 | STD_VERSION: LSB 4.1 | 5 | STD_VERSION: LSB 5.0 |
6 | STD_PROFILE: no | 6 | STD_PROFILE: no |
7 | [cmdchk] | 7 | [cmdchk] |
8 | RUN: 1 | 8 | RUN: 1 |
@@ -126,15 +126,6 @@ VERSION: local|* | |||
126 | AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python | 126 | AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python |
127 | AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results | 127 | AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results |
128 | 128 | ||
129 | [qt4-azov] | ||
130 | RUN: 1 | ||
131 | VERSION: local|* | ||
132 | |||
133 | [qt4-azov|local|*] | ||
134 | AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/qt4-azov | ||
135 | AUTOREPLY_X11_FONT_PATH: [default] | ||
136 | AUTOREPLY_RESULTS_DIR: /opt/lsb/test/qt4-azov/results | ||
137 | |||
138 | [xml2-azov] | 129 | [xml2-azov] |
139 | RUN: 1 | 130 | RUN: 1 |
140 | VERSION: local|* | 131 | VERSION: 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 | " |
13 | RDEPENDS_${PN} = "rpm" | 13 | RDEPENDS_${PN} = "lsb rpm" |
14 | 14 | ||
15 | S = "${WORKDIR}" | 15 | S = "${WORKDIR}" |
16 | 16 | ||
17 | do_install() { | 17 | do_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 |