Skip to contentSkip to conversation

lsbsetup: add some workaround for LSB tests

PATCH In review Kang Kai 2 participants 3 messages Apr 22, 2011 – Apr 25, 2011

lore
Share & tools
lore

Kang Kai

author
#0 lore raw

cover lsbsetup: add some workaround for LSB tests

From: Kang Kai <[email protected]>

Hi Saul,

If this patch ok, could you please merge it before next lsb image autobuild. We hope we can check this in image which download from autobuilder next week. Thank you!

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

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kangkai/lsbsetup
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lsbsetup

Thanks,
Kang Kai <[email protected]>
---

Kang Kai (1):
lsbsetup: add some workaround for LSB tests

 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh |   15 ++++++++++++++-
 meta/recipes-extended/lsb/lsbsetup_0.9.bb       |    8 ++++----
 2 files changed, 18 insertions(+), 5 deletions(-)
author
#1 lore raw

PATCH 1/1 lsbsetup: add some workaround for LSB tests

From: Kang Kai <[email protected]>

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

Signed-off-by Kang Kai <[email protected]>
---
 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh |   15 ++++++++++++++-
 meta/recipes-extended/lsb/lsbsetup_0.9.bb       |    8 ++++----
 2 files changed, 18 insertions(+), 5 deletions(-)
meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh +14 -1
index 7ce823e..a8189e5 100644
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2005-2010 Wind River Systems, Inc.
+# Copyright (C) 2010-2011 Wind River Systems, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as

@@ -201,6 +201,19 @@ fi
 addr=`ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}'|sed s/[[:space:]][[:space:]]Bcast//g`
 echo -e "you should input ${addr}:8888 on your browser"
 
+#workaround to add part of locales for LSB test
+localedef -i ja_JP -f EUC-JP ja_JP.eucjp
+localedef -i en_US -f ISO-8859-15  en_US.ISO-8859-15
+localedef -i en_US -f UTF-8 en_US.UTF-8
+localedef -i se_NO -f UTF-8 se_NO.UTF-8
+localedef -i de_DE -f ISO-8859-1 de_DE
+
+#resolve localhost 
+LOCALHOST=`hostname`
+if ! `grep -F -q "$LOCALHOST" /etc/hosts`; then
+    echo "127.0.0.1 $LOCALHOST" >> /etc/hosts
+fi
+
 #Step 10
 echo "Done!!"
meta/recipes-extended/lsb/lsbsetup_0.9.bb +4 -4
index 8cbaf1e..5fd0584 100644
@@ -2,9 +2,9 @@ DESCRIPTION = "auto-setup environment for lsb test"
 SECTION = "console/utils"
 PRIORITY = "required"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
-LIC_FILES_CHKSUM = "file://LSB_Setup.sh;md5=7391be3e70a02d44e1b183fa103b0585"
+LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"
 
 SRC_URI = "file://LSB_Setup.sh"
 

@@ -12,6 +12,6 @@ S=${WORKDIR}
 
 do_install() {
         # Only install file if it has a contents
-	install -d ${D}/usr/bin
-        install -m 0644 ${S}/LSB_Setup.sh ${D}/usr/bin
+        install -d ${D}/usr/bin
+        install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
 }
Signature · 1 line
1.7.1
#2 lore raw
In reply to Kang Kai
Quoted 21 lines · Kang Kai

From: Kang Kai<[email protected]>

Hi Saul,

If this patch ok, could you please merge it before next lsb image autobuild. We hope we can check this in image which download from autobuilder next week. Thank you!

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

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kangkai/lsbsetup
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lsbsetup

Thanks,
Kang Kai<[email protected]>
---

Quoted 7 lines

Kang Kai (1):
lsbsetup: add some workaround for LSB tests

  meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh |   15 ++++++++++++++-
  meta/recipes-extended/lsb/lsbsetup_0.9.bb       |    8 ++++----
  2 files changed, 18 insertions(+), 5 deletions(-)

Pulled into oe-core and poky/master

Thanks
Sau!