[pisa-src] r2578 - in trunk/tools/testbed/plugins/classes: hipl/build_pre_hook openwrt/build_pre_hook openwrt/prepare_pre_hook pisa/build_pre_hook
- From: Samuel Richter <samuel.richter@xxxxxxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Mon, 16 May 2011 21:33:22 +0200
Author: richter
Date: Mon May 16 21:33:21 2011
New Revision: 2578
Log:
fix openwrt building for the testbed
Modified:
trunk/tools/testbed/plugins/classes/hipl/build_pre_hook
trunk/tools/testbed/plugins/classes/openwrt/build_pre_hook
trunk/tools/testbed/plugins/classes/openwrt/prepare_pre_hook
trunk/tools/testbed/plugins/classes/pisa/build_pre_hook
Modified: trunk/tools/testbed/plugins/classes/hipl/build_pre_hook
==============================================================================
--- trunk/tools/testbed/plugins/classes/hipl/build_pre_hook Mon May 16
20:47:07 2011 (r2577)
+++ trunk/tools/testbed/plugins/classes/hipl/build_pre_hook Mon May 16
21:33:21 2011 (r2578)
@@ -15,6 +15,7 @@
make deb
;;
opkg|openwrt)
+ rsync "$HIPL_PATH"/hipl-*.tar.gz "$OPENWRT_PATH"/dl/
cd "$OPENWRT_PATH"
make package/hipl/install
cp bin/*/packages/hipl-* "$BIN_PATH/"
Modified: trunk/tools/testbed/plugins/classes/openwrt/build_pre_hook
==============================================================================
--- trunk/tools/testbed/plugins/classes/openwrt/build_pre_hook Mon May 16
20:47:07 2011 (r2577)
+++ trunk/tools/testbed/plugins/classes/openwrt/build_pre_hook Mon May 16
21:33:21 2011 (r2578)
@@ -4,17 +4,28 @@
# collect all classes of nodes that have the openwrt class
#grep -l openwrt "$BUILD_PATH"/*_classes | xargs cat | sort | uniq | while
read -r NODE_TYPE; do
for TARGET in $TARGETS; do
- grep -l hipl "$BUILD_PATH/$TARGET"_classes | xargs cat
+ grep -l openwrt "$BUILD_PATH/$TARGET"_classes | xargs cat
done | sort | uniq | while read -r PKG_CLASS; do
+ case $PKG_CLASS in
+ hipl)
+ rsync "$HIPL_PATH"/hipl-*.tar.gz "$OPENWRT_PATH"/dl/
+ ;;
+ pisa)
+ rsync "$PISA_PATH"/pisa-*.tar.gz "$OPENWRT_PATH"/dl/
+ ;;
+ esac
+ done
+
+ for TARGET in $TARGETS; do
+ grep -l openwrt "$BUILD_PATH/$TARGET"_classes | xargs cat
+ done | sort | uniq | while read -r NODE_TYPE; do
case $NODE_TYPE in
linksys)
- "$PISA_PATH"/openwrt/configure_router.sh pisa-testbed
"$OPENWRT_PATH" "$PISA_PATH" "$HIPL_PATH" "$NODE_TYPE"
(cd $OPENWRT_PATH; make V=99)
cp
"$OPENWRT_PATH/bin/ar71xx/openwrt-ar71xx-wrt160nl-squashfs.bin" \
"$BIN_PATH/openwrt-$TESTBED_NAME.bin"
;;
vbox)
- "$PISA_PATH"/openwrt/configure_router.sh pisa-testbed
"$OPENWRT_PATH" "$PISA_PATH" "$HIPL_PATH" "$NODE_TYPE"
(cd $OPENWRT_PATH; make V=99)
cp `ls -t $OPENWRT_PATH/bin/x86/*.vdi | head -1` \
$BIN_PATH/openwrt-$TESTBED_NAME.vdi
Modified: trunk/tools/testbed/plugins/classes/openwrt/prepare_pre_hook
==============================================================================
--- trunk/tools/testbed/plugins/classes/openwrt/prepare_pre_hook Mon May
16 20:47:07 2011 (r2577)
+++ trunk/tools/testbed/plugins/classes/openwrt/prepare_pre_hook Mon May
16 21:33:21 2011 (r2578)
@@ -6,4 +6,16 @@
mkdir -p "$OPENWRT_PATH"
svn co svn://svn.openwrt.org/openwrt/tags/backfire_10.03
"$OPENWRT_PATH"
fi
+ for TARGET in $TARGETS; do
+ grep -l hipl "$BUILD_PATH/$TARGET"_classes | xargs cat
+ done | sort | uniq | while read -r NODE_TYPE; do
+ case $NODE_TYPE in
+ linksys)
+ "$PISA_PATH"/openwrt/configure_router.sh pisa-testbed
"$OPENWRT_PATH" "$PISA_PATH" "$HIPL_PATH" "$NODE_TYPE"
+ ;;
+ vbox)
+ "$PISA_PATH"/openwrt/configure_router.sh pisa-testbed
"$OPENWRT_PATH" "$PISA_PATH" "$HIPL_PATH" "$NODE_TYPE"
+ ;;
+ esac
+ done
}
Modified: trunk/tools/testbed/plugins/classes/pisa/build_pre_hook
==============================================================================
--- trunk/tools/testbed/plugins/classes/pisa/build_pre_hook Mon May 16
20:47:07 2011 (r2577)
+++ trunk/tools/testbed/plugins/classes/pisa/build_pre_hook Mon May 16
21:33:21 2011 (r2578)
@@ -13,6 +13,7 @@
make deb
;;
opkg|openwrt)
+ rsync "$PISA_PATH"/pisa-*.tar.gz "$OPENWRT_PATH"/dl/
cd "$OPENWRT_PATH"
make package/pisa/install
cp bin/*/packages/pisa-* "$BIN_PATH/"
--
This is the pisa developer mailing list. Please also subscribe to the main pisa
list at:
//www.freelists.org/list/pisa
Other related posts:
- » [pisa-src] r2578 - in trunk/tools/testbed/plugins/classes: hipl/build_pre_hook openwrt/build_pre_hook openwrt/prepare_pre_hook pisa/build_pre_hook - Samuel Richter
