From 77db53b93293d0f62faa8ff4f965a03689fdd60a Mon Sep 17 00:00:00 2001 From: Trong Nghia Nguyen Date: Sat, 5 May 2018 19:29:19 +0200 Subject: [PATCH 1/4] Re-organize contracts directory structure --- contracts/arch.sw/armel/contract.json | 12 +++++------ contracts/arch.sw/armhf/contract.json | 19 +++++------------- contracts/arch.sw/armv7hf/contract.json | 12 +++++------ contracts/arch.sw/rpi/contract.json | 12 +++++------ .../boot-external.tpl | 0 .../boot-internal.tpl | 0 .../prepare-network.tpl | 0 .../via-vab820-quad/contract.json | 20 ------------------- 8 files changed, 23 insertions(+), 52 deletions(-) rename contracts/hw.device-type/{via-vab820-quad => vab820-quad}/boot-external.tpl (100%) rename contracts/hw.device-type/{via-vab820-quad => vab820-quad}/boot-internal.tpl (100%) rename contracts/hw.device-type/{via-vab820-quad => vab820-quad}/prepare-network.tpl (100%) delete mode 100644 contracts/hw.device-type/via-vab820-quad/contract.json diff --git a/contracts/arch.sw/armel/contract.json b/contracts/arch.sw/armel/contract.json index b5cc061c..08767067 100644 --- a/contracts/arch.sw/armel/contract.json +++ b/contracts/arch.sw/armel/contract.json @@ -3,13 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v5", - "data": { "arch": "armel" }, + "arch": "armel", "requires": [ { - "type": "hw.device-type", - "data": { - "arch": "armel" - } + "or": [ + { "type": "hw.device-type", "arch": "armel" } + ] } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/armhf/contract.json b/contracts/arch.sw/armhf/contract.json index 39a48fd2..3b1ec147 100644 --- a/contracts/arch.sw/armhf/contract.json +++ b/contracts/arch.sw/armhf/contract.json @@ -3,23 +3,14 @@ "version": "1", "type": "arch.sw", "name": "ARM Hard Float", - "data": { "arch": "armhf" }, + "arch": "armhf", "requires": [ { "or": [ - { - "type": "hw.device-type", - "data": { - "arch": "armv7hf" - } - }, - { - "type": "hw.device-type", - "data": { - "arch": "rpi" - } - } + { "type": "hw.device-type", "arch": "armv7hf" }, + { "type": "hw.device-type", "arch": "rpi" } ] } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/armv7hf/contract.json b/contracts/arch.sw/armv7hf/contract.json index 9f907917..416f20da 100644 --- a/contracts/arch.sw/armv7hf/contract.json +++ b/contracts/arch.sw/armv7hf/contract.json @@ -3,13 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v7", - "data": { "arch": "armv7hf" }, + "arch": "armv7hf", "requires": [ { - "type": "hw.device-type", - "data": { - "arch": "armv7hf" - } + "or": [ + { "type": "hw.device-type", "arch": "armv7hf" } + ] } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/rpi/contract.json b/contracts/arch.sw/rpi/contract.json index 023c5c1c..67695ef5 100644 --- a/contracts/arch.sw/rpi/contract.json +++ b/contracts/arch.sw/rpi/contract.json @@ -3,13 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v6", - "data": { "arch": "armv6hf" }, + "arch": "armv6hf", "requires": [ { - "type": "hw.device-type", - "data": { - "arch": "rpi" - } + "or": [ + { "type": "hw.device-type", "arch": "rpi" } + ] } - ] + ], + "variants": "" } diff --git a/contracts/hw.device-type/via-vab820-quad/boot-external.tpl b/contracts/hw.device-type/vab820-quad/boot-external.tpl similarity index 100% rename from contracts/hw.device-type/via-vab820-quad/boot-external.tpl rename to contracts/hw.device-type/vab820-quad/boot-external.tpl diff --git a/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl b/contracts/hw.device-type/vab820-quad/boot-internal.tpl similarity index 100% rename from contracts/hw.device-type/via-vab820-quad/boot-internal.tpl rename to contracts/hw.device-type/vab820-quad/boot-internal.tpl diff --git a/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl b/contracts/hw.device-type/vab820-quad/prepare-network.tpl similarity index 100% rename from contracts/hw.device-type/via-vab820-quad/prepare-network.tpl rename to contracts/hw.device-type/vab820-quad/prepare-network.tpl diff --git a/contracts/hw.device-type/via-vab820-quad/contract.json b/contracts/hw.device-type/via-vab820-quad/contract.json deleted file mode 100644 index c7d0c4da..00000000 --- a/contracts/hw.device-type/via-vab820-quad/contract.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "slug": "via-vab820-quad", - "version": "1", - "type": "hw.device-type", - "name": "VIA vab820", - "data": { - "arch": "armv7hf", - "hdmi": true, - "led": false, - "connectivity": { - "bluetooth": true - }, - "storage": { - "internal": true - }, - "media": { - "installation": "sdcard" - } - } -} From bb39871be0c3281181d9188c6c9e387099cae0fc Mon Sep 17 00:00:00 2001 From: Trong Nghia Nguyen Date: Wed, 9 May 2018 09:49:36 +0700 Subject: [PATCH 2/4] Update comments --- contracts/arch.sw/armel/contract.json | 12 ++++++------ contracts/arch.sw/armhf/contract.json | 19 ++++++++++++++----- contracts/arch.sw/armv7hf/contract.json | 12 ++++++------ contracts/arch.sw/rpi/contract.json | 12 ++++++------ .../boot-external.tpl | 0 .../boot-internal.tpl | 0 .../prepare-network.tpl | 0 7 files changed, 32 insertions(+), 23 deletions(-) rename contracts/hw.device-type/{vab820-quad => via-vab820-quad}/boot-external.tpl (100%) rename contracts/hw.device-type/{vab820-quad => via-vab820-quad}/boot-internal.tpl (100%) rename contracts/hw.device-type/{vab820-quad => via-vab820-quad}/prepare-network.tpl (100%) diff --git a/contracts/arch.sw/armel/contract.json b/contracts/arch.sw/armel/contract.json index 08767067..b5cc061c 100644 --- a/contracts/arch.sw/armel/contract.json +++ b/contracts/arch.sw/armel/contract.json @@ -3,13 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v5", - "arch": "armel", + "data": { "arch": "armel" }, "requires": [ { - "or": [ - { "type": "hw.device-type", "arch": "armel" } - ] + "type": "hw.device-type", + "data": { + "arch": "armel" + } } - ], - "variants": "" + ] } diff --git a/contracts/arch.sw/armhf/contract.json b/contracts/arch.sw/armhf/contract.json index 3b1ec147..39a48fd2 100644 --- a/contracts/arch.sw/armhf/contract.json +++ b/contracts/arch.sw/armhf/contract.json @@ -3,14 +3,23 @@ "version": "1", "type": "arch.sw", "name": "ARM Hard Float", - "arch": "armhf", + "data": { "arch": "armhf" }, "requires": [ { "or": [ - { "type": "hw.device-type", "arch": "armv7hf" }, - { "type": "hw.device-type", "arch": "rpi" } + { + "type": "hw.device-type", + "data": { + "arch": "armv7hf" + } + }, + { + "type": "hw.device-type", + "data": { + "arch": "rpi" + } + } ] } - ], - "variants": "" + ] } diff --git a/contracts/arch.sw/armv7hf/contract.json b/contracts/arch.sw/armv7hf/contract.json index 416f20da..9f907917 100644 --- a/contracts/arch.sw/armv7hf/contract.json +++ b/contracts/arch.sw/armv7hf/contract.json @@ -3,13 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v7", - "arch": "armv7hf", + "data": { "arch": "armv7hf" }, "requires": [ { - "or": [ - { "type": "hw.device-type", "arch": "armv7hf" } - ] + "type": "hw.device-type", + "data": { + "arch": "armv7hf" + } } - ], - "variants": "" + ] } diff --git a/contracts/arch.sw/rpi/contract.json b/contracts/arch.sw/rpi/contract.json index 67695ef5..023c5c1c 100644 --- a/contracts/arch.sw/rpi/contract.json +++ b/contracts/arch.sw/rpi/contract.json @@ -3,13 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v6", - "arch": "armv6hf", + "data": { "arch": "armv6hf" }, "requires": [ { - "or": [ - { "type": "hw.device-type", "arch": "rpi" } - ] + "type": "hw.device-type", + "data": { + "arch": "rpi" + } } - ], - "variants": "" + ] } diff --git a/contracts/hw.device-type/vab820-quad/boot-external.tpl b/contracts/hw.device-type/via-vab820-quad/boot-external.tpl similarity index 100% rename from contracts/hw.device-type/vab820-quad/boot-external.tpl rename to contracts/hw.device-type/via-vab820-quad/boot-external.tpl diff --git a/contracts/hw.device-type/vab820-quad/boot-internal.tpl b/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl similarity index 100% rename from contracts/hw.device-type/vab820-quad/boot-internal.tpl rename to contracts/hw.device-type/via-vab820-quad/boot-internal.tpl diff --git a/contracts/hw.device-type/vab820-quad/prepare-network.tpl b/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl similarity index 100% rename from contracts/hw.device-type/vab820-quad/prepare-network.tpl rename to contracts/hw.device-type/via-vab820-quad/prepare-network.tpl From e18459cebeb31e0611e8deebadb1e1f98f00d62c Mon Sep 17 00:00:00 2001 From: Giovanni Garufi Date: Fri, 18 May 2018 13:00:51 +0200 Subject: [PATCH 3/4] Added supervisor contract under sw.blob.os-supervisor. Moved etcher contract under sw.blob.image-writer Change-type: minor --- .../etcher/flash.tpl | 0 contracts/sw.blob/image-writer/download.tpl | 1 + .../image-writer}/etcher/contract.json | 7 ++++--- .../sw.blob/os-supervisor/supervisor/contract.json | 14 ++++++++++++++ contracts/sw.image-writer/download.tpl | 1 - 5 files changed, 19 insertions(+), 4 deletions(-) rename contracts/{sw.image-writer+hw.device-type => sw.blob.image-writer+hw.device-type}/etcher/flash.tpl (100%) create mode 100644 contracts/sw.blob/image-writer/download.tpl rename contracts/{sw.image-writer => sw.blob/image-writer}/etcher/contract.json (67%) create mode 100644 contracts/sw.blob/os-supervisor/supervisor/contract.json delete mode 100644 contracts/sw.image-writer/download.tpl diff --git a/contracts/sw.image-writer+hw.device-type/etcher/flash.tpl b/contracts/sw.blob.image-writer+hw.device-type/etcher/flash.tpl similarity index 100% rename from contracts/sw.image-writer+hw.device-type/etcher/flash.tpl rename to contracts/sw.blob.image-writer+hw.device-type/etcher/flash.tpl diff --git a/contracts/sw.blob/image-writer/download.tpl b/contracts/sw.blob/image-writer/download.tpl new file mode 100644 index 00000000..f0c8d6c9 --- /dev/null +++ b/contracts/sw.blob/image-writer/download.tpl @@ -0,0 +1 @@ +[Download {{sw.blob.image-writer.name}} v{{sw.blob.image-writer.version}}]({{sw.blob.image-writer.assets.bin.url}}) diff --git a/contracts/sw.image-writer/etcher/contract.json b/contracts/sw.blob/image-writer/etcher/contract.json similarity index 67% rename from contracts/sw.image-writer/etcher/contract.json rename to contracts/sw.blob/image-writer/etcher/contract.json index ccfa4d9e..f4711bac 100644 --- a/contracts/sw.image-writer/etcher/contract.json +++ b/contracts/sw.blob/image-writer/etcher/contract.json @@ -1,11 +1,12 @@ { "slug": "etcher", - "type": "sw.image-writer", + "type": "sw.blob.image-writer", "name": "Etcher for macOS", - "version": "1.1.2", + "version": "1", + "componentVersion": "1.1.2", "assets": { "bin": { - "url": "https://github.com/resin-io/etcher/releases/download/v{{version}}/Etcher-{{version}}.dmg", + "url": "https://github.com/resin-io/etcher/releases/download/v{{componentVersion}}/Etcher-{{version}}.dmg", "checksum": "b562c7ff89e0de86003ee1cc14a1ee08ab5988a543b6e22235fe3773a48074a4", "checksumType": "sha256" } diff --git a/contracts/sw.blob/os-supervisor/supervisor/contract.json b/contracts/sw.blob/os-supervisor/supervisor/contract.json new file mode 100644 index 00000000..88135ada --- /dev/null +++ b/contracts/sw.blob/os-supervisor/supervisor/contract.json @@ -0,0 +1,14 @@ +{ + "slug": "supervisor", + "type": "sw.supervisor", + "name": "resin supervisor", + "version": "1", + "componentVersion": "7.5.6", + "assets": { + "bin": { + "url": "https://github.com/resin-io/resin-supervisor/archive/v{{componentVersion}}.tar.gz", + "checksum": "b562c7ff89e0de86003ee1cc14a1ee08ab5988a543b6e22235fe3773a48074a4", + "checksumType": "sha256" + } + } +} diff --git a/contracts/sw.image-writer/download.tpl b/contracts/sw.image-writer/download.tpl deleted file mode 100644 index 5a25755d..00000000 --- a/contracts/sw.image-writer/download.tpl +++ /dev/null @@ -1 +0,0 @@ -[Download {{sw.image-writer.name}} v{{sw.image-writer.version}}]({{sw.image-writer.assets.bin.url}}) From cc955bb51b9ec3c41512d78c6a3020255c4e930c Mon Sep 17 00:00:00 2001 From: Giovanni Garufi Date: Mon, 28 May 2018 11:45:03 +0200 Subject: [PATCH 4/4] Changed etcher and supervisor contract type --- contracts/sw.blob/{image-writer => }/etcher/contract.json | 2 +- contracts/sw.blob/{image-writer => etcher}/download.tpl | 0 .../sw.blob/{os-supervisor => }/supervisor/contract.json | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename contracts/sw.blob/{image-writer => }/etcher/contract.json (91%) rename contracts/sw.blob/{image-writer => etcher}/download.tpl (100%) rename contracts/sw.blob/{os-supervisor => }/supervisor/contract.json (85%) diff --git a/contracts/sw.blob/image-writer/etcher/contract.json b/contracts/sw.blob/etcher/contract.json similarity index 91% rename from contracts/sw.blob/image-writer/etcher/contract.json rename to contracts/sw.blob/etcher/contract.json index f4711bac..c7a383f2 100644 --- a/contracts/sw.blob/image-writer/etcher/contract.json +++ b/contracts/sw.blob/etcher/contract.json @@ -1,6 +1,6 @@ { "slug": "etcher", - "type": "sw.blob.image-writer", + "type": "sw.blob", "name": "Etcher for macOS", "version": "1", "componentVersion": "1.1.2", diff --git a/contracts/sw.blob/image-writer/download.tpl b/contracts/sw.blob/etcher/download.tpl similarity index 100% rename from contracts/sw.blob/image-writer/download.tpl rename to contracts/sw.blob/etcher/download.tpl diff --git a/contracts/sw.blob/os-supervisor/supervisor/contract.json b/contracts/sw.blob/supervisor/contract.json similarity index 85% rename from contracts/sw.blob/os-supervisor/supervisor/contract.json rename to contracts/sw.blob/supervisor/contract.json index 88135ada..fc3ade7e 100644 --- a/contracts/sw.blob/os-supervisor/supervisor/contract.json +++ b/contracts/sw.blob/supervisor/contract.json @@ -1,7 +1,7 @@ { "slug": "supervisor", - "type": "sw.supervisor", - "name": "resin supervisor", + "type": "sw.blob", + "name": "Resin supervisor", "version": "1", "componentVersion": "7.5.6", "assets": {