* [PATCH 0/1] LSB_Setup.sh: Add function to install all test packages
@ 2011-04-02 8:35 Xiaofeng Yan
2011-04-02 8:35 ` [PATCH 1/1] " Xiaofeng Yan
0 siblings, 1 reply; 3+ messages in thread
From: Xiaofeng Yan @ 2011-04-02 8:35 UTC (permalink / raw)
To: poky
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Add function to install all of lsb test suite packages instead of parts of packages before.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/LSB_Setup.sh
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/LSB_Setup.sh
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
LSB_Setup.sh: Add function to install all test packages
meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh | 50 ++++++++++++++---------
1 files changed, 30 insertions(+), 20 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] LSB_Setup.sh: Add function to install all test packages
2011-04-02 8:35 [PATCH 0/1] LSB_Setup.sh: Add function to install all test packages Xiaofeng Yan
@ 2011-04-02 8:35 ` Xiaofeng Yan
2011-04-08 18:12 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Xiaofeng Yan @ 2011-04-02 8:35 UTC (permalink / raw)
To: poky
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Add function to install all of lsb test suite packages instead of installing parts of test packages
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh | 50 ++++++++++++++---------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
index 78c33b3..7ce823e 100644
--- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
+++ b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
@@ -17,11 +17,38 @@
##Prepare Steps
#Steps 0; Confirm the installed LSB Packages
-
+ARCH=`uname -m`
+APP_FILE=`ls /lsb-Application/*.rpm`
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 && cd ../lsb-Application && rpm -ivh *.rpm --nodeps --force
+ if [ ${ARCH} == i686 ];then
+ echo "i486-suse" >> /etc/rpm/platform
+ echo "i486-noarch" >> /etc/rpm/platform
+ echo "i486-pc" >> /etc/rpm/platform
+ echo "noarch-suse" >> /etc/rpm/platform
+ else
+ echo "${ARCH}-suse" >> /etc/rpm/platform
+ echo "${ARCH}-noarch" >> /etc/rpm/platform
+ echo "${ARCH}-pc" >> /etc/rpm/platform
+ echo "noarch-suse" >> /etc/rpm/platform
+ fi
+ cd /lsb-dist-testkit && sh install.sh && cd ../lsb-Application
+ for i in ${APP_FILE}
+ do
+ echo "$i" |grep -q "apache"
+ if [ $? -eq 0 ]
+ then
+ rpm -ivh $i --noscripts --nodeps --force
+ else
+ rpm -ivh $i --nodeps --force
+ fi
+ done
+ mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
+ mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
+ cp expect-tests.tar test1.pdf test2.pdf /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
+ cp raptor-tests.tar tcl-tests.tar /var/opt/lsb//test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
+ cd ..
else
echo "Please install the realted LSB Packages"
exit 1
@@ -33,10 +60,6 @@ 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 ]
@@ -45,19 +68,6 @@ yes|y)
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
@@ -177,7 +187,7 @@ ping -c 5 ftp.linux-foundation.org
check
#Step 7
-insmod /lib/modules/2.6.37.2-yocto-standard\+/kernel/drivers/block/loop.ko
+insmod /lib/modules/2.6.*/kernel/drivers/block/loop.ko
if [ $? != 0 ];then
echo "Please insmod loop.ko manully"
fi
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] LSB_Setup.sh: Add function to install all test packages
2011-04-02 8:35 ` [PATCH 1/1] " Xiaofeng Yan
@ 2011-04-08 18:12 ` Saul Wold
0 siblings, 0 replies; 3+ messages in thread
From: Saul Wold @ 2011-04-08 18:12 UTC (permalink / raw)
To: Xiaofeng Yan; +Cc: poky
On 04/02/2011 01:35 AM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> Add function to install all of lsb test suite packages instead of installing parts of test packages
>
> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
> ---
> meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh | 50 ++++++++++++++---------
> 1 files changed, 30 insertions(+), 20 deletions(-)
>
> diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
> index 78c33b3..7ce823e 100644
> --- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
> +++ b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
> @@ -17,11 +17,38 @@
>
> ##Prepare Steps
> #Steps 0; Confirm the installed LSB Packages
> -
> +ARCH=`uname -m`
> +APP_FILE=`ls /lsb-Application/*.rpm`
> 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&& cd ../lsb-Application&& rpm -ivh *.rpm --nodeps --force
> + if [ ${ARCH} == i686 ];then
> + echo "i486-suse">> /etc/rpm/platform
> + echo "i486-noarch">> /etc/rpm/platform
> + echo "i486-pc">> /etc/rpm/platform
> + echo "noarch-suse">> /etc/rpm/platform
> + else
> + echo "${ARCH}-suse">> /etc/rpm/platform
> + echo "${ARCH}-noarch">> /etc/rpm/platform
> + echo "${ARCH}-pc">> /etc/rpm/platform
> + echo "noarch-suse">> /etc/rpm/platform
> + fi
> + cd /lsb-dist-testkit&& sh install.sh&& cd ../lsb-Application
> + for i in ${APP_FILE}
> + do
> + echo "$i" |grep -q "apache"
> + if [ $? -eq 0 ]
> + then
> + rpm -ivh $i --noscripts --nodeps --force
> + else
> + rpm -ivh $i --nodeps --force
> + fi
> + done
> + mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
> + mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
> + cp expect-tests.tar test1.pdf test2.pdf /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
> + cp raptor-tests.tar tcl-tests.tar /var/opt/lsb//test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
> + cd ..
> else
> echo "Please install the realted LSB Packages"
> exit 1
> @@ -33,10 +60,6 @@ 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 ]
> @@ -45,19 +68,6 @@ yes|y)
> 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
> @@ -177,7 +187,7 @@ ping -c 5 ftp.linux-foundation.org
> check
>
> #Step 7
> -insmod /lib/modules/2.6.37.2-yocto-standard\+/kernel/drivers/block/loop.ko
> +insmod /lib/modules/2.6.*/kernel/drivers/block/loop.ko
> if [ $? != 0 ];then
> echo "Please insmod loop.ko manully"
> fi
Pulled into master.
This patch caused a checksum failure, please be sure to update the
LIC_FILES_CHKSUM next time.
Thanks
Sau!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-08 18:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-02 8:35 [PATCH 0/1] LSB_Setup.sh: Add function to install all test packages Xiaofeng Yan
2011-04-02 8:35 ` [PATCH 1/1] " Xiaofeng Yan
2011-04-08 18:12 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.