aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNuoHan Qiao <qiaonuohan@cn.fujitsu.com>2015-12-15 00:58:34 -0500
committerNuoHan Qiao <qiaonuohan@cn.fujitsu.com>2015-12-18 22:48:08 -0500
commit1118d4e9ba13b7a01575e939e64fd885f5837a88 (patch)
tree84b0e1a3a51e22ff76a75e43768de85b5d73e67a
parentef34b89a10372bb9655af3ed101dd867df3d9c45 (diff)
fix configuration for porter board
Change-Id: I4407a3c318a1141557cf2e2956801f9226ec2d20 Signed-off-by: NuoHan Qiao <qiaonuohan@cn.fujitsu.com>
-rw-r--r--userdata/conf/boards/porter.board13
-rw-r--r--userdata/conf/config.xml32
-rwxr-xr-xuserdata/conf/tools.sh14
3 files changed, 51 insertions, 8 deletions
diff --git a/userdata/conf/boards/porter.board b/userdata/conf/boards/porter.board
index 10cb340..636a3a5 100644
--- a/userdata/conf/boards/porter.board
+++ b/userdata/conf/boards/porter.board
@@ -2,6 +2,7 @@ inherit "base-board"
include "base-params"
IPADDR="192.168.30.64"
+SSH_PORT="22"
LOGIN="root"
JTA_HOME="/home/a"
#PASSWORD="root"
@@ -9,14 +10,14 @@ PLATFORM="porter"
TRANSPORT="ssh"
ARCHITECTURE="arm"
-#SATA_DEV="/dev/sda1"
-#SATA_MP="/mnt/sata"
+SATA_DEV="/dev/sda1"
+SATA_MP="/mnt/sata"
-#USB_DEV="/dev/sdb1"
-#USB_MP="/mnt/usb"
+USB_DEV="/dev/sdb1"
+USB_MP="/mnt/usb"
-#MMC_DEV="/dev/mmcblk0p2"
-#MMC_MP="/mnt/mmc"
+MMC_DEV="/dev/mmcblk0p2"
+MMC_MP="/mnt/mmc"
BOARD.CAP_LIST="RENESAS"
diff --git a/userdata/conf/config.xml b/userdata/conf/config.xml
index 423d034..a8ac662 100644
--- a/userdata/conf/config.xml
+++ b/userdata/conf/config.xml
@@ -21,6 +21,36 @@
<clouds/>
<slaves>
<slave>
+ <name>porter</name>
+ <description></description>
+ <remoteFS>/tmp/dev-slave1</remoteFS>
+ <numExecutors>1</numExecutors>
+ <mode>NORMAL</mode>
+ <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
+ <launcher class="hudson.slaves.CommandLauncher">
+ <agentCommand>java -jar /home/jenkins/slave.jar</agentCommand>
+ </launcher>
+ <label></label>
+ <nodeProperties>
+ <hudson.slaves.EnvironmentVariablesNodeProperty>
+ <envVars serialization="custom">
+ <unserializable-parents/>
+ <tree-map>
+ <default>
+ <comparator class="hudson.util.CaseInsensitiveComparator"/>
+ </default>
+ <int>2</int>
+ <string>BOARD_OVERLAY</string>
+ <string>boards/porter.board</string>
+ <string>DISTRIB</string>
+ <string>distribs/nologger.dist</string>
+ </tree-map>
+ </envVars>
+ </hudson.slaves.EnvironmentVariablesNodeProperty>
+ </nodeProperties>
+ <userId>anonymous</userId>
+ </slave>
+ <slave>
<name>template-dev</name>
<description></description>
<remoteFS>/tmp/dev-slave1</remoteFS>
@@ -331,4 +361,4 @@
</envVars>
</hudson.slaves.EnvironmentVariablesNodeProperty>
</globalNodeProperties>
-</hudson> \ No newline at end of file
+</hudson>
diff --git a/userdata/conf/tools.sh b/userdata/conf/tools.sh
index b56f42e..74e5d9e 100755
--- a/userdata/conf/tools.sh
+++ b/userdata/conf/tools.sh
@@ -34,7 +34,19 @@ function export_tools () {
#LDFLAGS="--sysroot ${SDKROOT} -lm"
}
-if [ "${PLATFORM}" = "lager" ];
+if [ "${PLATFORM}" = "porter" ];
+then
+ # SDKROOT=$JTA_ENGINE_PATH/tools/qemu-arm/sysroots/armv5te-osv-linux-gnueabi
+ # environment script changes PATH in the way that python uses libs from sysroot which is not what we want, so save it and use later
+ ORIG_PATH=$PATH
+ PREFIX=arm-poky-linux-gnueabi
+ source /userdata/toolchains/poky-agl/environment-setup-cortexa15hf-vfp-neon-poky-linux-gnueabi
+ SDKROOT=/userdata/toolchains/poky-agl/sysroots/cortexa15hf-vfp-neon-poky-linux-gnueabi/
+ HOST=arm-poky-linux-gnueabi
+
+ unset PYTHONHOME
+ env -u PYTHONHOME
+elif [ "${PLATFORM}" = "lager" ];
then
SDKROOT=/userdata/toolchains/lager-poky-toolchain/sysroots/cortexa15hf-vfp-neon-poky-linux-gnueabi
# environment script changes PATH in the way that python uses libs from sysroot which is not what we want, so save it and use later