From 526da3b499d3259c9ded58f7dc9dd20af2985a9c Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 13 Dec 2010 00:47:29 -0800 Subject: lsbsetup: fix install process Signed-off-by: Saul Wold --- meta/recipes-extended/lsb/lsb/LSB_Setup.sh | 197 ------------------------ meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh | 197 ++++++++++++++++++++++++ meta/recipes-extended/lsb/lsbsetup_0.9.bb | 21 +-- 3 files changed, 200 insertions(+), 215 deletions(-) delete mode 100644 meta/recipes-extended/lsb/lsb/LSB_Setup.sh create mode 100644 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh (limited to 'meta/recipes-extended/lsb') diff --git a/meta/recipes-extended/lsb/lsb/LSB_Setup.sh b/meta/recipes-extended/lsb/lsb/LSB_Setup.sh deleted file mode 100644 index 4bf7686c2e..0000000000 --- a/meta/recipes-extended/lsb/lsb/LSB_Setup.sh +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2005-2010 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 -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -##Prepare Steps -#Steps 0; Confirm the installed LSB Packages - -if [ ! -f /opt/lsb/test/manager/bin/dist-checker-start.pl ] -then - if [ -d /lsb-dist-testkit ];then - cd /lsb-dist-testkit && sh install.sh - else - echo "Please install the realted LSB Packages" - exit 1 - fi -fi - -#Steps 1; Deleted existed user tester -id tester -if [ $? -eq 0 ] -then - echo "User tester was existed" - echo -n "Deleted tester(yes/no):" - read INPUT -case $INPUT in -yes|y) - sleep 1 - userdel -rf tester - if [ $? -eq 0 ] || [ $? -eq 6 ] - then - echo "Success to delete user tester" - else - echo "Fail to delete user tester" - fi - ;; -no|n) - sleep 1 - echo "There must be deleted User test before ran LSB4 on Target" - echo "" - exit 1 - ;; -*) - sleep 1 - echo "Input ERROR, pls reinput that your expected" - echo "" - exit 1 -esac -else - echo "There was not User tester" -fi - -##Funs -check () -{ -if [ $? -eq 0 ] -then - echo "PASS" -else - echo "FAIL" - exit 1 -fi -} - -###Start -#Step 1:Add tester group -echo "" -echo "---------------------------------" -echo "Step 1:Add Group tester" -groupadd tester -check - - -#Step 2:Add User tester -echo "" -echo "---------------------------------" -echo "Step 2:Add User tester" -useradd -g tester tester -check - -echo "Check the tester user" -id tester -check - -#Step 3;Stop Boa server -#echo "" -#echo "---------------------------------" -#echo "Step 3:Stop BOA server" -#/etc/init.d/boa stop -#check - -#Step 4:Create Dirnames file for RPM -echo "" -echo "---------------------------------" -echo "Step 4:Create the Dirnames on target" - -mkdir -pv /etc/rpm/sysinfo - -cat > /etc/rpm/sysinfo/Dirnames << EOF -/etc/opt/lsb -/home/tet/LSB.tools -/opt/lsb-tet3-lite/lib/ksh -/opt/lsb-tet3-lite/lib/perl -/opt/lsb-tet3-lite/lib/posix_sh -/opt/lsb-tet3-lite/lib/tet3 -/opt/lsb-tet3-lite/lib/xpg3sh -/opt/lsb/appbat/lib/python2.4/site-packages/qm -/opt/lsb/appbat/lib/python2.4/site-packages/qm/external -/opt/lsb/appbat/lib/python2.4/site-packages/qm/external/DocumentTemplate -/opt/lsb/appbat/lib/python2.4/site-packages/qm/test -/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/classes -/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/web -/opt/lsb/test/doc -/opt/lsb/test/lib -/opt/lsb/test/qm/diagnostics -/opt/lsb/test/qm/doc -/opt/lsb/test/qm/doc/test/html -/opt/lsb/test/qm/doc/test/print -/opt/lsb/test/qm/dtml -/opt/lsb/test/qm/dtml/test -/opt/lsb/test/qm/messages/test -/opt/lsb/test/qm/tutorial/test/tdb -/opt/lsb/test/qm/tutorial/test/tdb/QMTest -/opt/lsb/test/qm/web -/opt/lsb/test/qm/web/images -/opt/lsb/test/qm/web/stylesheets -/opt/lsb/test/qm/xml -/opt/lsb/test/share -/usr/share/doc/lsb-runtime-test -/var/opt/lsb -/opt/lsb/test/desktop -/opt/lsb/test/desktop/fontconfig -/opt/lsb/test/desktop/freetype -/opt/lsb/test/desktop/gtkvts -/opt/lsb/test/desktop/libpng -/opt/lsb/test/desktop/qt3 -/opt/lsb/test/desktop/xft -/opt/lsb/test/desktop/xml -/opt/lsb/test/desktop/xrender - - -EOF - -if [ -f /etc/rpm/sysinfo/Dirnames ] -then - echo "Success to creat Dirnames file" -else - echo "Fail to creat Dirnames file" -fi - -#Step 5; -echo "" -echo "---------------------------------" -echo "Step 5:" -ldconfig -v -check; - -#Step 6; -echo "" -echo "---------------------------------" -echo "Step 6:Check with link to ftp.linux-foundation.org" -echo "140.211.169.59 ftp.linux-foundation.org ftp.linuxfoundation.org" >> /etc/hosts - -ping -c 5 ftp.linux-foundation.org -check - -#Step 7 -if [ -f /lib/modules/*-wr-standard/kernel/drivers/block/loop.ko ];then - inmod /lib/modules/*-wr-standard/kernel/drivers/block/loop.ko -fi - -#Step 8 -echo "" -if [ -f /opt/lsb/test/manager/bin/dist-checker-start.pl ];then - ./opt/lsb/test/manager/bin/dist-checker-start.pl -fi - - -#Step 9 get ip address for target platform -addr=`ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}'|sed s/[[:space:]]Bcast//g` -echo -e "you should input ${addr}:8888 on your browse" -#Step 8 -echo "Done!!" - -###End diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh new file mode 100644 index 0000000000..4bf7686c2e --- /dev/null +++ b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh @@ -0,0 +1,197 @@ +#!/bin/bash + +# Copyright (c) 2005-2010 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 +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +##Prepare Steps +#Steps 0; Confirm the installed LSB Packages + +if [ ! -f /opt/lsb/test/manager/bin/dist-checker-start.pl ] +then + if [ -d /lsb-dist-testkit ];then + cd /lsb-dist-testkit && sh install.sh + else + echo "Please install the realted LSB Packages" + exit 1 + fi +fi + +#Steps 1; Deleted existed user tester +id tester +if [ $? -eq 0 ] +then + echo "User tester was existed" + echo -n "Deleted tester(yes/no):" + read INPUT +case $INPUT in +yes|y) + sleep 1 + userdel -rf tester + if [ $? -eq 0 ] || [ $? -eq 6 ] + then + echo "Success to delete user tester" + else + echo "Fail to delete user tester" + fi + ;; +no|n) + sleep 1 + echo "There must be deleted User test before ran LSB4 on Target" + echo "" + exit 1 + ;; +*) + sleep 1 + echo "Input ERROR, pls reinput that your expected" + echo "" + exit 1 +esac +else + echo "There was not User tester" +fi + +##Funs +check () +{ +if [ $? -eq 0 ] +then + echo "PASS" +else + echo "FAIL" + exit 1 +fi +} + +###Start +#Step 1:Add tester group +echo "" +echo "---------------------------------" +echo "Step 1:Add Group tester" +groupadd tester +check + + +#Step 2:Add User tester +echo "" +echo "---------------------------------" +echo "Step 2:Add User tester" +useradd -g tester tester +check + +echo "Check the tester user" +id tester +check + +#Step 3;Stop Boa server +#echo "" +#echo "---------------------------------" +#echo "Step 3:Stop BOA server" +#/etc/init.d/boa stop +#check + +#Step 4:Create Dirnames file for RPM +echo "" +echo "---------------------------------" +echo "Step 4:Create the Dirnames on target" + +mkdir -pv /etc/rpm/sysinfo + +cat > /etc/rpm/sysinfo/Dirnames << EOF +/etc/opt/lsb +/home/tet/LSB.tools +/opt/lsb-tet3-lite/lib/ksh +/opt/lsb-tet3-lite/lib/perl +/opt/lsb-tet3-lite/lib/posix_sh +/opt/lsb-tet3-lite/lib/tet3 +/opt/lsb-tet3-lite/lib/xpg3sh +/opt/lsb/appbat/lib/python2.4/site-packages/qm +/opt/lsb/appbat/lib/python2.4/site-packages/qm/external +/opt/lsb/appbat/lib/python2.4/site-packages/qm/external/DocumentTemplate +/opt/lsb/appbat/lib/python2.4/site-packages/qm/test +/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/classes +/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/web +/opt/lsb/test/doc +/opt/lsb/test/lib +/opt/lsb/test/qm/diagnostics +/opt/lsb/test/qm/doc +/opt/lsb/test/qm/doc/test/html +/opt/lsb/test/qm/doc/test/print +/opt/lsb/test/qm/dtml +/opt/lsb/test/qm/dtml/test +/opt/lsb/test/qm/messages/test +/opt/lsb/test/qm/tutorial/test/tdb +/opt/lsb/test/qm/tutorial/test/tdb/QMTest +/opt/lsb/test/qm/web +/opt/lsb/test/qm/web/images +/opt/lsb/test/qm/web/stylesheets +/opt/lsb/test/qm/xml +/opt/lsb/test/share +/usr/share/doc/lsb-runtime-test +/var/opt/lsb +/opt/lsb/test/desktop +/opt/lsb/test/desktop/fontconfig +/opt/lsb/test/desktop/freetype +/opt/lsb/test/desktop/gtkvts +/opt/lsb/test/desktop/libpng +/opt/lsb/test/desktop/qt3 +/opt/lsb/test/desktop/xft +/opt/lsb/test/desktop/xml +/opt/lsb/test/desktop/xrender + + +EOF + +if [ -f /etc/rpm/sysinfo/Dirnames ] +then + echo "Success to creat Dirnames file" +else + echo "Fail to creat Dirnames file" +fi + +#Step 5; +echo "" +echo "---------------------------------" +echo "Step 5:" +ldconfig -v +check; + +#Step 6; +echo "" +echo "---------------------------------" +echo "Step 6:Check with link to ftp.linux-foundation.org" +echo "140.211.169.59 ftp.linux-foundation.org ftp.linuxfoundation.org" >> /etc/hosts + +ping -c 5 ftp.linux-foundation.org +check + +#Step 7 +if [ -f /lib/modules/*-wr-standard/kernel/drivers/block/loop.ko ];then + inmod /lib/modules/*-wr-standard/kernel/drivers/block/loop.ko +fi + +#Step 8 +echo "" +if [ -f /opt/lsb/test/manager/bin/dist-checker-start.pl ];then + ./opt/lsb/test/manager/bin/dist-checker-start.pl +fi + + +#Step 9 get ip address for target platform +addr=`ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}'|sed s/[[:space:]]Bcast//g` +echo -e "you should input ${addr}:8888 on your browse" +#Step 8 +echo "Done!!" + +###End diff --git a/meta/recipes-extended/lsb/lsbsetup_0.9.bb b/meta/recipes-extended/lsb/lsbsetup_0.9.bb index f5b40acb8b..ce49fc641c 100644 --- a/meta/recipes-extended/lsb/lsbsetup_0.9.bb +++ b/meta/recipes-extended/lsb/lsbsetup_0.9.bb @@ -9,24 +9,9 @@ LIC_FILES_CHKSUM = "file://LSB_Setup.sh;md5=c7360d77e08a7f4f2fa66acf28012e7e" SRC_URI = "file://LSB_Setup.sh" -LSBFILE=${POKYBASE}/meta/recipes-extended/lsbsetup/lsb/LSB_Setup.sh - S=${WORKDIR} -do_unpack(){ - cp ${LSBFILE} ${WORKDIR} -} - - -do_patch(){ - : -} - -do_configure(){ - : -} - -do_install(){ - mkdir -p ${D}/usr/bin - cp ${LSBFILE} ${D}/usr/bin +do_install() { + # Only install file if it has a contents + install -m 0644 ${S}/LSB_Setup.sh ${D}/usr/bin } -- cgit v1.2.3-54-g00ecf