Merge branch 'master'

src/tools/pkg/deb/pwrrpi/README

 
 	Package pwrrpi containing runtime archives compiled with crosscompiler for raspbian on Raspberry PI.
 
-	1. Setup toolchain
+	1. Install cross compiler
 
-	mkdir /usr/local/rpi
-	cd /usr/local/rpi
-	git clone git://github.com/raspberrypi/tools.git
-	git checkout 9c3d7b6ac692498dd36fec2872e0b55f910baac1  # There is a bug in the latest commit 
+	sudo apt-get install gcc-6-arm-linux-gnueabihf-base
+	                     gcc-6-arm-linux-gnueabihf
+                             g++-6-arm-linux-gnueabihf
 
-	On 64-bit ubuntu:
-	sudo apt-get install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 lib32z1 lib32ncurses5 lib32bz2-1.0
+	2. Define pwre links to the cross compiler
 
-	On 64-bit debian:
-	sudo dpkg -add-architecture i386
-	sudo apt-get update
-	sudo apt-get install ia32-libs
-
-	2. Define pwre links to the compiler tools
-
-	export pwre_cc=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc
-	export pwre_cxx=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++
-	export pwre_ar=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-ar
+	export pwre_cc=arm-linux-gnueabihf-gcc-6
+	export pwre_cxx=arm-linux-gnueabihf-g++-6
+	export pwre_ar=arm-linux-gnueabihf-ar
 
 	3. Define a link to the exe directory of the host release
 

src/tools/pkg/ubu/pwrrpi/README

 
 	Package pwrrpi containing runtime archives compiled with crosscompiler for raspbian on Raspberry PI.
 
-	1. Setup toolchain
+	1. Install cross compiler
 
-	mkdir /usr/local/rpi
-	cd /usr/local/rpi
-	git clone git://github.com/raspberrypi/tools.git
-	git checkout 9c3d7b6ac692498dd36fec2872e0b55f910baac1  # There is a bug in the latest commit 
+	sudo apt-get install gcc-6-arm-linux-gnueabihf-base
+	                     gcc-6-arm-linux-gnueabihf
+                             g++-6-arm-linux-gnueabihf
 
-	On 64-bit ubuntu:
-	sudo apt-get install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 lib32z1 lib32ncurses5 lib32bz2-1.0
+	2. Define pwre links to the cross compiler
 
-	On 64-bit debian:
-	sudo dpkg -add-architecture i386
-	sudo apt-get update
-	sudo apt-get install ia32-libs
-
-	2. Define pwre links to the compiler tools
-
-	export pwre_cc=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc
-	export pwre_cxx=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++
-	export pwre_ar=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-ar
+	export pwre_cc=arm-linux-gnueabihf-gcc-6
+	export pwre_cxx=arm-linux-gnueabihf-g++-6
+	export pwre_ar=arm-linux-gnueabihf-ar
 
 	3. Define a link to the exe directory of the host release
 

src/tools/pkg/ubu_x86_64/pwrrpi/README

 
 	Package pwrrpi containing runtime archives compiled with crosscompiler for raspbian on Raspberry PI.
 
-	1. Setup toolchain
+	1. Install cross compiler
 
-	mkdir /usr/local/rpi
-	cd /usr/local/rpi
-	git clone git://github.com/raspberrypi/tools.git
-	git checkout 9c3d7b6ac692498dd36fec2872e0b55f910baac1  # There is a bug in the latest commit 
+	sudo apt-get install gcc-6-arm-linux-gnueabihf-base
+	                     gcc-6-arm-linux-gnueabihf
+                             g++-6-arm-linux-gnueabihf
 
-	On 64-bit ubuntu:
-	sudo apt-get install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 lib32z1 lib32ncurses5 lib32bz2-1.0
+	2. Define pwre links to the cross compiler
 
-	On 64-bit debian:
-	sudo dpkg -add-architecture i386
-	sudo apt-get update
-	sudo apt-get install ia32-libs
-
-	2. Define pwre links to the compiler tools
-
-	export pwre_cc=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc
-	export pwre_cxx=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++
-	export pwre_ar=/usr/local/rpi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-ar
+	export pwre_cc=arm-linux-gnueabihf-gcc-6
+	export pwre_cxx=arm-linux-gnueabihf-g++-6
+	export pwre_ar=arm-linux-gnueabihf-ar
 
 	3. Define a link to the exe directory of the host release
 

src/wbl/pwrs/src/pwrs_td_opsysenum.wb_load

@@ -48,6 +48,16 @@ SObject pwrs:Type
       Attr PgmName = "OpSysEnum"
     EndBody
     !/**
+    !  Operating is defined in CustomBuild
+    !*/
+    Object CustomBuild $Value
+     Body SysBody
+       Attr PgmName = "CustomBuild"
+       Attr Text = "CustomBuild"
+       Attr Value = 1
+     EndBody
+    EndObject
+    !/**
     !  Operating system is Linux on PowerPC
     !*/
     Object PPC_LINUX $Value

src/wbl/pwrs/src/pwrs_td_opsysmask.wb_load

@@ -51,6 +51,16 @@ SObject pwrs:Type
       Attr PgmName = "OpSysMask"
     EndBody
     !/**
+    !  Operating system is defined in CustomBuild
+    !*/
+    Object CustomBuild $Bit
+     Body SysBody
+       Attr PgmName = "CustomBuild"
+       Attr Text = "CustomBuild"
+       Attr Value = 1
+     EndBody
+    EndObject
+    !/**
     !  Operating system is Linux on PowerPC
     !*/
     Object PPC_LINUX $Bit