summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2012-11-22 11:25:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-24 15:12:30 +0000
commit9f836a4595dc4524ebd95db02165ef28dda51010 (patch)
tree926330865020e87f7f31ca67fa945d10bd91b1c0
parent1d8580bb554f2a8eeab7acc11a22c0387ab0117a (diff)
downloadpoky-9f836a4595dc4524ebd95db02165ef28dda51010.tar.gz
lsbsetup: drop it
lsbsetup provides script LSB_Setup.sh to setup LSB test on image. But script LSB_Test.sh provided by lsbtest replaces its function now. So drop lsbsetup. lsbsetup links /etc/localtime to HongKong zoneinfo file to make LSB wcsftime test case pass(Yocto 1079). But the test case PASS without this link, so remove the link. Other 2 links are moved to packages lsb. [Yocto 3278] (From OE-Core rev: d991393207af90fe73de76f89ac6949ef291904e) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh230
-rw-r--r--meta/recipes-extended/lsb/lsbsetup_1.0.bb26
2 files changed, 0 insertions, 256 deletions
diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
deleted file mode 100644
index aec1858729..0000000000
--- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
+++ /dev/null
@@ -1,230 +0,0 @@
1#!/bin/bash
2
3# Copyright (C) 2010-2011 Wind River Systems, Inc.
4#
5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License version 2 as
7# published by the Free Software Foundation.
8#
9# This program is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of
11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12# See the GNU General Public License for more details.
13#
14# You should have received a copy of the GNU General Public License
15# along with this program; if not, write to the Free Software
16# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
18##Prepare Steps
19# Confirm the installed LSB Packages
20ARCH=`uname -m`
21APP_FILE=`ls /lsb-Application/*.rpm`
22if [ ! -f /opt/lsb/test/manager/bin/dist-checker-start.pl ]
23then
24 if [ -d /lsb-dist-testkit ];then
25 if [ ${ARCH} == i686 ];then
26 echo "i486-suse" >> /etc/rpm/platform
27 echo "i486-noarch" >> /etc/rpm/platform
28 echo "i486-pc" >> /etc/rpm/platform
29 echo "noarch-suse" >> /etc/rpm/platform
30 else
31 echo "${ARCH}-suse" >> /etc/rpm/platform
32 echo "${ARCH}-noarch" >> /etc/rpm/platform
33 echo "${ARCH}-pc" >> /etc/rpm/platform
34 echo "noarch-suse" >> /etc/rpm/platform
35 fi
36 cd /lsb-dist-testkit && sh install.sh && cd ../lsb-Application
37 for i in ${APP_FILE}
38 do
39 echo "$i" |grep -q "apache"
40 if [ $? -eq 0 ]
41 then
42 rpm -ivh $i --noscripts --nodeps --force
43 else
44 rpm -ivh $i --nodeps --force
45 fi
46 done
47 mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
48 mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
49 cp expect-tests.tar test1.pdf test2.pdf /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
50 cp raptor-tests.tar tcl-tests.tar /var/opt/lsb//test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
51 cd ..
52 else
53 echo "Please install the realted LSB Packages"
54 exit 1
55 fi
56fi
57
58# Deleted existed user tester
59id tester
60if [ $? -eq 0 ]
61then
62 echo "User tester was existed"
63 sleep 1
64 userdel -rf tester
65 if [ $? -eq 0 ] || [ $? -eq 6 ]
66 then
67 echo "Success to delete user tester"
68 else
69 echo "Fail to delete user tester"
70 fi
71else
72 echo "There was not User tester"
73fi
74
75##Funs
76check ()
77{
78if [ $? -eq 0 ]
79then
80 echo "PASS"
81else
82 echo "FAIL"
83 exit 1
84fi
85}
86
87###Start
88# Add tester group
89echo ""
90echo "---------------------------------"
91echo "Step 1:Add Group tester"
92groupadd tester
93check
94
95
96# Add User tester
97echo ""
98echo "---------------------------------"
99echo "Step 2:Add User tester"
100useradd -g tester tester
101check
102
103echo "Check the tester user"
104id tester
105check
106
107# Stop Boa server
108#echo ""
109#echo "---------------------------------"
110#echo "Step 3:Stop BOA server"
111#/etc/init.d/boa stop
112#check
113
114# Create Dirnames file for RPM
115echo ""
116echo "---------------------------------"
117echo "Step 4:Create the Dirnames on target"
118
119mkdir -pv /etc/rpm/sysinfo
120
121cat > /etc/rpm/sysinfo/Dirnames << EOF
122/etc/opt/lsb
123/home/tet/LSB.tools
124/opt/lsb-tet3-lite/lib/ksh
125/opt/lsb-tet3-lite/lib/perl
126/opt/lsb-tet3-lite/lib/posix_sh
127/opt/lsb-tet3-lite/lib/tet3
128/opt/lsb-tet3-lite/lib/xpg3sh
129/opt/lsb/appbat/lib/python2.4/site-packages/qm
130/opt/lsb/appbat/lib/python2.4/site-packages/qm/external
131/opt/lsb/appbat/lib/python2.4/site-packages/qm/external/DocumentTemplate
132/opt/lsb/appbat/lib/python2.4/site-packages/qm/test
133/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/classes
134/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/web
135/opt/lsb/test/doc
136/opt/lsb/test/lib
137/opt/lsb/test/qm/diagnostics
138/opt/lsb/test/qm/doc
139/opt/lsb/test/qm/doc/test/html
140/opt/lsb/test/qm/doc/test/print
141/opt/lsb/test/qm/dtml
142/opt/lsb/test/qm/dtml/test
143/opt/lsb/test/qm/messages/test
144/opt/lsb/test/qm/tutorial/test/tdb
145/opt/lsb/test/qm/tutorial/test/tdb/QMTest
146/opt/lsb/test/qm/web
147/opt/lsb/test/qm/web/images
148/opt/lsb/test/qm/web/stylesheets
149/opt/lsb/test/qm/xml
150/opt/lsb/test/share
151/usr/share/doc/lsb-runtime-test
152/var/opt/lsb
153/opt/lsb/test/desktop
154/opt/lsb/test/desktop/fontconfig
155/opt/lsb/test/desktop/freetype
156/opt/lsb/test/desktop/gtkvts
157/opt/lsb/test/desktop/libpng
158/opt/lsb/test/desktop/qt3
159/opt/lsb/test/desktop/xft
160/opt/lsb/test/desktop/xml
161/opt/lsb/test/desktop/xrender
162
163
164EOF
165
166if [ -f /etc/rpm/sysinfo/Dirnames ]
167then
168 echo "Success to creat Dirnames file"
169else
170 echo "Fail to creat Dirnames file"
171fi
172
173# ldconfig
174echo ""
175echo "---------------------------------"
176echo "Step 5:"
177ldconfig -v
178check;
179
180
181# Insmod look.ko
182insmod /lib/modules/2.6.*/kernel/drivers/block/loop.ko
183if [ $? != 0 ];then
184 echo "Please insmod loop.ko manully"
185fi
186# Start lsb
187echo ""
188if [ -f /opt/lsb/test/manager/bin/dist-checker-start.pl ];then
189 /opt/lsb/test/manager/bin/dist-checker-start.pl
190fi
191
192# Get ip address for target platform
193addr=`ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}'|sed s/[[:space:]][[:space:]]Bcast//g`
194echo -e "you should input ${addr}:8888 on your browser"
195
196# Workaround to add part of locales for LSB test
197localedef -i ja_JP -f EUC-JP ja_JP.eucjp
198localedef -i en_US -f ISO-8859-15 en_US.ISO-8859-15
199localedef -i en_US -f ISO-8859-1 en_US.ISO-8859-1
200localedef -i en_US -f ISO-8859-1 en_US
201localedef -i de_DE -f UTF-8 de_DE.UTF-8
202localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
203localedef -i en_US -f UTF-8 en_US.UTF-8
204localedef -i se_NO -f UTF-8 se_NO.UTF-8
205localedef -i de_DE -f ISO-8859-1 de_DE
206localedef -i de_DE -f ISO-8859-15 de_DE.ISO-8859-15
207localedef -i en_US -f ISO-8859-1 en_US.ISO8859-1
208localedef -i fr_FR -f ISO-8859-1 fr_FR
209localedef -i it_IT -f ISO-8859-1 it_IT
210localedef -i es_MX -f ISO-8859-1 es_MX
211localedef -i en_HK -f ISO-8859-1 en_HK
212localedef -i en_PH -f ISO-8859-1 en_PH
213localedef -i ta_IN -f UTF-8 ta_IN
214
215# Resolve localhost
216LOCALHOST=`hostname`
217if ! `grep -F -q "$LOCALHOST" /etc/hosts`; then
218 echo "127.0.0.1 $LOCALHOST" >> /etc/hosts
219fi
220
221# Start avahi-daemon
222/etc/init.d/avahi-daemon start
223ln -s /etc/init.d/avahi-daemon /etc/rc5.d/S88avahi-daemon
224
225# Done
226echo "Done!!"
227
228###End
229
230
diff --git a/meta/recipes-extended/lsb/lsbsetup_1.0.bb b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
deleted file mode 100644
index 2792d51f23..0000000000
--- a/meta/recipes-extended/lsb/lsbsetup_1.0.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1DESCRIPTION = "auto-setup environment for lsb test"
2SECTION = "console/utils"
3LICENSE = "GPLv2"
4PR = "r4"
5
6LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"
7
8SRC_URI = "file://LSB_Setup.sh"
9
10S = "${WORKDIR}"
11
12do_install() {
13 # Only install file if it has a contents
14 install -d ${D}${bindir}
15 install -d ${D}/${sysconfdir}
16 install -m 0755 ${S}/LSB_Setup.sh ${D}${bindir}
17 install -d ${D}/${libdir}/lsb
18 ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
19 ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
20 ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
21 ln -sf ${datadir}/zoneinfo/Asia/Hong_Kong ${D}${sysconfdir}/localtime
22}
23
24FILES_${PN} += "${libdir}/lsb \
25 ${libdir}/* \
26 "