summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/lsb/lsbtest/LSB_Test.sh3
-rw-r--r--meta/recipes-extended/lsb/lsbtest/packages_list57
-rw-r--r--meta/recipes-extended/lsb/lsbtest/session9
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb11
4 files changed, 29 insertions, 51 deletions
diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index b9971a17d1..c31a3eb462 100644
--- a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
+++ b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
@@ -113,7 +113,7 @@ fi
113#fi 113#fi
114 114
115SERVER1="\ 115SERVER1="\
116 http://${SERVER_NAME}/pub/lsb/base/${LSB_RELEASE}/binary" 116 http://${SERVER_NAME}/pub/lsb/base/released-all/binary"
117SERVER2="\ 117SERVER2="\
118 http://${SERVER_NAME}/pub/lsb/test_suites/released-all/binary/runtime" 118 http://${SERVER_NAME}/pub/lsb/test_suites/released-all/binary/runtime"
119SERVER3="\ 119SERVER3="\
@@ -429,7 +429,6 @@ cat > /etc/rpm/sysinfo/Dirnames << EOF
429/opt/lsb/test/desktop/freetype 429/opt/lsb/test/desktop/freetype
430/opt/lsb/test/desktop/gtkvts 430/opt/lsb/test/desktop/gtkvts
431/opt/lsb/test/desktop/libpng 431/opt/lsb/test/desktop/libpng
432/opt/lsb/test/desktop/qt3
433/opt/lsb/test/desktop/xft 432/opt/lsb/test/desktop/xft
434/opt/lsb/test/desktop/xml 433/opt/lsb/test/desktop/xml
435/opt/lsb/test/desktop/xrender 434/opt/lsb/test/desktop/xrender
diff --git a/meta/recipes-extended/lsb/lsbtest/packages_list b/meta/recipes-extended/lsb/lsbtest/packages_list
index 27d8352d9a..959f931504 100644
--- a/meta/recipes-extended/lsb/lsbtest/packages_list
+++ b/meta/recipes-extended/lsb/lsbtest/packages_list
@@ -1,4 +1,4 @@
1LSB_RELEASE="released-4.1.0" 1LSB_RELEASE="released-5.0"
2LSB_ARCH="lsbarch" 2LSB_ARCH="lsbarch"
3 3
4BASE_PACKAGES_LIST="lsb-setup-4.1.0-1.noarch.rpm" 4BASE_PACKAGES_LIST="lsb-setup-4.1.0-1.noarch.rpm"
@@ -9,36 +9,35 @@ RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-5.0.0.1-1.targetarch.rpm \
9 lsb-xvfb-1.2.0-22.targetarch.rpm \ 9 lsb-xvfb-1.2.0-22.targetarch.rpm \
10 " 10 "
11 11
12RUNTIME_PACKAGES_LIST="lsb-cmdchk-4.1.4-5.targetarch.rpm \ 12RUNTIME_PACKAGES_LIST="lsb-cmdchk-5.0.3-1.targetarch.rpm \
13 lsb-libchk-4.1.4-5.targetarch.rpm \ 13 lsb-libchk-5.0.3-1.targetarch.rpm \
14 lsb-qm-2.2-12.lsb4.targetarch.rpm \ 14 lsb-qm-2.2-1.lsb5.targetarch.rpm \
15 lsb-task-dist-testkit-4.1.9-1.noarch.rpm \ 15 lsb-task-dist-testkit-5.0.0-2.noarch.rpm \
16 lsb-test-core-4.1.15-1.targetarch.rpm \ 16 lsb-test-core-5.0.1-1.targetarch.rpm \
17 lsb-test-cpp-t2c-4.1.0-1.targetarch.rpm \ 17 lsb-test-cpp-t2c-5.0.0-1.targetarch.rpm \
18 lsb-test-desktop-4.1.9-1.targetarch.rpm \ 18 lsb-test-desktop-5.0.0-1.targetarch.rpm \
19 lsb-test-desktop-t2c-4.1.3-3.targetarch.rpm \ 19 lsb-test-desktop-t2c-5.0.0-1.targetarch.rpm \
20 lsb-test-libstdcpp-4.1.0-18.lsb4.targetarch.rpm \ 20 lsb-test-libstdcpp-4.1.0-22.lsb1.targetarch.rpm \
21 lsb-test-olver-core-4.1.4-1.targetarch.rpm \ 21 lsb-test-olver-core-5.0.0-1.targetarch.rpm \
22 lsb-test-perl-4.1.8-1.noarch.rpm \ 22 lsb-test-perl-5.0.2-1.noarch.rpm \
23 lsb-test-printing-4.1.2-1.targetarch.rpm \ 23 lsb-test-printing-5.0.1-1.targetarch.rpm \
24 lsb-test-python-4.1.5-1.targetarch.rpm \ 24 lsb-test-python-5.0.0-1.targetarch.rpm \
25 lsb-test-qt3-azov-4.1.1-3.targetarch.rpm \ 25 lsb-test-qt4-azov-5.0.0-1.targetarch.rpm \
26 lsb-test-qt4-azov-4.1.3-1.targetarch.rpm \ 26 lsb-test-xts5-5.1.5-47.lsb5.targetarch.rpm \
27 lsb-test-xts5-5.1.5-45.lsb4.targetarch.rpm \ 27 lsb-test-alsa-t2c-5.1.91-4.targetarch.rpm \
28 lsb-test-alsa-t2c-4.1.0-1.targetarch.rpm \ 28 lsb-test-core-t2c-5.0.1-1.targetarch.rpm \
29 lsb-test-core-t2c-4.1.2-3.targetarch.rpm \ 29 lsb-test-xml2-azov-5.0.0-1.targetarch.rpm \
30 lsb-test-xml2-azov-4.1.0-1.targetarch.rpm \
31 " 30 "
32 31
33APP_PACKAGES_LIST="lsb-python-2.4.6-7.lsb4.targetarch.rpm \ 32APP_PACKAGES_LIST="lsb-python-2.4.6-10.lsb5.targetarch.rpm \
34 lsb-apache-2.2.14-8.lsb4.targetarch.rpm \ 33 lsb-apache-2.2.19-5.lsb5.targetarch.rpm \
35 lsb-tcl-8.5.7-8.lsb4.targetarch.rpm \ 34 lsb-tcl-8.5.9-21.lsb5.targetarch.rpm \
36 lsb-expect-5.43.0-13.lsb4.targetarch.rpm \ 35 lsb-expect-5.43.0-21.lsb5.targetarch.rpm \
37 lsb-groff-1.20.1-7.lsb4.targetarch.rpm \ 36 lsb-groff-1.20.1-9.lsb5.targetarch.rpm \
38 lsb-raptor-1.4.19-5.lsb4.targetarch.rpm \ 37 lsb-raptor-1.4.21-4.lsb5.targetarch.rpm \
39 lsb-xpdf-1.01-14.lsb4.targetarch.rpm \ 38 lsb-xpdf-1.01-17.lsb5.targetarch.rpm \
40 lsb-samba-3.4.3-9.lsb4.targetarch.rpm \ 39 lsb-samba-3.5.9-5.lsb5.targetarch.rpm \
41 lsb-rsync-3.0.6-6.lsb4.targetarch.rpm \ 40 lsb-rsync-3.0.8-3.lsb5.targetarch.rpm \
42 " 41 "
43 42
44APP_TESTFILES_LIST="expect-tests.tar \ 43APP_TESTFILES_LIST="expect-tests.tar \
diff --git a/meta/recipes-extended/lsb/lsbtest/session b/meta/recipes-extended/lsb/lsbtest/session
index 85ca2efe92..3abcca740b 100644
--- a/meta/recipes-extended/lsb/lsbtest/session
+++ b/meta/recipes-extended/lsb/lsbtest/session
@@ -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[qt3-azov]
130RUN: 1
131VERSION: local|*
132
133[qt3-azov|local|*]
134AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/qt3-azov
135AUTOREPLY_X11_FONT_PATH: [default]
136AUTOREPLY_RESULTS_DIR: /opt/lsb/test/qt3-azov/results
137
138[qt4-azov] 129[qt4-azov]
139RUN: 1 130RUN: 1
140VERSION: local|* 131VERSION: local|*
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 5a32c52ec5..29564e0c9d 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -200,16 +200,6 @@ RDEPENDS_packagegroup-core-lsb-python = "\
200 python-misc \ 200 python-misc \
201" 201"
202 202
203def get_libqt3(d):
204 if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) or "":
205 if 'qt3' in d.getVar('BBFILE_COLLECTIONS', False) or "":
206 return 'libqt-mt3'
207
208 bb.warn('The meta-qt3 layer should be added, this layer provides Qt 3.x ' \
209 'libraries. Its intended use is for passing LSB tests as Qt3 is ' \
210 'a requirement for LSB.')
211 return ''
212
213QT4PKGS = " \ 203QT4PKGS = " \
214 libqtcore4 \ 204 libqtcore4 \
215 libqtgui4 \ 205 libqtgui4 \
@@ -254,7 +244,6 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\
254 atk \ 244 atk \
255 libasound \ 245 libasound \
256 ${@get_libqt4(d)} \ 246 ${@get_libqt4(d)} \
257 ${@get_libqt3(d)} \
258" 247"
259 248
260RDEPENDS_packagegroup-core-lsb-runtime-add = "\ 249RDEPENDS_packagegroup-core-lsb-runtime-add = "\