summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2011-04-22 14:03:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-24 22:50:41 +0100
commit30b44d9e67493dbd5771817dc3a9e6edc4471352 (patch)
tree3a932fe4aa3d66f7c0681161d9a23777e99a5d8f
parentf56f16456e9788362c2e0f59c5680ef904f0ff53 (diff)
downloadpoky-30b44d9e67493dbd5771817dc3a9e6edc4471352.tar.gz
lsbsetup: add some workaround for LSB tests
Add some workaround for LSB libstdcpp and tcl tests. Recreate locales for libstdcpp test, and resolve localhost is for tcl test [Yocto 898] Bump PR, update LICENSE information and installed file mode (From OE-Core rev: 06d75b1e554791daf7e7cfeebc78d7f240969c97) 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.sh15
-rw-r--r--meta/recipes-extended/lsb/lsbsetup_0.9.bb8
2 files changed, 18 insertions, 5 deletions
diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
index 7ce823ea6e..a8189e5944 100644
--- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
+++ b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2 2
3# Copyright (c) 2005-2010 Wind River Systems, Inc. 3# Copyright (C) 2010-2011 Wind River Systems, Inc.
4# 4#
5# This program is free software; you can redistribute it and/or modify 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 6# it under the terms of the GNU General Public License version 2 as
@@ -201,6 +201,19 @@ fi
201addr=`ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}'|sed s/[[:space:]][[:space:]]Bcast//g` 201addr=`ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}'|sed s/[[:space:]][[:space:]]Bcast//g`
202echo -e "you should input ${addr}:8888 on your browser" 202echo -e "you should input ${addr}:8888 on your browser"
203 203
204#workaround to add part of locales for LSB test
205localedef -i ja_JP -f EUC-JP ja_JP.eucjp
206localedef -i en_US -f ISO-8859-15 en_US.ISO-8859-15
207localedef -i en_US -f UTF-8 en_US.UTF-8
208localedef -i se_NO -f UTF-8 se_NO.UTF-8
209localedef -i de_DE -f ISO-8859-1 de_DE
210
211#resolve localhost
212LOCALHOST=`hostname`
213if ! `grep -F -q "$LOCALHOST" /etc/hosts`; then
214 echo "127.0.0.1 $LOCALHOST" >> /etc/hosts
215fi
216
204#Step 10 217#Step 10
205echo "Done!!" 218echo "Done!!"
206 219
diff --git a/meta/recipes-extended/lsb/lsbsetup_0.9.bb b/meta/recipes-extended/lsb/lsbsetup_0.9.bb
index 8cbaf1eee3..5fd0584fb1 100644
--- a/meta/recipes-extended/lsb/lsbsetup_0.9.bb
+++ b/meta/recipes-extended/lsb/lsbsetup_0.9.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "auto-setup environment for lsb test"
2SECTION = "console/utils" 2SECTION = "console/utils"
3PRIORITY = "required" 3PRIORITY = "required"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5PR = "r0" 5PR = "r1"
6 6
7LIC_FILES_CHKSUM = "file://LSB_Setup.sh;md5=7391be3e70a02d44e1b183fa103b0585" 7LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"
8 8
9SRC_URI = "file://LSB_Setup.sh" 9SRC_URI = "file://LSB_Setup.sh"
10 10
@@ -12,6 +12,6 @@ S=${WORKDIR}
12 12
13do_install() { 13do_install() {
14 # Only install file if it has a contents 14 # Only install file if it has a contents
15 install -d ${D}/usr/bin 15 install -d ${D}/usr/bin
16 install -m 0644 ${S}/LSB_Setup.sh ${D}/usr/bin 16 install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
17} 17}