Merge lp:~mvo/snapweb/new-snappy into lp:~snappy-dev/snapweb/trunk

[Michael Vogt]

Update webdm for new github snappy location and document some missing bits.

This also merges some bits from chipaca.

[lp:~mvo/snapweb/new-snappy]

169. By Michael Vogt on 2015-11-13

README.md: add missing gcc-aarch64-linux-gnu

[Sergio Schvezov (sergiusens)]

mind merging all of Chipaca's changes?

[lp:~mvo/snapweb/new-snappy]

170. By Michael Vogt on 2015-11-13

README.md: add missing ubuntu-snappy-cli dependency

171. By Michael Vogt on 2015-11-13

pkg/meta/package.yaml: use a string for the version

172. By Michael Vogt on 2015-11-13

merged lp:~chipaca/webdm/mdns-nicer-with-ipv6

[Michael Vogt (mvo)]

All of those should be merged now.

[Sergio Schvezov (sergiusens)]

review: Approve

[Michael Vogt (mvo)]

Well, this is a mess. When I build this package I can not remove any snap from webdm. I get "Error: snappy package not found".

review: Needs Fixing

[lp:~mvo/snapweb/new-snappy]

173. By Michael Vogt on 2015-12-03

bump version

174. By Michael Vogt on 2015-12-03

dependencies.tsv: use the latest 15.04 revno for the webdm build

175. By Michael Vogt on 2015-12-03

improve README.md, 15.10 is the only rev that can build webdm at this point

[Michael Vogt (mvo)]

Removing works now, I was a bad build (or rather a outdated dependencies.tsv). This works on 15.04 now.

However this will only work with 15.04 because its build with the 15.04 version of snappy and it will try to run sc-seccomp which is no longer available on 16.04. When build against the 16.04 snappy it will break on 15.04 because it expect the apparmor files in a different location.

So to summarize. We need a new webdm that works against the REST API or we need a webdm15.04 and a webdm16.04 in the store.

[Michael Vogt (mvo)]

Ups, "it was a bad build" of course.

Unmerged revisions

175. By Michael Vogt on 2015-12-03

improve README.md, 15.10 is the only rev that can build webdm at this point

174. By Michael Vogt on 2015-12-03

dependencies.tsv: use the latest 15.04 revno for the webdm build

173. By Michael Vogt on 2015-12-03

bump version

172. By Michael Vogt on 2015-11-13

merged lp:~chipaca/webdm/mdns-nicer-with-ipv6

171. By Michael Vogt on 2015-11-13

pkg/meta/package.yaml: use a string for the version

170. By Michael Vogt on 2015-11-13

README.md: add missing ubuntu-snappy-cli dependency

169. By Michael Vogt on 2015-11-13

README.md: add missing gcc-aarch64-linux-gnu

168. By Michael Vogt on 2015-11-13

we also need linux-libc-dev:i386

167. By Michael Vogt on 2015-11-13

its github.com now

166. By Michael Vogt on 2015-11-13

libc6-dev-i386 is also needed to build

=== modified file 'README.md'
--- README.md	2015-05-07 08:25:48 +0000
+++ README.md	2015-12-03 08:16:49 +0000
@@ -2,10 +2,25 @@
 
 ## Prerequisites
 
-This assumes you have a working go environment with a GOPATH env var setup
-and nodejs and npm installed:
-
-    sudo apt-get install nodejs-legacy npm
+This assumes you have a working go environment with a GOPATH env var setup.
+Make sure you have the full multiarch cross build env on 15.10+
+(15.04 won't be able to build arm64):
+
+    sudo dpkg --add-architecture i386
+    sudo apt update
+    sudo apt install -y libc6-dev-i386
+    sudo apt install -y linux-libc-dev linux-libc-dev:i386
+    sudo apt install -y ubuntu-snappy-cli
+    sudo apt install -y gcc-arm-linux-gnueabihf
+    sudo apt install -y gcc-aarch64-linux-gnu
+
+Also the full golang with cross-build:
+
+    sudo apt install -y golang-go
+
+Plus ensure that nodejs and npm are installed:
+
+    sudo apt install -y nodejs-legacy npm
 
 Install global npm modules without sudo:
 
@@ -42,7 +57,7 @@
 
 # Installing
 
-Once you have a click package you can install it onto a remote snappy system
+Once you have a snap package you can install it onto a remote snappy system
 by running
 
      snappy-remote --url ssh://localhost:8022 install [package]

=== modified file 'avahi/avahi.go'
--- avahi/avahi.go	2015-05-07 23:00:26 +0000
+++ avahi/avahi.go	2015-12-03 08:16:49 +0000
@@ -39,18 +39,22 @@
 )
 
 const timeoutMinutes = 10
-const inAddr = `%s.local. 60 IN A %s`
-const inPtr = `%s.in-addr.arpa. 60 IN PTR %s.local.`
+const in4Addr = `%s.local. 60 IN A %s`
+const in6Addr = `%s.local. 60 in AAAA %s`
 
 var mdnsPublish = mdns.Publish
 
-func tryPublish(hostname, ip string) {
-	rr := fmt.Sprintf(inAddr, hostname, ip)
+func tryPublish(hostname string, ip net.IP) {
+	inAddr := in4Addr
+	if ip.To4() == nil {
+		inAddr = in6Addr
+	}
+	rr := fmt.Sprintf(inAddr, hostname, ip.String())
 
 	logger.Println("Publishing", rr)
 
 	if err := mdnsPublish(rr); err != nil {
-		logger.Printf(`Unable to publish record "%s": %v`, rr, err)
+		logger.Printf(`Unable to publish record %q: %v`, rr, err)
 		return
 	}
 }
@@ -102,17 +106,17 @@
 		return
 	}
 
-	if strings.ContainsRune(hostname, '.') {
-		hostname = strings.Split(hostname, ".")[0]
+	if idx := strings.IndexByte(hostname, '.'); idx > -1 {
+		hostname = hostname[:idx]
 	}
 
 	if hostname == hostnameLocalhost {
 		hostname = hostnameWedbm
 	}
 
-	for _, ip := range addrs {
-		ip := strings.Split(ip.String(), "/")[0]
-		if strings.HasPrefix(ip, "127.") {
+	for _, addr := range addrs {
+		ip, _, err := net.ParseCIDR(addr.String())
+		if ip == nil || err != nil || ip.IsLoopback() {
 			continue
 		}
 

=== modified file 'build.sh'
--- build.sh	2015-05-26 13:34:13 +0000
+++ build.sh	2015-12-03 08:16:49 +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 'dependencies.tsv'
--- dependencies.tsv	2015-05-07 18:53:42 +0000
+++ dependencies.tsv	2015-12-03 08:16:49 +0000
@@ -4,9 +4,11 @@
 github.com/davecheney/mdns	git	de174d86a3d3e87bfad9cb66cedd0433380b67b0	2014-09-13T23:56:41Z
 github.com/gorilla/context	git	50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da	2014-11-26T16:34:05Z
 github.com/gorilla/mux	git	e444e69cbd2e2e3e0749a2f3c717cec491552bbf	2014-09-26T15:38:14Z
-github.com/juju/loggo	git	4c7cbce140ca070eeb59a28f4bf9507e511711f9	2015-02-26T05:51:10Z
+github.com/gosexy/gettext	git	98b7b91596d20b96909e6b60d57411547dd9959c	2013-02-21T11:21:43Z
 github.com/miekg/dns	git	5a357a6fc5e85268b929350aa6423e2d56dcc4ff	2015-04-18T05:52:30Z
 github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
+github.com/mvo5/uboot-go	git	361f6ebcbb54f389d15dc9faefa000e996ba3e37	2015-07-22T06:53:46Z
+github.com/ubuntu-core/snappy	git	0b7a98c6dbd4d46c0f548806254ac722e72a2158	2015-11-13T09:05:44Z
 gopkg.in/check.v1	git	64131543e7896d5bcc6bd5a76287eb75ea96c673	2014-10-24T13:38:53Z
 gopkg.in/yaml.v2	git	49c95bdc21843256fb6c4e0d370a05f24a0bf213	2015-02-24T22:57:58Z
-launchpad.net/snappy	bzr	snappy_tarmac-20150507103214-pgd90adryua6v6wi	444
+launchpad.net/goyaml	bzr	[e-mail]-20140305200416-7gh64vkcckre5mob	51

=== modified file 'oem/oem.go'
--- oem/oem.go	2015-05-08 19:21:46 +0000
+++ oem/oem.go	2015-12-03 08:16:49 +0000
@@ -22,12 +22,13 @@
 	"io/ioutil"
 	"path/filepath"
 
-	"launchpad.net/snappy/snappy"
+	"github.com/ubuntu-core/snappy/pkg"
+	"github.com/ubuntu-core/snappy/snappy"
 
 	"gopkg.in/yaml.v2"
 )
 
-// Snap holds the package.yaml for a snappy.SnapTypeOem package.
+// Snap holds the package.yaml for a pkg.TypeOem package.
 type Snap struct {
 	Name     string `yaml:"name" json:"name"`
 	Vendor   string `yaml:"vendor" json:"vendor"`
@@ -46,7 +47,7 @@
 // ErrNotFound indicates that there is no oem package.
 var ErrNotFound = errors.New("no oem package installed")
 
-// ErrTooMany indicates that there are too many active snappy.SnapTypeOem packages, which
+// ErrTooMany indicates that there are too many active pkg.TypeOem packages, which
 // should never happen on a snappy managed system.
 var ErrTooMany = errors.New("too many oem packages found")
 
@@ -56,7 +57,7 @@
 
 // Oem returns an oem package
 func Oem() (*Snap, error) {
-	oem, err := snappy.ActiveSnapsByType(snappy.SnapTypeOem)
+	oem, err := snappy.ActiveSnapsByType(pkg.TypeOem)
 	if err != nil {
 		return nil, err
 	} else if len(oem) > 1 {

=== removed directory 'pkg/meta/hooks'
=== removed file 'pkg/meta/hooks/config'
--- pkg/meta/hooks/config	2015-02-27 16:35:54 +0000
+++ pkg/meta/hooks/config	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-#!/usr/bin/python3
-"""python3 hook for webdm"""
-
-import configparser
-import os
-import subprocess
-import sys
-import yaml
-
-
-WEBDM_DATA_PATH = os.environ['SNAP_APP_DATA_PATH']
-WEBDM_VERSION = os.environ['SNAP_VERSION']
-AVAHI_CONFIG_FILE = os.path.join(WEBDM_DATA_PATH, 'avahi-daemon.conf')
-
-def main():
-    """main is the main function"""
-
-    config_yaml = yaml.load(sys.stdin)
-    if config_yaml:
-        avahi_config = set_config(config_yaml)
-
-        with open(AVAHI_CONFIG_FILE, 'w') as config:
-            avahi_config.write(config, space_around_delimiters=False)
-
-    yaml.dump(get_config(), stream=sys.stdout, default_flow_style=False)
-    sys.exit(0)
-
-
-def set_config(config_yaml):
-    """set_config sets a configuration and returns avahi_config"""
-
-    restart_avahi = False
-
-    config = config_yaml['config']['webdm']
-
-    avahi_config = configparser.ConfigParser()
-    avahi_config.read(AVAHI_CONFIG_FILE)
-
-    if 'avahi-hostname' in config:
-        avahi_config['server']['host-name'] = config['avahi-hostname']
-        restart_avahi = True
-
-    if restart_avahi:
-        avahi_unit = 'webdm_avahi_%s.service' % WEBDM_VERSION
-        try:
-            subprocess.check_call(['systemctl', 'restart', avahi_unit])
-        except subprocess.CalledProcessError:
-            print("Cannot restart required services to fully apply "
-                  "the configuration changes")
-
-    return avahi_config
-
-
-def get_config():
-    """get_config returns config with the current configuration"""
-
-    config = {}
-    config['config'] = {}
-    config['config']['webdm'] = {}
-
-    avahi_config = configparser.ConfigParser()
-    avahi_config.read(AVAHI_CONFIG_FILE)
-
-    hostname = avahi_config['server']['host-name']
-    config['config']['webdm']['avahi-hostname'] = hostname
-
-    return config
-
-if __name__ == '__main__':
-    main()

=== modified file 'pkg/meta/package.yaml'
--- pkg/meta/package.yaml	2015-06-10 14:41:19 +0000
+++ pkg/meta/package.yaml	2015-12-03 08:16:49 +0000
@@ -3,8 +3,8 @@
 icon: meta/webdm-icon.png
 source: lp:webdm
 type: framework
-version: 0.9
-architecture: UNKNOWN_ARCH
+version: "0.11"
+architectures: UNKNOWN_ARCH
 services:
     - name: snappyd
       start: snappyd

=== modified file 'pkg/snappyd'
--- pkg/snappyd	2015-05-21 22:24:32 +0000
+++ pkg/snappyd	2015-12-03 08:16:49 +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

=== modified file 'snappy/common_test.go'
--- snappy/common_test.go	2015-05-07 15:37:12 +0000
+++ snappy/common_test.go	2015-12-03 08:16:49 +0000
@@ -20,7 +20,7 @@
 import (
 	"testing"
 
-	"launchpad.net/snappy/snappy"
+	"github.com/ubuntu-core/snappy/snappy"
 
 	. "gopkg.in/check.v1"
 )

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-08 15:22:21 +0000
+++ snappy/converge.go	2015-12-03 08:16:49 +0000
@@ -25,7 +25,8 @@
 
 	"log"
 
-	"launchpad.net/snappy/snappy"
+	"github.com/ubuntu-core/snappy/snappy"
+	"github.com/ubuntu-core/snappy/pkg"
 	"launchpad.net/webdm/webprogress"
 )
 
@@ -43,7 +44,7 @@
 	Progress      float64            `json:"progress,omitempty"`
 	InstalledSize int64              `json:"installed_size,omitempty"`
 	DownloadSize  int64              `json:"download_size,omitempty"`
-	Type          snappy.SnapType    `json:"type,omitempty"`
+	Type          pkg.Type           `json:"type,omitempty"`
 	UIPort        uint64             `json:"ui_port,omitempty"`
 	UIUri         string             `json:"ui_uri,omitempty"`
 }
@@ -63,10 +64,10 @@
 var activeSnapByName = snappy.ActiveSnapByName
 
 func (h *Handler) packagePayload(resource string) (snapPkg, error) {
-	var pkgName, namespace string
+	var pkgName, origin string
 	if s := strings.Split(resource, "."); len(s) == 2 {
 		pkgName = s[0]
-		namespace = s[1]
+		origin = s[1]
 	} else {
 		pkgName = resource
 	}
@@ -74,13 +75,13 @@
 	snapQ := activeSnapByName(pkgName)
 	if snapQ != nil {
 		// the second check is for locally installed snaps that lose their origin.
-		if snapQ.Namespace() == namespace || snapQ.Type() != snappy.SnapTypeApp {
+		if snapQ.Origin() == origin || snapQ.Type() != pkg.TypeApp {
 			return h.snapQueryToPayload(snapQ), nil
 		}
 	}
 
 	mStore := snappy.NewMetaStoreRepository()
-	found, err := mStore.Details(resource)
+	found, err := mStore.Details(pkgName, origin)
 	if err == nil && len(found) != 0 {
 		return h.snapQueryToPayload(found[0]), nil
 	}
@@ -225,33 +226,24 @@
 	return snapPkgs
 }
 
-func isNamespaceless(snap snappy.Part) bool {
-	return snap.Type() == snappy.SnapTypeOem || snap.Type() == snappy.SnapTypeFramework
-}
-
 func hasPortInformation(snap snappy.Part) bool {
-	return snap.Type() == snappy.SnapTypeApp || snap.Type() == snappy.SnapTypeFramework
+	return snap.Type() == pkg.TypeApp || snap.Type() == pkg.TypeFramework
 }
 
 func (h *Handler) snapQueryToPayload(snapQ snappy.Part) snapPkg {
 	snap := snapPkg{
 		Name:        snapQ.Name(),
-		Origin:      snapQ.Namespace(),
+		Origin:      snapQ.Origin(),
 		Version:     snapQ.Version(),
 		Vendor:      snapQ.Vendor(),
 		Description: snapQ.Description(),
 		Type:        snapQ.Type(),
-	}
-
-	if isNamespaceless(snapQ) {
-		snap.ID = snapQ.Name()
-	} else {
-		snap.ID = snapQ.Name() + "." + snapQ.Namespace()
+		ID:          snappy.QualifiedName(snapQ),
 	}
 
 	if hasPortInformation(snapQ) {
-		if snapInstalled, ok := snapQ.(snappy.Services); ok {
-			port, uri := uiAccess(snapInstalled.Services())
+		if snapInstalled, ok := snapQ.(snappy.ServiceYamler); ok {
+			port, uri := uiAccess(snapInstalled.ServiceYamls())
 			snap.UIPort = port
 			snap.UIUri = uri
 		}
@@ -293,7 +285,7 @@
 	return snap
 }
 
-func uiAccess(services []snappy.Service) (port uint64, uri string) {
+func uiAccess(services []snappy.ServiceYaml) (port uint64, uri string) {
 	for i := range services {
 		if services[i].Ports == nil {
 			continue

=== modified file 'snappy/converge_test.go'
--- snappy/converge_test.go	2015-05-07 15:37:12 +0000
+++ snappy/converge_test.go	2015-12-03 08:16:49 +0000
@@ -23,7 +23,7 @@
 	"path/filepath"
 
 	. "gopkg.in/check.v1"
-	"launchpad.net/snappy/snappy"
+	"github.com/ubuntu-core/snappy/snappy"
 	"launchpad.net/webdm/webprogress"
 )
 

=== modified file 'snappy/handlers.go'
--- snappy/handlers.go	2015-05-08 14:56:30 +0000
+++ snappy/handlers.go	2015-12-03 08:16:49 +0000
@@ -24,7 +24,7 @@
 	"net/http"
 	"strings"
 
-	"launchpad.net/snappy/snappy"
+	"github.com/ubuntu-core/snappy/snappy"
 	"launchpad.net/webdm/webprogress"
 
 	"github.com/gorilla/mux"

=== modified file 'webprogress/meter.go'
--- webprogress/meter.go	2015-05-06 17:14:44 +0000
+++ webprogress/meter.go	2015-12-03 08:16:49 +0000
@@ -17,7 +17,7 @@
 
 package webprogress
 
-import "launchpad.net/snappy/progress"
+import "github.com/ubuntu-core/snappy/progress"
 
 // Operation indicates the desired operation to perform
 type Operation uint