Merge lp:~chipaca/snapweb/seriously-build-ok into lp:~snappy-dev/snapweb/trunk

[John Lenton]

Tweaks and fixes to build and package.

[Sergio Schvezov (sergiusens)]

review: Approve

[lp:~chipaca/snapweb/seriously-build-ok]

163. By John Lenton on 2015-10-01

fxi typo

Unmerged revisions

163. By John Lenton on 2015-10-01

fxi typo

162. By John Lenton on 2015-10-01

silly tweaks to build and package

161. By John Lenton on 2015-09-25

update package version

160. By John Lenton on 2015-09-25

build again, ok? ta

=== modified file 'build.sh'
--- build.sh	2015-05-26 13:34:13 +0000
+++ build.sh	2015-10-01 15:21:09 +0000
@@ -9,14 +9,17 @@
     arch=$1
 
     case $arch in
+        386)
+            plat_abi=i386-linux-gnu
+        ;;
         amd64)
             plat_abi=x86_64-linux-gnu
         ;;
         arm)
             plat_abi=arm-linux-gnueabihf
         ;;
-        armhf)
-            plat_abi=arm-linux-gnueabihf
+        arm64)
+            plat_abi=aarch64-linux-gnu
         ;;
         *)
             echo "unknown platform for snappy-magic: $arch remember to file a bug or better yet: fix it :)"
@@ -28,13 +31,33 @@
 }
 
 gobuild() {
-    arch=$1
-
-    plat_abi=$(get_platform_abi $arch)
+    local arch=$1
+    local plat_abi=$(get_platform_abi $arch)
 
     mkdir -p "bin/$plat_abi"
     cd "bin/$plat_abi"
-    GOARCH=$arch GOARM=7 CGO_ENABLED=1 CC=${plat_abi}-gcc go build -ldflags "-extld=${plat_abi}-gcc" launchpad.net/webdm/cmd/snappyd
+
+    local GOARCH CGO_ENABLED CC GO386 FLAGS
+
+    export GOARCH=$arch
+    export CGO_ENABLED=1
+
+    if [ "$arch" = "386" ]; then
+        # 386 is a special snowflake, etc
+        # also, the edison doesn't have SSE, which we might care about
+        export GO386=387
+    else
+        export CC=${plat_abi}-gcc
+        if ! which $CC > /dev/null; then
+            echo "Could not find $CC. Maybe you need to install gcc-${plat_abi}?"
+            exit 1
+        fi
+        
+        FLAGS="-ldflags -extld=$CC"
+    fi
+
+    go build $FLAGS launchpad.net/webdm/cmd/snappyd
+
     cd - > /dev/null
 }
 
@@ -55,11 +78,14 @@
 cp -r www/public www/templates $builddir/www
 cd $builddir
 
-sed -i 's/\(architecture: \)UNKNOWN_ARCH/\1[amd64, armhf]/' \
+sed -i 's/\(architectures: \)UNKNOWN_ARCH/\1[i386, amd64, armhf, arm64]/' \
     $builddir/meta/package.yaml
 
-gobuild arm
-gobuild amd64
+for arch in 386 amd64 arm arm64; do
+    echo -n Building for $arch...
+    gobuild $arch
+    echo done
+done
 
 cd "$orig_pwd"
 

=== modified file 'pkg/meta/package.yaml'
--- pkg/meta/package.yaml	2015-10-01 15:21:09 +0000
+++ pkg/meta/package.yaml	2015-10-01 15:21:09 +0000
@@ -3,8 +3,8 @@
 icon: meta/webdm-icon.png
 source: lp:webdm
 type: framework
-version: 0.9.1
-architecture: UNKNOWN_ARCH
+version: 0.9.3
+architectures: UNKNOWN_ARCH
 services:
     - name: snappyd
       start: snappyd

=== modified file 'pkg/snappyd'
--- pkg/snappyd	2015-05-21 22:24:32 +0000
+++ pkg/snappyd	2015-10-01 15:21:09 +0000
@@ -4,6 +4,12 @@
 platform=$(uname -i)
 
 case $platform in
+    i386)
+        plat_abi=i386-linux-gnu
+        ;;
+    aarch64)
+        plat_abi=aarch64-linux-gnu
+        ;;
     x86_64)
         plat_abi=x86_64-linux-gnu
         ;;
@@ -15,7 +21,6 @@
         ;;
 esac
 
-mkdir -m1777 -p $SNAP_APP_TMPDIR
 exec $SNAP_APP_PATH/bin/$plat_abi/snappyd
 
 # never reach this