From 577187c968658ae74a4be72c9fa06dfefa9aa093 Mon Sep 17 00:00:00 2001 From: Trong Nghia Nguyen Date: Fri, 4 May 2018 10:55:07 +0700 Subject: [PATCH 1/4] Update contracts schema. All contracts now must have these mandatory properties: slug, version, type, name, data, requires, variants. --- contracts/arch.sw/aarch64.json | 4 +++- contracts/arch.sw/amd64.json | 4 +++- contracts/arch.sw/armel.json | 4 +++- contracts/arch.sw/armhf.json | 4 +++- contracts/arch.sw/armv7hf.json | 4 +++- contracts/arch.sw/i386.json | 4 +++- contracts/arch.sw/rpi.json | 4 +++- contracts/hw.device-type/am571x-evm.json | 24 +++++++++++-------- contracts/hw.device-type/apalis-imx6q.json | 24 +++++++++++-------- contracts/hw.device-type/artik10.json | 24 +++++++++++-------- contracts/hw.device-type/artik5.json | 24 +++++++++++-------- contracts/hw.device-type/artik710.json | 24 +++++++++++-------- .../hw.device-type/beaglebone-black.json | 24 +++++++++++-------- .../hw.device-type/beaglebone-green-wifi.json | 24 +++++++++++-------- .../hw.device-type/beaglebone-green.json | 24 +++++++++++-------- contracts/hw.device-type/ccon-01.json | 24 +++++++++++-------- contracts/hw.device-type/colibri-imx6dl.json | 24 +++++++++++-------- contracts/hw.device-type/cybertan-ze250.json | 24 +++++++++++-------- contracts/hw.device-type/generic-aarch64.json | 24 +++++++++++-------- .../hw.device-type/generic-armv7ahf.json | 24 +++++++++++-------- contracts/hw.device-type/hummingboard.json | 24 +++++++++++-------- contracts/hw.device-type/imx6ul-var-dart.json | 24 +++++++++++-------- contracts/hw.device-type/intel-edison.json | 24 +++++++++++-------- contracts/hw.device-type/intel-nuc.json | 24 +++++++++++-------- contracts/hw.device-type/iot2000.json | 24 +++++++++++-------- contracts/hw.device-type/jetson-tx1.json | 24 +++++++++++-------- contracts/hw.device-type/jetson-tx2.json | 24 +++++++++++-------- contracts/hw.device-type/kitra520.json | 24 +++++++++++-------- contracts/hw.device-type/kitra710.json | 24 +++++++++++-------- contracts/hw.device-type/nitrogen6x.json | 24 +++++++++++-------- contracts/hw.device-type/odroid-c1.json | 24 +++++++++++-------- contracts/hw.device-type/odroid-xu4.json | 24 +++++++++++-------- contracts/hw.device-type/parallella.json | 24 +++++++++++-------- contracts/hw.device-type/qemux86-64.json | 24 +++++++++++-------- contracts/hw.device-type/qemux86.json | 24 +++++++++++-------- contracts/hw.device-type/raspberry-pi.json | 24 +++++++++++-------- contracts/hw.device-type/raspberry-pi2.json | 24 +++++++++++-------- contracts/hw.device-type/raspberrypi3.json | 24 +++++++++++-------- contracts/hw.device-type/ts4900.json | 24 +++++++++++-------- contracts/hw.device-type/ts7700.json | 24 +++++++++++-------- contracts/hw.device-type/up-board.json | 24 +++++++++++-------- contracts/hw.device-type/via-vab820-quad.json | 24 +++++++++++-------- contracts/hw.device-type/zc702-zynq7.json | 24 +++++++++++-------- contracts/sw.blob/entry.json | 13 +++++----- contracts/sw.blob/nodejs.json | 19 ++++++++------- contracts/sw.blob/qemu.json | 8 ++++--- contracts/sw.blob/resin-xbuild.json | 6 +++-- contracts/sw.blob/tini.json | 14 ++++++----- contracts/sw.image-writer/etcher.json | 6 +++-- contracts/sw.os-image/resinos.json | 5 ++-- contracts/sw.os/alpine.json | 3 ++- contracts/sw.os/debian.json | 3 ++- contracts/sw.os/fedora.json | 3 ++- contracts/sw.os/resinos.json | 5 ++-- contracts/sw.stack/go.json | 2 ++ contracts/sw.stack/java.json | 2 ++ contracts/sw.stack/nodejs.json | 2 ++ contracts/sw.stack/python.json | 2 ++ contracts/sw.variant/jdk.json | 4 +++- contracts/sw.variant/jre.json | 4 +++- contracts/sw.variant/onbuild.json | 4 +++- contracts/sw.variant/slim.json | 4 +++- 62 files changed, 595 insertions(+), 406 deletions(-) diff --git a/contracts/arch.sw/aarch64.json b/contracts/arch.sw/aarch64.json index 5e38eb3e..292cd92f 100644 --- a/contracts/arch.sw/aarch64.json +++ b/contracts/arch.sw/aarch64.json @@ -3,7 +3,9 @@ "version": "1", "type": "arch.sw", "name": "ARM v8", + "data": { "arch": "aarch64" }, "requires": [ { "type": "hw.device-type", "arch": "aarch64" } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/amd64.json b/contracts/arch.sw/amd64.json index 4bdedb9e..6e173a91 100644 --- a/contracts/arch.sw/amd64.json +++ b/contracts/arch.sw/amd64.json @@ -3,7 +3,9 @@ "version": "1", "type": "arch.sw", "name": "Intel 64-bit (x86-64)", + "data": { "arch": "amd64" }, "requires": [ { "type": "hw.device-type", "arch": "amd64" } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/armel.json b/contracts/arch.sw/armel.json index 55738688..08767067 100644 --- a/contracts/arch.sw/armel.json +++ b/contracts/arch.sw/armel.json @@ -3,11 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v5", + "arch": "armel", "requires": [ { "or": [ { "type": "hw.device-type", "arch": "armel" } ] } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/armhf.json b/contracts/arch.sw/armhf.json index a40770a2..3b1ec147 100644 --- a/contracts/arch.sw/armhf.json +++ b/contracts/arch.sw/armhf.json @@ -3,6 +3,7 @@ "version": "1", "type": "arch.sw", "name": "ARM Hard Float", + "arch": "armhf", "requires": [ { "or": [ @@ -10,5 +11,6 @@ { "type": "hw.device-type", "arch": "rpi" } ] } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/armv7hf.json b/contracts/arch.sw/armv7hf.json index 414cc4b9..416f20da 100644 --- a/contracts/arch.sw/armv7hf.json +++ b/contracts/arch.sw/armv7hf.json @@ -3,11 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v7", + "arch": "armv7hf", "requires": [ { "or": [ { "type": "hw.device-type", "arch": "armv7hf" } ] } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/i386.json b/contracts/arch.sw/i386.json index 79b6bf83..5d9f96bf 100644 --- a/contracts/arch.sw/i386.json +++ b/contracts/arch.sw/i386.json @@ -3,11 +3,13 @@ "version": "1", "type": "arch.sw", "name": "Intel 32-bit (x86)", + "arch": "i386", "requires": [ { "or": [ { "type": "hw.device-type", "arch": "i386" } ] } - ] + ], + "variants": "" } diff --git a/contracts/arch.sw/rpi.json b/contracts/arch.sw/rpi.json index 08b31825..67695ef5 100644 --- a/contracts/arch.sw/rpi.json +++ b/contracts/arch.sw/rpi.json @@ -3,11 +3,13 @@ "version": "1", "type": "arch.sw", "name": "ARM v6", + "arch": "armv6hf", "requires": [ { "or": [ { "type": "hw.device-type", "arch": "rpi" } ] } - ] + ], + "variants": "" } diff --git a/contracts/hw.device-type/am571x-evm.json b/contracts/hw.device-type/am571x-evm.json index 281fa508..65b132ee 100644 --- a/contracts/hw.device-type/am571x-evm.json +++ b/contracts/hw.device-type/am571x-evm.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "AM571X-EVM", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/apalis-imx6q.json b/contracts/hw.device-type/apalis-imx6q.json index 651cccbc..6819224b 100644 --- a/contracts/hw.device-type/apalis-imx6q.json +++ b/contracts/hw.device-type/apalis-imx6q.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Toradex Apalis", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/artik10.json b/contracts/hw.device-type/artik10.json index 14c34a6f..2fd06969 100644 --- a/contracts/hw.device-type/artik10.json +++ b/contracts/hw.device-type/artik10.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Samsung Artik 10", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/artik5.json b/contracts/hw.device-type/artik5.json index 2317c811..cdf5f780 100644 --- a/contracts/hw.device-type/artik5.json +++ b/contracts/hw.device-type/artik5.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Samsung Artik 5", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": true + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/artik710.json b/contracts/hw.device-type/artik710.json index 81aa2d63..784ecea6 100644 --- a/contracts/hw.device-type/artik710.json +++ b/contracts/hw.device-type/artik710.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Samsung Artik 710", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": true + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/beaglebone-black.json b/contracts/hw.device-type/beaglebone-black.json index 74d14986..32421c0a 100644 --- a/contracts/hw.device-type/beaglebone-black.json +++ b/contracts/hw.device-type/beaglebone-black.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "BeagleBone Black", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": true + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": true - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/beaglebone-green-wifi.json b/contracts/hw.device-type/beaglebone-green-wifi.json index a91eb7c6..0feff703 100644 --- a/contracts/hw.device-type/beaglebone-green-wifi.json +++ b/contracts/hw.device-type/beaglebone-green-wifi.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "BeagleBone Green Wifi", - "arch": "armv7hf", - "hdmi": false, - "connectivity": { - "bluetooth": true + "data": { + "arch": "armv7hf", + "hdmi": false, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": true + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": true - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/beaglebone-green.json b/contracts/hw.device-type/beaglebone-green.json index 7a9c8b87..44143f43 100644 --- a/contracts/hw.device-type/beaglebone-green.json +++ b/contracts/hw.device-type/beaglebone-green.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "BeagleBone Green", - "arch": "armv7hf", - "hdmi": false, - "connectivity": { - "bluetooth": true + "data": { + "arch": "armv7hf", + "hdmi": false, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": true + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": true - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/ccon-01.json b/contracts/hw.device-type/ccon-01.json index d3536fd1..87f55545 100644 --- a/contracts/hw.device-type/ccon-01.json +++ b/contracts/hw.device-type/ccon-01.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "CCON01", - "arch": "armv7hf", - "hdmi": false, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": false, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/colibri-imx6dl.json b/contracts/hw.device-type/colibri-imx6dl.json index 29de886f..691b7744 100644 --- a/contracts/hw.device-type/colibri-imx6dl.json +++ b/contracts/hw.device-type/colibri-imx6dl.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Toradex Colibri", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/cybertan-ze250.json b/contracts/hw.device-type/cybertan-ze250.json index 0823cddf..e816227b 100644 --- a/contracts/hw.device-type/cybertan-ze250.json +++ b/contracts/hw.device-type/cybertan-ze250.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Cybertan ze250", - "arch": "i386", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "i386", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "usbkey" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "usbkey" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/generic-aarch64.json b/contracts/hw.device-type/generic-aarch64.json index 2e6f72e0..ae5b04e9 100644 --- a/contracts/hw.device-type/generic-aarch64.json +++ b/contracts/hw.device-type/generic-aarch64.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Generic AARCH64", - "arch": "aarch64", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "aarch64", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/generic-armv7ahf.json b/contracts/hw.device-type/generic-armv7ahf.json index 30af095f..7e7111a5 100644 --- a/contracts/hw.device-type/generic-armv7ahf.json +++ b/contracts/hw.device-type/generic-armv7ahf.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Generic ARMv7-a HF", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/hummingboard.json b/contracts/hw.device-type/hummingboard.json index f7fca8c9..a930538d 100644 --- a/contracts/hw.device-type/hummingboard.json +++ b/contracts/hw.device-type/hummingboard.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Hummingboard", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/imx6ul-var-dart.json b/contracts/hw.device-type/imx6ul-var-dart.json index 34b84740..0682b737 100644 --- a/contracts/hw.device-type/imx6ul-var-dart.json +++ b/contracts/hw.device-type/imx6ul-var-dart.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Dart", - "arch": "armv7hf", - "hdmi": false, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": false, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/intel-edison.json b/contracts/hw.device-type/intel-edison.json index a52fdfbc..0782358f 100644 --- a/contracts/hw.device-type/intel-edison.json +++ b/contracts/hw.device-type/intel-edison.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Intel Edison", - "arch": "i386", - "hdmi": false, - "connectivity": { - "bluetooth": false + "data": { + "arch": "i386", + "hdmi": false, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": true + }, + "media": { + "installation": "dfu" + } }, - "storage": { - "internal": true - }, - "media": { - "installation": "dfu" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/intel-nuc.json b/contracts/hw.device-type/intel-nuc.json index cfadc8f5..99f2beb2 100644 --- a/contracts/hw.device-type/intel-nuc.json +++ b/contracts/hw.device-type/intel-nuc.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Intel NUC", - "arch": "amd64", - "hdmi": true, - "connectivity": { - "bluetooth": true + "data": { + "arch": "amd64", + "hdmi": true, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": true + }, + "media": { + "installation": "usbkey" + } }, - "storage": { - "internal": true - }, - "media": { - "installation": "usbkey" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/iot2000.json b/contracts/hw.device-type/iot2000.json index 45a3eb06..0f0472a9 100644 --- a/contracts/hw.device-type/iot2000.json +++ b/contracts/hw.device-type/iot2000.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Siemens IOT2000", - "arch": "i386", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "i386", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/jetson-tx1.json b/contracts/hw.device-type/jetson-tx1.json index d273b5cb..353784f5 100644 --- a/contracts/hw.device-type/jetson-tx1.json +++ b/contracts/hw.device-type/jetson-tx1.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Nvidia Jetson TX1", - "arch": "aarch64", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "aarch64", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/jetson-tx2.json b/contracts/hw.device-type/jetson-tx2.json index c3e5683d..2018951d 100644 --- a/contracts/hw.device-type/jetson-tx2.json +++ b/contracts/hw.device-type/jetson-tx2.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Nvidia Jetson TX2", - "arch": "aarch64", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "aarch64", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/kitra520.json b/contracts/hw.device-type/kitra520.json index 7e18a05b..c235b2ee 100644 --- a/contracts/hw.device-type/kitra520.json +++ b/contracts/hw.device-type/kitra520.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "RushUp Kitra 520", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/kitra710.json b/contracts/hw.device-type/kitra710.json index 57087be5..dd495f04 100644 --- a/contracts/hw.device-type/kitra710.json +++ b/contracts/hw.device-type/kitra710.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Kitra 710", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": true + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/nitrogen6x.json b/contracts/hw.device-type/nitrogen6x.json index bd4fd21a..b42334f7 100644 --- a/contracts/hw.device-type/nitrogen6x.json +++ b/contracts/hw.device-type/nitrogen6x.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Nitrogen 6x", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/odroid-c1.json b/contracts/hw.device-type/odroid-c1.json index 72552634..71f09145 100644 --- a/contracts/hw.device-type/odroid-c1.json +++ b/contracts/hw.device-type/odroid-c1.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "ODroid C1", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/odroid-xu4.json b/contracts/hw.device-type/odroid-xu4.json index 78ddbaf3..8b477ced 100644 --- a/contracts/hw.device-type/odroid-xu4.json +++ b/contracts/hw.device-type/odroid-xu4.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "ODroid XU4", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/parallella.json b/contracts/hw.device-type/parallella.json index 15cf6250..9753eb08 100644 --- a/contracts/hw.device-type/parallella.json +++ b/contracts/hw.device-type/parallella.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Parallella", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/qemux86-64.json b/contracts/hw.device-type/qemux86-64.json index f9119411..ee5351b2 100644 --- a/contracts/hw.device-type/qemux86-64.json +++ b/contracts/hw.device-type/qemux86-64.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "QEMU x86-64", - "arch": "amd64", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "amd64", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "image" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "image" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/qemux86.json b/contracts/hw.device-type/qemux86.json index 3f511bc8..cca7e6d5 100644 --- a/contracts/hw.device-type/qemux86.json +++ b/contracts/hw.device-type/qemux86.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "QEMU x86", - "arch": "i386", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "i386", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "image" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "image" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/raspberry-pi.json b/contracts/hw.device-type/raspberry-pi.json index 1541d7c6..6f73383c 100644 --- a/contracts/hw.device-type/raspberry-pi.json +++ b/contracts/hw.device-type/raspberry-pi.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Raspberry Pi (1, Zero, Zero W)", - "arch": "rpi", - "hdmi": true, - "connectivity": { - "bluetooth": true + "data": { + "arch": "rpi", + "hdmi": true, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/raspberry-pi2.json b/contracts/hw.device-type/raspberry-pi2.json index 4e0de8bf..0571a758 100644 --- a/contracts/hw.device-type/raspberry-pi2.json +++ b/contracts/hw.device-type/raspberry-pi2.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Raspberry Pi 2", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/raspberrypi3.json b/contracts/hw.device-type/raspberrypi3.json index 8b207735..2b6d833e 100644 --- a/contracts/hw.device-type/raspberrypi3.json +++ b/contracts/hw.device-type/raspberrypi3.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Raspberry Pi 3", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": true + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/ts4900.json b/contracts/hw.device-type/ts4900.json index 2ce04fb6..6d47d9cb 100644 --- a/contracts/hw.device-type/ts4900.json +++ b/contracts/hw.device-type/ts4900.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Technologic TS-4900", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": true + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": true - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/ts7700.json b/contracts/hw.device-type/ts7700.json index fe470f73..515d43d2 100644 --- a/contracts/hw.device-type/ts7700.json +++ b/contracts/hw.device-type/ts7700.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Technologic TS-7700", - "arch": "armel", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armel", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/up-board.json b/contracts/hw.device-type/up-board.json index 740b5e02..e02c234f 100644 --- a/contracts/hw.device-type/up-board.json +++ b/contracts/hw.device-type/up-board.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "UP Board", - "arch": "amd64", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "amd64", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "usbkey" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "usbkey" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/via-vab820-quad.json b/contracts/hw.device-type/via-vab820-quad.json index c29c42b4..7ab23c73 100644 --- a/contracts/hw.device-type/via-vab820-quad.json +++ b/contracts/hw.device-type/via-vab820-quad.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "VIA vab820", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": true + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": true + }, + "storage": { + "internal": true + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": true - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/hw.device-type/zc702-zynq7.json b/contracts/hw.device-type/zc702-zynq7.json index 502910a6..f4823c40 100644 --- a/contracts/hw.device-type/zc702-zynq7.json +++ b/contracts/hw.device-type/zc702-zynq7.json @@ -3,15 +3,19 @@ "version": "1", "type": "hw.device-type", "name": "Zynq zc702", - "arch": "armv7hf", - "hdmi": true, - "connectivity": { - "bluetooth": false + "data": { + "arch": "armv7hf", + "hdmi": true, + "connectivity": { + "bluetooth": false + }, + "storage": { + "internal": false + }, + "media": { + "installation": "sdcard" + } }, - "storage": { - "internal": false - }, - "media": { - "installation": "sdcard" - } + "requires": "", + "variants": "" } diff --git a/contracts/sw.blob/entry.json b/contracts/sw.blob/entry.json index 83d8edfe..570a9c15 100644 --- a/contracts/sw.blob/entry.json +++ b/contracts/sw.blob/entry.json @@ -2,15 +2,16 @@ "slug": "entry", "type": "sw.blob", "name": "resin entry.sh script", - "version": "1.0.0", - "assets": { + "version": "1", + "data": { "bin": { "main": "entry.sh" } }, + "requires": "", "variants": [ { - "assets": { + "data": { "bin": { "name": "entry-alpine.sh", "url": "file://./assets/entry-alpine.sh", @@ -22,7 +23,7 @@ ] }, { - "assets": { + "data": { "bin": { "name": "entry-no-systemd-debian.sh", "url": "file://./assets/entry-no-systemd-debian.sh", @@ -34,7 +35,7 @@ ] }, { - "assets": { + "data": { "bin": { "name": "entry-systemd-debian.sh", "url": "file://./assets/entry-systemd-debian.sh", @@ -53,7 +54,7 @@ ] }, { - "assets": { + "data": { "bin": { "name": "entry-fedora.sh", "url": "file://./assets/entry-fedora.sh", diff --git a/contracts/sw.blob/nodejs.json b/contracts/sw.blob/nodejs.json index 53c7195a..e376f086 100644 --- a/contracts/sw.blob/nodejs.json +++ b/contracts/sw.blob/nodejs.json @@ -2,13 +2,14 @@ "slug": "nodejs", "type": "sw.blob", "name": "Node.js {{version}}", + "version": "1", "requires": [ { "type": "sw.os", "libc": "{{libc}}" } ], - "assets": { + "data": { "bin": { "checksumType": "sha256" } @@ -21,7 +22,7 @@ "libc": "musl-libc", "variants": [ { - "assets": { + "data": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-armhf.tar.gz", "checksum": "99ea7697fd1a4fc297cbcfca98d920e19a8a5ffead5239db58c6f4383f56e21c" @@ -37,7 +38,7 @@ ] }, { - "assets": { + "data": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-amd64.tar.gz", "checksum": "d9591863975989387aa7369a95eaea11db9183d3c2d56b35cd2e58f15d7e17a3" @@ -48,7 +49,7 @@ ] }, { - "assets": { + "data": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-i386.tar.gz", "checksum": "140651bbd447316ac45f7fdf50a11c728f628b1d8e4c9f5deb83b5fe23c87824" @@ -64,7 +65,7 @@ "libc": "glibc", "variants": [ { - "assets": { + "data": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armel.tar.gz", "checksum": "7be6f13e407bff7eab3883764dca59dbedb751613cf23cbfe75a618a7c3ce333" @@ -75,7 +76,7 @@ ] }, { - "assets": { + "data": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armv6l.tar.gz", "checksum": "af669f5fc7cb5269978144a8b6469923657119b3ee712d6bf70167e36b6812c2" @@ -86,7 +87,7 @@ ] }, { - "assets": { + "data": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armv7hf.tar.gz", "checksum": "849a55c62a726386649fb9c6da8e41ac3611d8b3a1ac481959516fc95047262a" @@ -97,7 +98,7 @@ ] }, { - "assets": { + "data": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-i386.tar.gz", "checksum": "a47a28aed8307d4328ce23e5dda57d6b4bde7ddf60b41f354850f1f9cfe37750" }, @@ -106,7 +107,7 @@ ] }, { - "assets": { + "data": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-x64.tar.gz", "checksum": "52382b93865a5edd834db10e8f60822680d26dc2b8cadccafc351b0082a9052a" diff --git a/contracts/sw.blob/qemu.json b/contracts/sw.blob/qemu.json index 4eab5821..53be2cde 100644 --- a/contracts/sw.blob/qemu.json +++ b/contracts/sw.blob/qemu.json @@ -1,16 +1,18 @@ { "slug": "qemu", "type": "sw.blob", + "version": "1", "name": "QEMU v{{version}}", - "assets": { + "data": { "bin": { "checksumType": "sha256" } }, + "requires": "", "variants": [ { "version": "2.9.0.resin1-arm", - "assets": { + "data": { "bin": { "name": "qemu-arm-static", "url": "file://./assets/qemu-arm-static", @@ -30,7 +32,7 @@ }, { "version": "2.9.0.resin1-aarch64", - "assets": { + "data": { "bin": { "name": "qemu-aarch64-static", "url": "file://./assets/qemu-aarch64-static", diff --git a/contracts/sw.blob/resin-xbuild.json b/contracts/sw.blob/resin-xbuild.json index 7abe2107..7841982f 100644 --- a/contracts/sw.blob/resin-xbuild.json +++ b/contracts/sw.blob/resin-xbuild.json @@ -3,7 +3,7 @@ "type": "sw.blob", "name": "Resin XBuild v{{version}}", "version": "1.0.0", - "assets": { + "data": { "bin": { "name": "resin-xbuild{{version}}.tar.gz", "url": "http://resin-packages.s3.amazonaws.com/resin-xbuild/v{{version}}/resin-xbuild{{version}}.tar.gz", @@ -11,5 +11,7 @@ "checksumType": "sha256", "main": "resin-xbuild" } - } + }, + "requires": "", + "variants": "" } diff --git a/contracts/sw.blob/tini.json b/contracts/sw.blob/tini.json index 6acc845a..c2734f68 100644 --- a/contracts/sw.blob/tini.json +++ b/contracts/sw.blob/tini.json @@ -1,8 +1,10 @@ { "slug": "tini", "type": "sw.blob", + "name": "tini", "version": "0.14.0", - "assets": { + "requires": "", + "data": { "bin": { "checksumType": "sha256", "main": "tini" @@ -10,7 +12,7 @@ }, "variants": [ { - "assets": { + "data": { "bin": { "name": "tini{{version}}.linux-armv7hf.tar.gz", "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-armv7hf.tar.gz", @@ -28,7 +30,7 @@ ] }, { - "assets": { + "data": { "bin": { "name": "tini{{version}}.linux-armel.tar.gz", "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-armel.tar.gz", @@ -41,7 +43,7 @@ ] }, { - "assets": { + "data": { "bin": { "name": "tini{{version}}.linux-aarch64.tar.gz", "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-aarch64.tar.gz", @@ -54,7 +56,7 @@ ] }, { - "assets": { + "data": { "bin": { "name": "tini{{version}}.linux-i386.tar.gz", "checksum": "9f4a0b536efdcbe92bc81c6e68dbf8dc1c5739e58f4e7e3a91f07094655149e8", @@ -67,7 +69,7 @@ ] }, { - "assets": { + "data": { "bin": { "name": "tini{{version}}.linux-amd64.tar.gz", "checksum": "a662ee1594cb037909237c87d577b6e4dee9879f1c23279f1a829683e542e4a0", diff --git a/contracts/sw.image-writer/etcher.json b/contracts/sw.image-writer/etcher.json index ccfa4d9e..742acad0 100644 --- a/contracts/sw.image-writer/etcher.json +++ b/contracts/sw.image-writer/etcher.json @@ -3,11 +3,13 @@ "type": "sw.image-writer", "name": "Etcher for macOS", "version": "1.1.2", - "assets": { + "data": { "bin": { "url": "https://github.com/resin-io/etcher/releases/download/v{{version}}/Etcher-{{version}}.dmg", "checksum": "b562c7ff89e0de86003ee1cc14a1ee08ab5988a543b6e22235fe3773a48074a4", "checksumType": "sha256" } - } + }, + "requires": "", + "variants": "" } diff --git a/contracts/sw.os-image/resinos.json b/contracts/sw.os-image/resinos.json index d5787952..191b4533 100644 --- a/contracts/sw.os-image/resinos.json +++ b/contracts/sw.os-image/resinos.json @@ -9,9 +9,10 @@ "slug": "raspberrypi3" } ], - "assets": { + "data": { "url": "https://files.resin.io/resinos/raspberrypi3/{{version}}/image/resin.img.zip", "checksumType": "sha256", "checksum": "29c1fef73e8636c79ab1d835bc1d90f115d7683585eaf39874a2eab739b74baf" - } + }, + "variants": "" } diff --git a/contracts/sw.os/alpine.json b/contracts/sw.os/alpine.json index 7507128b..fc893fc9 100644 --- a/contracts/sw.os/alpine.json +++ b/contracts/sw.os/alpine.json @@ -1,7 +1,8 @@ { "slug": "alpine", "type": "sw.os", - "libc": "musl-libc", + "version": "1", + "data":{ "libc": "musl-libc" }, "name": "Alpine Linux {{version}}", "requires": [ { "type": "sw.blob", "slug": "tini" }, diff --git a/contracts/sw.os/debian.json b/contracts/sw.os/debian.json index 6deafad4..d97fd5d7 100644 --- a/contracts/sw.os/debian.json +++ b/contracts/sw.os/debian.json @@ -1,7 +1,8 @@ { "slug": "debian", "type": "sw.os", - "libc": "glibc", + "version": "1", + "data": { "libc": "glibc" }, "requires": [ { "type": "sw.blob", "slug": "tini" }, { "type": "sw.blob", "slug": "resin-xbuild" }, diff --git a/contracts/sw.os/fedora.json b/contracts/sw.os/fedora.json index 9310fe80..102104b9 100644 --- a/contracts/sw.os/fedora.json +++ b/contracts/sw.os/fedora.json @@ -1,7 +1,8 @@ { "slug": "fedora", "type": "sw.os", - "libc": "glibc", + "version": "1", + "data" : { "libc": "glibc" }, "name": "Fedora {{version}}", "requires": [ { "type": "sw.blob", "slug": "tini" }, diff --git a/contracts/sw.os/resinos.json b/contracts/sw.os/resinos.json index 7343b11c..5f942f97 100644 --- a/contracts/sw.os/resinos.json +++ b/contracts/sw.os/resinos.json @@ -3,7 +3,7 @@ "name": "ResinOS", "version": "2.3.0", "type": "sw.os", - "libc": "glibc", + "data": { "libc": "glibc" }, "requires": [ { "type": "arch.sw", @@ -13,5 +13,6 @@ "type": "sw.os-image", "slug": "resinos" } - ] + ], + "variants": "" } diff --git a/contracts/sw.stack/go.json b/contracts/sw.stack/go.json index 73eeedb5..fc5d7d2d 100644 --- a/contracts/sw.stack/go.json +++ b/contracts/sw.stack/go.json @@ -2,6 +2,8 @@ "slug": "go", "type": "sw.stack", "name": "Go {{version}}", + "version": "1", + "data": "", "requires": [ { "or": [ diff --git a/contracts/sw.stack/java.json b/contracts/sw.stack/java.json index 84861094..85906b02 100644 --- a/contracts/sw.stack/java.json +++ b/contracts/sw.stack/java.json @@ -2,6 +2,8 @@ "slug": "java", "type": "sw.stack", "name": "Java {{version}}", + "version": "1", + "data": "", "requires": [ { "or": [ diff --git a/contracts/sw.stack/nodejs.json b/contracts/sw.stack/nodejs.json index 1a4b7143..318c8d76 100644 --- a/contracts/sw.stack/nodejs.json +++ b/contracts/sw.stack/nodejs.json @@ -2,6 +2,8 @@ "slug": "nodejs", "type": "sw.stack", "name": "Node.js {{version}}", + "version": "1", + "data": "", "requires": [ { "or": [ diff --git a/contracts/sw.stack/python.json b/contracts/sw.stack/python.json index e1af40d2..e7d20d71 100644 --- a/contracts/sw.stack/python.json +++ b/contracts/sw.stack/python.json @@ -2,6 +2,8 @@ "slug": "python", "type": "sw.stack", "name": "Python {{version}}", + "version": "1", + "data": "", "requires": [ { "or": [ diff --git a/contracts/sw.variant/jdk.json b/contracts/sw.variant/jdk.json index 87845120..d0d85cb3 100644 --- a/contracts/sw.variant/jdk.json +++ b/contracts/sw.variant/jdk.json @@ -3,6 +3,7 @@ "version": "1", "type": "sw.variant", "name": "JDK", + "data": "", "requires": [ { "or": [ @@ -16,5 +17,6 @@ "type": "sw.stack", "slug": "java" } - ] + ], + "variants": "" } diff --git a/contracts/sw.variant/jre.json b/contracts/sw.variant/jre.json index 76bc61cd..9ca22260 100644 --- a/contracts/sw.variant/jre.json +++ b/contracts/sw.variant/jre.json @@ -3,6 +3,7 @@ "version": "1", "type": "sw.variant", "name": "JRE", + "data": "", "requires": [ { "or": [ @@ -16,5 +17,6 @@ "type": "sw.stack", "slug": "java" } - ] + ], + "variants": "" } diff --git a/contracts/sw.variant/onbuild.json b/contracts/sw.variant/onbuild.json index e9ab34a8..b8975215 100644 --- a/contracts/sw.variant/onbuild.json +++ b/contracts/sw.variant/onbuild.json @@ -3,6 +3,7 @@ "version": "1", "type": "sw.variant", "name": "On Build", + "data": "", "requires": [ { "or": [ @@ -19,5 +20,6 @@ { "type": "sw.stack", "slug": "python" } ] } - ] + ], + "variants": "" } diff --git a/contracts/sw.variant/slim.json b/contracts/sw.variant/slim.json index c8368a6b..f8c151f4 100644 --- a/contracts/sw.variant/slim.json +++ b/contracts/sw.variant/slim.json @@ -3,6 +3,7 @@ "version": "1", "type": "sw.variant", "name": "Slim", + "data": "", "requires": [ { "or": [ @@ -19,5 +20,6 @@ { "type": "sw.stack", "slug": "python" } ] } - ] + ], + "variants": "" } From 2c7d93ea5bf9b24942e7ca0b16922a3508f3636f Mon Sep 17 00:00:00 2001 From: Trong Nghia Nguyen Date: Sat, 5 May 2018 19:29:19 +0200 Subject: [PATCH 2/4] Re-organize contracts directory structure --- .../{aarch64.json => aarch64/contract.json} | 10 +++++--- .../{amd64.json => amd64/contract.json} | 10 +++++--- contracts/arch.sw/armel.json | 15 ----------- contracts/arch.sw/armel/contract.json | 15 +++++++++++ contracts/arch.sw/armhf.json | 16 ------------ contracts/arch.sw/armhf/contract.json | 25 +++++++++++++++++++ contracts/arch.sw/armv7hf.json | 15 ----------- contracts/arch.sw/armv7hf/contract.json | 15 +++++++++++ .../arch.sw/{i386.json => i386/contract.json} | 12 ++++----- contracts/arch.sw/rpi.json | 15 ----------- contracts/arch.sw/rpi/contract.json | 15 +++++++++++ .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../{artik10.json => artik10/contract.json} | 4 +-- .../{artik5.json => artik5/contract.json} | 4 +-- .../{artik710.json => artik710/contract.json} | 4 +-- .../beaglebone-black}/boot-external.tpl | 0 .../beaglebone-black}/boot-internal.tpl | 0 .../contract.json} | 4 +-- .../beaglebone-black}/prepare-network.tpl | 0 .../beaglebone-green-wifi/boot-external.tpl | 1 + .../beaglebone-green-wifi/boot-internal.tpl | 1 + .../contract.json} | 4 +-- .../prepare-network.tpl | 0 .../beaglebone-green/boot-external.tpl | 1 + .../beaglebone-green/boot-internal.tpl | 1 + .../contract.json} | 4 +-- .../beaglebone-green/prepare-network.tpl | 1 + .../hw.device-type/boot-external.tpl | 0 .../hw.device-type/boot-internal.tpl | 0 .../{ccon-01.json => ccon-01/contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../hw.device-type/insert-install-media.tpl | 0 .../contract.json} | 4 +-- .../intel-nuc/boot-external.tpl | 0 .../intel-nuc/boot-internal.tpl | 0 .../contract.json} | 4 +-- .../{iot2000.json => iot2000/contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../{kitra520.json => kitra520/contract.json} | 4 +-- .../{kitra710.json => kitra710/contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../hw.device-type/prepare-network.tpl | 0 .../contract.json} | 4 +-- .../{qemux86.json => qemux86/contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../contract.json} | 4 +-- .../hw.device-type/remove-install-media.tpl | 0 .../hw.device-type/ts4900/boot-external.tpl | 0 .../hw.device-type/ts4900/boot-internal.tpl | 0 .../{ts4900.json => ts4900/contract.json} | 4 +-- .../{ts7700.json => ts7700/contract.json} | 4 +-- .../{up-board.json => up-board/contract.json} | 4 +-- .../via-vab820-quad}/boot-external.tpl | 0 .../via-vab820-quad}/boot-internal.tpl | 0 .../contract.json} | 4 +-- .../via-vab820-quad/prepare-network.tpl | 1 + .../visual-appearance-when-off.tpl | 0 .../contract.json} | 4 +-- {partials => contracts}/sw.blob/download.tpl | 0 .../{entry.json => entry/contract.json} | 11 ++++---- .../{nodejs.json => nodejs/contract.json} | 18 ++++++------- .../sw.blob/{qemu.json => qemu/contract.json} | 7 +++--- .../contract.json} | 6 ++--- .../sw.blob/{tini.json => tini/contract.json} | 13 +++++----- .../etcher/flash.tpl | 0 .../sw.image-writer/download.tpl | 0 .../{etcher.json => etcher/contract.json} | 6 ++--- .../sw.os+arch.sw/alpine+aarch64/from.tpl | 0 .../sw.os+arch.sw/alpine+amd64/from.tpl | 0 .../sw.os+arch.sw/alpine+armhf/from.tpl | 0 .../sw.os+arch.sw/alpine+i386/from.tpl | 0 .../alpine/base-dependencies.tpl | 0 .../sw.os+arch.sw/alpine/init-system.tpl | 0 .../sw.os+arch.sw/alpine/os-config.tpl | 0 .../sw.os+arch.sw/alpine/tini.tpl | 0 .../sw.os+arch.sw/debian+aarch64/from.tpl | 0 .../sw.os+arch.sw/debian+amd64/from.tpl | 0 .../sw.os+arch.sw/debian+armel/from.tpl | 0 .../sw.os+arch.sw/debian+armel/qemu.tpl | 0 .../sw.os+arch.sw/debian+armv7hf/from.tpl | 0 .../sw.os+arch.sw/debian+i386/from.tpl | 0 .../debian/base-dependencies.tpl | 0 .../sw.os+arch.sw/debian/init-system.tpl | 0 .../sw.os+arch.sw/debian/os-config.tpl | 0 .../debian@jessie/init-system.tpl | 0 .../debian@wheezy/init-system.tpl | 0 .../sw.os+arch.sw/fedora+aarch64/from.tpl | 0 .../sw.os+arch.sw/fedora+amd64/from.tpl | 0 .../sw.os+arch.sw/fedora+armv7hf/from.tpl | 0 .../fedora+armv7hf/os-config.tpl | 0 .../fedora/base-dependencies.tpl | 0 .../sw.os+arch.sw/fedora/init-system.tpl | 0 .../sw.os+arch.sw/fedora/os-config.tpl | 0 .../sw.os+arch.sw/fedora@24/init-system.tpl | 0 .../sw.os+arch.sw/qemu.tpl | 0 .../sw.os+arch.sw/resin-xbuild.tpl | 0 .../sw.os+arch.sw/tini.tpl | 0 .../alpine+raspberry-pi/dependencies.tpl | 0 .../alpine+raspberrypi-pi2/dependencies.tpl | 0 .../alpine+raspberrypi3/dependencies.tpl | 0 .../alpine/dependencies.tpl | 0 .../debian+beaglebone-black/distro-config.tpl | 0 .../distro-config.tpl | 0 .../debian+beaglebone-green/distro-config.tpl | 0 .../debian+cybertan-ze250/dependencies.tpl | 0 .../debian+intel-edison/dependencies.tpl | 0 .../debian+iot2000/dependencies.tpl | 0 .../debian+raspberry-pi2/dependencies.tpl | 0 .../debian+raspberry-pi2/distro-config.tpl | 0 .../debian+raspberrypi3/dependencies.tpl | 0 .../debian+raspberrypi3/distro-config.tpl | 0 .../debian+up-board/dependencies.tpl | 0 .../debian/dependencies.tpl | 0 .../debian/distro-config.tpl | 0 .../distro-config.tpl | 0 .../distro-config.tpl | 0 .../distro-config.tpl | 0 .../distro-config.tpl | 0 .../distro-config.tpl | 0 .../sw.os+hw.device-type/dependencies.tpl | 0 .../sw.os+hw.device-type/distro-config.tpl | 0 .../fedora/dependencies.tpl | 0 .../description-of-internal-process.tpl | 0 .../sw.os-image/download.tpl | 0 .../{resinos.json => resinos/contract.json} | 5 ++-- .../sw.os-image/resinos/download.tpl | 0 .../{alpine.json => alpine/contract.json} | 2 +- .../{debian.json => debian/contract.json} | 1 + .../{fedora.json => fedora/contract.json} | 0 .../{resinos.json => resinos/contract.json} | 3 +-- .../sw.stack/{go.json => go/contract.json} | 1 - .../{java.json => java/contract.json} | 1 - .../{nodejs.json => nodejs/contract.json} | 1 - .../{python.json => python/contract.json} | 1 - contracts/sw.variant/jdk.json | 22 ---------------- contracts/sw.variant/jre.json | 22 ---------------- contracts/sw.variant/onbuild.json | 25 ------------------- contracts/sw.variant/slim.json | 25 ------------------- 149 files changed, 164 insertions(+), 319 deletions(-) rename contracts/arch.sw/{aarch64.json => aarch64/contract.json} (57%) rename contracts/arch.sw/{amd64.json => amd64/contract.json} (60%) delete mode 100644 contracts/arch.sw/armel.json create mode 100644 contracts/arch.sw/armel/contract.json delete mode 100644 contracts/arch.sw/armhf.json create mode 100644 contracts/arch.sw/armhf/contract.json delete mode 100644 contracts/arch.sw/armv7hf.json create mode 100644 contracts/arch.sw/armv7hf/contract.json rename contracts/arch.sw/{i386.json => i386/contract.json} (51%) delete mode 100644 contracts/arch.sw/rpi.json create mode 100644 contracts/arch.sw/rpi/contract.json rename contracts/hw.device-type/{am571x-evm.json => am571x-evm/contract.json} (88%) rename contracts/hw.device-type/{apalis-imx6q.json => apalis-imx6q/contract.json} (88%) rename contracts/hw.device-type/{artik10.json => artik10/contract.json} (88%) rename contracts/hw.device-type/{artik5.json => artik5/contract.json} (88%) rename contracts/hw.device-type/{artik710.json => artik710/contract.json} (88%) rename {partials/hw.device-type/beaglebone => contracts/hw.device-type/beaglebone-black}/boot-external.tpl (100%) rename {partials/hw.device-type/beaglebone => contracts/hw.device-type/beaglebone-black}/boot-internal.tpl (100%) rename contracts/hw.device-type/{beaglebone-black.json => beaglebone-black/contract.json} (88%) rename {partials/hw.device-type/beaglebone => contracts/hw.device-type/beaglebone-black}/prepare-network.tpl (100%) create mode 100644 contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl create mode 100644 contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl rename contracts/hw.device-type/{beaglebone-green-wifi.json => beaglebone-green-wifi/contract.json} (89%) rename {partials/hw.device-type/vab820-quad => contracts/hw.device-type/beaglebone-green-wifi}/prepare-network.tpl (100%) create mode 100644 contracts/hw.device-type/beaglebone-green/boot-external.tpl create mode 100644 contracts/hw.device-type/beaglebone-green/boot-internal.tpl rename contracts/hw.device-type/{beaglebone-green.json => beaglebone-green/contract.json} (88%) create mode 100644 contracts/hw.device-type/beaglebone-green/prepare-network.tpl rename {partials => contracts}/hw.device-type/boot-external.tpl (100%) rename {partials => contracts}/hw.device-type/boot-internal.tpl (100%) rename contracts/hw.device-type/{ccon-01.json => ccon-01/contract.json} (88%) rename contracts/hw.device-type/{colibri-imx6dl.json => colibri-imx6dl/contract.json} (88%) rename contracts/hw.device-type/{cybertan-ze250.json => cybertan-ze250/contract.json} (88%) rename contracts/hw.device-type/{generic-aarch64.json => generic-aarch64/contract.json} (88%) rename contracts/hw.device-type/{generic-armv7ahf.json => generic-armv7ahf/contract.json} (88%) rename contracts/hw.device-type/{hummingboard.json => hummingboard/contract.json} (88%) rename contracts/hw.device-type/{imx6ul-var-dart.json => imx6ul-var-dart/contract.json} (88%) rename {partials => contracts}/hw.device-type/insert-install-media.tpl (100%) rename contracts/hw.device-type/{intel-edison.json => intel-edison/contract.json} (88%) rename {partials => contracts}/hw.device-type/intel-nuc/boot-external.tpl (100%) rename {partials => contracts}/hw.device-type/intel-nuc/boot-internal.tpl (100%) rename contracts/hw.device-type/{intel-nuc.json => intel-nuc/contract.json} (88%) rename contracts/hw.device-type/{iot2000.json => iot2000/contract.json} (88%) rename contracts/hw.device-type/{jetson-tx1.json => jetson-tx1/contract.json} (88%) rename contracts/hw.device-type/{jetson-tx2.json => jetson-tx2/contract.json} (88%) rename contracts/hw.device-type/{kitra520.json => kitra520/contract.json} (88%) rename contracts/hw.device-type/{kitra710.json => kitra710/contract.json} (88%) rename contracts/hw.device-type/{nitrogen6x.json => nitrogen6x/contract.json} (88%) rename contracts/hw.device-type/{odroid-c1.json => odroid-c1/contract.json} (88%) rename contracts/hw.device-type/{odroid-xu4.json => odroid-xu4/contract.json} (88%) rename contracts/hw.device-type/{parallella.json => parallella/contract.json} (88%) rename {partials => contracts}/hw.device-type/prepare-network.tpl (100%) rename contracts/hw.device-type/{qemux86-64.json => qemux86-64/contract.json} (88%) rename contracts/hw.device-type/{qemux86.json => qemux86/contract.json} (88%) rename contracts/hw.device-type/{raspberry-pi.json => raspberry-pi/contract.json} (88%) rename contracts/hw.device-type/{raspberry-pi2.json => raspberry-pi2/contract.json} (88%) rename contracts/hw.device-type/{raspberrypi3.json => raspberrypi3/contract.json} (88%) rename {partials => contracts}/hw.device-type/remove-install-media.tpl (100%) rename {partials => contracts}/hw.device-type/ts4900/boot-external.tpl (100%) rename {partials => contracts}/hw.device-type/ts4900/boot-internal.tpl (100%) rename contracts/hw.device-type/{ts4900.json => ts4900/contract.json} (88%) rename contracts/hw.device-type/{ts7700.json => ts7700/contract.json} (88%) rename contracts/hw.device-type/{up-board.json => up-board/contract.json} (88%) rename {partials/hw.device-type/vab820-quad => contracts/hw.device-type/via-vab820-quad}/boot-external.tpl (100%) rename {partials/hw.device-type/vab820-quad => contracts/hw.device-type/via-vab820-quad}/boot-internal.tpl (100%) rename contracts/hw.device-type/{via-vab820-quad.json => via-vab820-quad/contract.json} (88%) create mode 100644 contracts/hw.device-type/via-vab820-quad/prepare-network.tpl rename {partials => contracts}/hw.device-type/visual-appearance-when-off.tpl (100%) rename contracts/hw.device-type/{zc702-zynq7.json => zc702-zynq7/contract.json} (88%) rename {partials => contracts}/sw.blob/download.tpl (100%) rename contracts/sw.blob/{entry.json => entry/contract.json} (93%) rename contracts/sw.blob/{nodejs.json => nodejs/contract.json} (94%) rename contracts/sw.blob/{qemu.json => qemu/contract.json} (94%) rename contracts/sw.blob/{resin-xbuild.json => resin-xbuild/contract.json} (89%) rename contracts/sw.blob/{tini.json => tini/contract.json} (95%) rename {partials => contracts}/sw.image-writer+hw.device-type/etcher/flash.tpl (100%) rename {partials => contracts}/sw.image-writer/download.tpl (100%) rename contracts/sw.image-writer/{etcher.json => etcher/contract.json} (86%) rename {partials => contracts}/sw.os+arch.sw/alpine+aarch64/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/alpine+amd64/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/alpine+armhf/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/alpine+i386/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/alpine/base-dependencies.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/alpine/init-system.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/alpine/os-config.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/alpine/tini.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian+aarch64/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian+amd64/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian+armel/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian+armel/qemu.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian+armv7hf/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian+i386/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian/base-dependencies.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian/init-system.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian/os-config.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian@jessie/init-system.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/debian@wheezy/init-system.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/fedora+aarch64/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/fedora+amd64/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/fedora+armv7hf/from.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/fedora+armv7hf/os-config.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/fedora/base-dependencies.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/fedora/init-system.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/fedora/os-config.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/fedora@24/init-system.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/qemu.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/resin-xbuild.tpl (100%) rename {partials => contracts}/sw.os+arch.sw/tini.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/alpine/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+iot2000/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian+up-board/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/dependencies.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/distro-config.tpl (100%) rename {partials => contracts}/sw.os+hw.device-type/fedora/dependencies.tpl (100%) rename {partials => contracts}/sw.os-flasher/description-of-internal-process.tpl (100%) rename {partials => contracts}/sw.os-image/download.tpl (100%) rename contracts/sw.os-image/{resinos.json => resinos/contract.json} (92%) rename {partials => contracts}/sw.os-image/resinos/download.tpl (100%) rename contracts/sw.os/{alpine.json => alpine/contract.json} (96%) rename contracts/sw.os/{debian.json => debian/contract.json} (98%) rename contracts/sw.os/{fedora.json => fedora/contract.json} (100%) rename contracts/sw.os/{resinos.json => resinos/contract.json} (92%) rename contracts/sw.stack/{go.json => go/contract.json} (98%) rename contracts/sw.stack/{java.json => java/contract.json} (98%) rename contracts/sw.stack/{nodejs.json => nodejs/contract.json} (99%) rename contracts/sw.stack/{python.json => python/contract.json} (98%) delete mode 100644 contracts/sw.variant/jdk.json delete mode 100644 contracts/sw.variant/jre.json delete mode 100644 contracts/sw.variant/onbuild.json delete mode 100644 contracts/sw.variant/slim.json diff --git a/contracts/arch.sw/aarch64.json b/contracts/arch.sw/aarch64/contract.json similarity index 57% rename from contracts/arch.sw/aarch64.json rename to contracts/arch.sw/aarch64/contract.json index 292cd92f..e108e792 100644 --- a/contracts/arch.sw/aarch64.json +++ b/contracts/arch.sw/aarch64/contract.json @@ -5,7 +5,11 @@ "name": "ARM v8", "data": { "arch": "aarch64" }, "requires": [ - { "type": "hw.device-type", "arch": "aarch64" } - ], - "variants": "" + { + "type": "hw.device-type", + "data": { + "arch": "aarch64" + } + } + ] } diff --git a/contracts/arch.sw/amd64.json b/contracts/arch.sw/amd64/contract.json similarity index 60% rename from contracts/arch.sw/amd64.json rename to contracts/arch.sw/amd64/contract.json index 6e173a91..7ad0a106 100644 --- a/contracts/arch.sw/amd64.json +++ b/contracts/arch.sw/amd64/contract.json @@ -5,7 +5,11 @@ "name": "Intel 64-bit (x86-64)", "data": { "arch": "amd64" }, "requires": [ - { "type": "hw.device-type", "arch": "amd64" } - ], - "variants": "" + { + "type": "hw.device-type", + "data": { + "arch": "amd64" + } + } + ] } diff --git a/contracts/arch.sw/armel.json b/contracts/arch.sw/armel.json deleted file mode 100644 index 08767067..00000000 --- a/contracts/arch.sw/armel.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "slug": "armel", - "version": "1", - "type": "arch.sw", - "name": "ARM v5", - "arch": "armel", - "requires": [ - { - "or": [ - { "type": "hw.device-type", "arch": "armel" } - ] - } - ], - "variants": "" -} diff --git a/contracts/arch.sw/armel/contract.json b/contracts/arch.sw/armel/contract.json new file mode 100644 index 00000000..b5cc061c --- /dev/null +++ b/contracts/arch.sw/armel/contract.json @@ -0,0 +1,15 @@ +{ + "slug": "armel", + "version": "1", + "type": "arch.sw", + "name": "ARM v5", + "data": { "arch": "armel" }, + "requires": [ + { + "type": "hw.device-type", + "data": { + "arch": "armel" + } + } + ] +} diff --git a/contracts/arch.sw/armhf.json b/contracts/arch.sw/armhf.json deleted file mode 100644 index 3b1ec147..00000000 --- a/contracts/arch.sw/armhf.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "slug": "armhf", - "version": "1", - "type": "arch.sw", - "name": "ARM Hard Float", - "arch": "armhf", - "requires": [ - { - "or": [ - { "type": "hw.device-type", "arch": "armv7hf" }, - { "type": "hw.device-type", "arch": "rpi" } - ] - } - ], - "variants": "" -} diff --git a/contracts/arch.sw/armhf/contract.json b/contracts/arch.sw/armhf/contract.json new file mode 100644 index 00000000..39a48fd2 --- /dev/null +++ b/contracts/arch.sw/armhf/contract.json @@ -0,0 +1,25 @@ +{ + "slug": "armhf", + "version": "1", + "type": "arch.sw", + "name": "ARM Hard Float", + "data": { "arch": "armhf" }, + "requires": [ + { + "or": [ + { + "type": "hw.device-type", + "data": { + "arch": "armv7hf" + } + }, + { + "type": "hw.device-type", + "data": { + "arch": "rpi" + } + } + ] + } + ] +} diff --git a/contracts/arch.sw/armv7hf.json b/contracts/arch.sw/armv7hf.json deleted file mode 100644 index 416f20da..00000000 --- a/contracts/arch.sw/armv7hf.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "slug": "armv7hf", - "version": "1", - "type": "arch.sw", - "name": "ARM v7", - "arch": "armv7hf", - "requires": [ - { - "or": [ - { "type": "hw.device-type", "arch": "armv7hf" } - ] - } - ], - "variants": "" -} diff --git a/contracts/arch.sw/armv7hf/contract.json b/contracts/arch.sw/armv7hf/contract.json new file mode 100644 index 00000000..9f907917 --- /dev/null +++ b/contracts/arch.sw/armv7hf/contract.json @@ -0,0 +1,15 @@ +{ + "slug": "armv7hf", + "version": "1", + "type": "arch.sw", + "name": "ARM v7", + "data": { "arch": "armv7hf" }, + "requires": [ + { + "type": "hw.device-type", + "data": { + "arch": "armv7hf" + } + } + ] +} diff --git a/contracts/arch.sw/i386.json b/contracts/arch.sw/i386/contract.json similarity index 51% rename from contracts/arch.sw/i386.json rename to contracts/arch.sw/i386/contract.json index 5d9f96bf..0fac18db 100644 --- a/contracts/arch.sw/i386.json +++ b/contracts/arch.sw/i386/contract.json @@ -3,13 +3,13 @@ "version": "1", "type": "arch.sw", "name": "Intel 32-bit (x86)", - "arch": "i386", + "data": { "arch": "i386" }, "requires": [ { - "or": [ - { "type": "hw.device-type", "arch": "i386" } - ] + "type": "hw.device-type", + "data": { + "arch": "i386" + } } - ], - "variants": "" + ] } diff --git a/contracts/arch.sw/rpi.json b/contracts/arch.sw/rpi.json deleted file mode 100644 index 67695ef5..00000000 --- a/contracts/arch.sw/rpi.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "slug": "rpi", - "version": "1", - "type": "arch.sw", - "name": "ARM v6", - "arch": "armv6hf", - "requires": [ - { - "or": [ - { "type": "hw.device-type", "arch": "rpi" } - ] - } - ], - "variants": "" -} diff --git a/contracts/arch.sw/rpi/contract.json b/contracts/arch.sw/rpi/contract.json new file mode 100644 index 00000000..023c5c1c --- /dev/null +++ b/contracts/arch.sw/rpi/contract.json @@ -0,0 +1,15 @@ +{ + "slug": "rpi", + "version": "1", + "type": "arch.sw", + "name": "ARM v6", + "data": { "arch": "armv6hf" }, + "requires": [ + { + "type": "hw.device-type", + "data": { + "arch": "rpi" + } + } + ] +} diff --git a/contracts/hw.device-type/am571x-evm.json b/contracts/hw.device-type/am571x-evm/contract.json similarity index 88% rename from contracts/hw.device-type/am571x-evm.json rename to contracts/hw.device-type/am571x-evm/contract.json index 65b132ee..bb63bcff 100644 --- a/contracts/hw.device-type/am571x-evm.json +++ b/contracts/hw.device-type/am571x-evm/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/apalis-imx6q.json b/contracts/hw.device-type/apalis-imx6q/contract.json similarity index 88% rename from contracts/hw.device-type/apalis-imx6q.json rename to contracts/hw.device-type/apalis-imx6q/contract.json index 6819224b..da56b05e 100644 --- a/contracts/hw.device-type/apalis-imx6q.json +++ b/contracts/hw.device-type/apalis-imx6q/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/artik10.json b/contracts/hw.device-type/artik10/contract.json similarity index 88% rename from contracts/hw.device-type/artik10.json rename to contracts/hw.device-type/artik10/contract.json index 2fd06969..076fb5a5 100644 --- a/contracts/hw.device-type/artik10.json +++ b/contracts/hw.device-type/artik10/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/artik5.json b/contracts/hw.device-type/artik5/contract.json similarity index 88% rename from contracts/hw.device-type/artik5.json rename to contracts/hw.device-type/artik5/contract.json index cdf5f780..48c02d82 100644 --- a/contracts/hw.device-type/artik5.json +++ b/contracts/hw.device-type/artik5/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/artik710.json b/contracts/hw.device-type/artik710/contract.json similarity index 88% rename from contracts/hw.device-type/artik710.json rename to contracts/hw.device-type/artik710/contract.json index 784ecea6..6bdd7fa8 100644 --- a/contracts/hw.device-type/artik710.json +++ b/contracts/hw.device-type/artik710/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/hw.device-type/beaglebone/boot-external.tpl b/contracts/hw.device-type/beaglebone-black/boot-external.tpl similarity index 100% rename from partials/hw.device-type/beaglebone/boot-external.tpl rename to contracts/hw.device-type/beaglebone-black/boot-external.tpl diff --git a/partials/hw.device-type/beaglebone/boot-internal.tpl b/contracts/hw.device-type/beaglebone-black/boot-internal.tpl similarity index 100% rename from partials/hw.device-type/beaglebone/boot-internal.tpl rename to contracts/hw.device-type/beaglebone-black/boot-internal.tpl diff --git a/contracts/hw.device-type/beaglebone-black.json b/contracts/hw.device-type/beaglebone-black/contract.json similarity index 88% rename from contracts/hw.device-type/beaglebone-black.json rename to contracts/hw.device-type/beaglebone-black/contract.json index 32421c0a..622b1574 100644 --- a/contracts/hw.device-type/beaglebone-black.json +++ b/contracts/hw.device-type/beaglebone-black/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/hw.device-type/beaglebone/prepare-network.tpl b/contracts/hw.device-type/beaglebone-black/prepare-network.tpl similarity index 100% rename from partials/hw.device-type/beaglebone/prepare-network.tpl rename to contracts/hw.device-type/beaglebone-black/prepare-network.tpl diff --git a/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl b/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl new file mode 100644 index 00000000..7d4df03d --- /dev/null +++ b/contracts/hw.device-type/beaglebone-green-wifi/boot-external.tpl @@ -0,0 +1 @@ +Hold down the S2 button near the SD card while you connect power to the {{hw.device-type.name}}. Let go of the S2 button when the 4 blue USER leds start flashing diff --git a/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl b/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl new file mode 100644 index 00000000..c1d012f3 --- /dev/null +++ b/contracts/hw.device-type/beaglebone-green-wifi/boot-internal.tpl @@ -0,0 +1 @@ +Press the S3 power button next to the ethernet port on your {{hw.device-type.name}} diff --git a/contracts/hw.device-type/beaglebone-green-wifi.json b/contracts/hw.device-type/beaglebone-green-wifi/contract.json similarity index 89% rename from contracts/hw.device-type/beaglebone-green-wifi.json rename to contracts/hw.device-type/beaglebone-green-wifi/contract.json index 0feff703..073d1d5a 100644 --- a/contracts/hw.device-type/beaglebone-green-wifi.json +++ b/contracts/hw.device-type/beaglebone-green-wifi/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/hw.device-type/vab820-quad/prepare-network.tpl b/contracts/hw.device-type/beaglebone-green-wifi/prepare-network.tpl similarity index 100% rename from partials/hw.device-type/vab820-quad/prepare-network.tpl rename to contracts/hw.device-type/beaglebone-green-wifi/prepare-network.tpl diff --git a/contracts/hw.device-type/beaglebone-green/boot-external.tpl b/contracts/hw.device-type/beaglebone-green/boot-external.tpl new file mode 100644 index 00000000..7d4df03d --- /dev/null +++ b/contracts/hw.device-type/beaglebone-green/boot-external.tpl @@ -0,0 +1 @@ +Hold down the S2 button near the SD card while you connect power to the {{hw.device-type.name}}. Let go of the S2 button when the 4 blue USER leds start flashing diff --git a/contracts/hw.device-type/beaglebone-green/boot-internal.tpl b/contracts/hw.device-type/beaglebone-green/boot-internal.tpl new file mode 100644 index 00000000..c1d012f3 --- /dev/null +++ b/contracts/hw.device-type/beaglebone-green/boot-internal.tpl @@ -0,0 +1 @@ +Press the S3 power button next to the ethernet port on your {{hw.device-type.name}} diff --git a/contracts/hw.device-type/beaglebone-green.json b/contracts/hw.device-type/beaglebone-green/contract.json similarity index 88% rename from contracts/hw.device-type/beaglebone-green.json rename to contracts/hw.device-type/beaglebone-green/contract.json index 44143f43..579eb315 100644 --- a/contracts/hw.device-type/beaglebone-green.json +++ b/contracts/hw.device-type/beaglebone-green/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/beaglebone-green/prepare-network.tpl b/contracts/hw.device-type/beaglebone-green/prepare-network.tpl new file mode 100644 index 00000000..7ef8d976 --- /dev/null +++ b/contracts/hw.device-type/beaglebone-green/prepare-network.tpl @@ -0,0 +1 @@ +Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router diff --git a/partials/hw.device-type/boot-external.tpl b/contracts/hw.device-type/boot-external.tpl similarity index 100% rename from partials/hw.device-type/boot-external.tpl rename to contracts/hw.device-type/boot-external.tpl diff --git a/partials/hw.device-type/boot-internal.tpl b/contracts/hw.device-type/boot-internal.tpl similarity index 100% rename from partials/hw.device-type/boot-internal.tpl rename to contracts/hw.device-type/boot-internal.tpl diff --git a/contracts/hw.device-type/ccon-01.json b/contracts/hw.device-type/ccon-01/contract.json similarity index 88% rename from contracts/hw.device-type/ccon-01.json rename to contracts/hw.device-type/ccon-01/contract.json index 87f55545..37e5d0b8 100644 --- a/contracts/hw.device-type/ccon-01.json +++ b/contracts/hw.device-type/ccon-01/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/colibri-imx6dl.json b/contracts/hw.device-type/colibri-imx6dl/contract.json similarity index 88% rename from contracts/hw.device-type/colibri-imx6dl.json rename to contracts/hw.device-type/colibri-imx6dl/contract.json index 691b7744..59b76ada 100644 --- a/contracts/hw.device-type/colibri-imx6dl.json +++ b/contracts/hw.device-type/colibri-imx6dl/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/cybertan-ze250.json b/contracts/hw.device-type/cybertan-ze250/contract.json similarity index 88% rename from contracts/hw.device-type/cybertan-ze250.json rename to contracts/hw.device-type/cybertan-ze250/contract.json index e816227b..0f29b1e3 100644 --- a/contracts/hw.device-type/cybertan-ze250.json +++ b/contracts/hw.device-type/cybertan-ze250/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "usbkey" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/generic-aarch64.json b/contracts/hw.device-type/generic-aarch64/contract.json similarity index 88% rename from contracts/hw.device-type/generic-aarch64.json rename to contracts/hw.device-type/generic-aarch64/contract.json index ae5b04e9..efa57c5b 100644 --- a/contracts/hw.device-type/generic-aarch64.json +++ b/contracts/hw.device-type/generic-aarch64/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/generic-armv7ahf.json b/contracts/hw.device-type/generic-armv7ahf/contract.json similarity index 88% rename from contracts/hw.device-type/generic-armv7ahf.json rename to contracts/hw.device-type/generic-armv7ahf/contract.json index 7e7111a5..39d62f8b 100644 --- a/contracts/hw.device-type/generic-armv7ahf.json +++ b/contracts/hw.device-type/generic-armv7ahf/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/hummingboard.json b/contracts/hw.device-type/hummingboard/contract.json similarity index 88% rename from contracts/hw.device-type/hummingboard.json rename to contracts/hw.device-type/hummingboard/contract.json index a930538d..a5b78eee 100644 --- a/contracts/hw.device-type/hummingboard.json +++ b/contracts/hw.device-type/hummingboard/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/imx6ul-var-dart.json b/contracts/hw.device-type/imx6ul-var-dart/contract.json similarity index 88% rename from contracts/hw.device-type/imx6ul-var-dart.json rename to contracts/hw.device-type/imx6ul-var-dart/contract.json index 0682b737..4d5c49f7 100644 --- a/contracts/hw.device-type/imx6ul-var-dart.json +++ b/contracts/hw.device-type/imx6ul-var-dart/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/hw.device-type/insert-install-media.tpl b/contracts/hw.device-type/insert-install-media.tpl similarity index 100% rename from partials/hw.device-type/insert-install-media.tpl rename to contracts/hw.device-type/insert-install-media.tpl diff --git a/contracts/hw.device-type/intel-edison.json b/contracts/hw.device-type/intel-edison/contract.json similarity index 88% rename from contracts/hw.device-type/intel-edison.json rename to contracts/hw.device-type/intel-edison/contract.json index 0782358f..5c33b86e 100644 --- a/contracts/hw.device-type/intel-edison.json +++ b/contracts/hw.device-type/intel-edison/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "dfu" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/hw.device-type/intel-nuc/boot-external.tpl b/contracts/hw.device-type/intel-nuc/boot-external.tpl similarity index 100% rename from partials/hw.device-type/intel-nuc/boot-external.tpl rename to contracts/hw.device-type/intel-nuc/boot-external.tpl diff --git a/partials/hw.device-type/intel-nuc/boot-internal.tpl b/contracts/hw.device-type/intel-nuc/boot-internal.tpl similarity index 100% rename from partials/hw.device-type/intel-nuc/boot-internal.tpl rename to contracts/hw.device-type/intel-nuc/boot-internal.tpl diff --git a/contracts/hw.device-type/intel-nuc.json b/contracts/hw.device-type/intel-nuc/contract.json similarity index 88% rename from contracts/hw.device-type/intel-nuc.json rename to contracts/hw.device-type/intel-nuc/contract.json index 99f2beb2..623c1713 100644 --- a/contracts/hw.device-type/intel-nuc.json +++ b/contracts/hw.device-type/intel-nuc/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "usbkey" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/iot2000.json b/contracts/hw.device-type/iot2000/contract.json similarity index 88% rename from contracts/hw.device-type/iot2000.json rename to contracts/hw.device-type/iot2000/contract.json index 0f0472a9..83f47392 100644 --- a/contracts/hw.device-type/iot2000.json +++ b/contracts/hw.device-type/iot2000/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/jetson-tx1.json b/contracts/hw.device-type/jetson-tx1/contract.json similarity index 88% rename from contracts/hw.device-type/jetson-tx1.json rename to contracts/hw.device-type/jetson-tx1/contract.json index 353784f5..5a147470 100644 --- a/contracts/hw.device-type/jetson-tx1.json +++ b/contracts/hw.device-type/jetson-tx1/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/jetson-tx2.json b/contracts/hw.device-type/jetson-tx2/contract.json similarity index 88% rename from contracts/hw.device-type/jetson-tx2.json rename to contracts/hw.device-type/jetson-tx2/contract.json index 2018951d..569b9f74 100644 --- a/contracts/hw.device-type/jetson-tx2.json +++ b/contracts/hw.device-type/jetson-tx2/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/kitra520.json b/contracts/hw.device-type/kitra520/contract.json similarity index 88% rename from contracts/hw.device-type/kitra520.json rename to contracts/hw.device-type/kitra520/contract.json index c235b2ee..a39c66bc 100644 --- a/contracts/hw.device-type/kitra520.json +++ b/contracts/hw.device-type/kitra520/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/kitra710.json b/contracts/hw.device-type/kitra710/contract.json similarity index 88% rename from contracts/hw.device-type/kitra710.json rename to contracts/hw.device-type/kitra710/contract.json index dd495f04..7df2f5c8 100644 --- a/contracts/hw.device-type/kitra710.json +++ b/contracts/hw.device-type/kitra710/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/nitrogen6x.json b/contracts/hw.device-type/nitrogen6x/contract.json similarity index 88% rename from contracts/hw.device-type/nitrogen6x.json rename to contracts/hw.device-type/nitrogen6x/contract.json index b42334f7..fe8aef7d 100644 --- a/contracts/hw.device-type/nitrogen6x.json +++ b/contracts/hw.device-type/nitrogen6x/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/odroid-c1.json b/contracts/hw.device-type/odroid-c1/contract.json similarity index 88% rename from contracts/hw.device-type/odroid-c1.json rename to contracts/hw.device-type/odroid-c1/contract.json index 71f09145..e092685e 100644 --- a/contracts/hw.device-type/odroid-c1.json +++ b/contracts/hw.device-type/odroid-c1/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/odroid-xu4.json b/contracts/hw.device-type/odroid-xu4/contract.json similarity index 88% rename from contracts/hw.device-type/odroid-xu4.json rename to contracts/hw.device-type/odroid-xu4/contract.json index 8b477ced..74a567e7 100644 --- a/contracts/hw.device-type/odroid-xu4.json +++ b/contracts/hw.device-type/odroid-xu4/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/parallella.json b/contracts/hw.device-type/parallella/contract.json similarity index 88% rename from contracts/hw.device-type/parallella.json rename to contracts/hw.device-type/parallella/contract.json index 9753eb08..aa17d481 100644 --- a/contracts/hw.device-type/parallella.json +++ b/contracts/hw.device-type/parallella/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/hw.device-type/prepare-network.tpl b/contracts/hw.device-type/prepare-network.tpl similarity index 100% rename from partials/hw.device-type/prepare-network.tpl rename to contracts/hw.device-type/prepare-network.tpl diff --git a/contracts/hw.device-type/qemux86-64.json b/contracts/hw.device-type/qemux86-64/contract.json similarity index 88% rename from contracts/hw.device-type/qemux86-64.json rename to contracts/hw.device-type/qemux86-64/contract.json index ee5351b2..91bc9d49 100644 --- a/contracts/hw.device-type/qemux86-64.json +++ b/contracts/hw.device-type/qemux86-64/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "image" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/qemux86.json b/contracts/hw.device-type/qemux86/contract.json similarity index 88% rename from contracts/hw.device-type/qemux86.json rename to contracts/hw.device-type/qemux86/contract.json index cca7e6d5..07fc25bc 100644 --- a/contracts/hw.device-type/qemux86.json +++ b/contracts/hw.device-type/qemux86/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "image" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/raspberry-pi.json b/contracts/hw.device-type/raspberry-pi/contract.json similarity index 88% rename from contracts/hw.device-type/raspberry-pi.json rename to contracts/hw.device-type/raspberry-pi/contract.json index 6f73383c..24e05781 100644 --- a/contracts/hw.device-type/raspberry-pi.json +++ b/contracts/hw.device-type/raspberry-pi/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/raspberry-pi2.json b/contracts/hw.device-type/raspberry-pi2/contract.json similarity index 88% rename from contracts/hw.device-type/raspberry-pi2.json rename to contracts/hw.device-type/raspberry-pi2/contract.json index 0571a758..834ea4f8 100644 --- a/contracts/hw.device-type/raspberry-pi2.json +++ b/contracts/hw.device-type/raspberry-pi2/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/raspberrypi3.json b/contracts/hw.device-type/raspberrypi3/contract.json similarity index 88% rename from contracts/hw.device-type/raspberrypi3.json rename to contracts/hw.device-type/raspberrypi3/contract.json index 2b6d833e..10a54f8a 100644 --- a/contracts/hw.device-type/raspberrypi3.json +++ b/contracts/hw.device-type/raspberrypi3/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/hw.device-type/remove-install-media.tpl b/contracts/hw.device-type/remove-install-media.tpl similarity index 100% rename from partials/hw.device-type/remove-install-media.tpl rename to contracts/hw.device-type/remove-install-media.tpl diff --git a/partials/hw.device-type/ts4900/boot-external.tpl b/contracts/hw.device-type/ts4900/boot-external.tpl similarity index 100% rename from partials/hw.device-type/ts4900/boot-external.tpl rename to contracts/hw.device-type/ts4900/boot-external.tpl diff --git a/partials/hw.device-type/ts4900/boot-internal.tpl b/contracts/hw.device-type/ts4900/boot-internal.tpl similarity index 100% rename from partials/hw.device-type/ts4900/boot-internal.tpl rename to contracts/hw.device-type/ts4900/boot-internal.tpl diff --git a/contracts/hw.device-type/ts4900.json b/contracts/hw.device-type/ts4900/contract.json similarity index 88% rename from contracts/hw.device-type/ts4900.json rename to contracts/hw.device-type/ts4900/contract.json index 6d47d9cb..b5befab4 100644 --- a/contracts/hw.device-type/ts4900.json +++ b/contracts/hw.device-type/ts4900/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/ts7700.json b/contracts/hw.device-type/ts7700/contract.json similarity index 88% rename from contracts/hw.device-type/ts7700.json rename to contracts/hw.device-type/ts7700/contract.json index 515d43d2..096ff96d 100644 --- a/contracts/hw.device-type/ts7700.json +++ b/contracts/hw.device-type/ts7700/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/up-board.json b/contracts/hw.device-type/up-board/contract.json similarity index 88% rename from contracts/hw.device-type/up-board.json rename to contracts/hw.device-type/up-board/contract.json index e02c234f..912f6f7d 100644 --- a/contracts/hw.device-type/up-board.json +++ b/contracts/hw.device-type/up-board/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "usbkey" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/hw.device-type/vab820-quad/boot-external.tpl b/contracts/hw.device-type/via-vab820-quad/boot-external.tpl similarity index 100% rename from partials/hw.device-type/vab820-quad/boot-external.tpl rename to contracts/hw.device-type/via-vab820-quad/boot-external.tpl diff --git a/partials/hw.device-type/vab820-quad/boot-internal.tpl b/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl similarity index 100% rename from partials/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/via-vab820-quad.json b/contracts/hw.device-type/via-vab820-quad/contract.json similarity index 88% rename from contracts/hw.device-type/via-vab820-quad.json rename to contracts/hw.device-type/via-vab820-quad/contract.json index 7ab23c73..3a20f37b 100644 --- a/contracts/hw.device-type/via-vab820-quad.json +++ b/contracts/hw.device-type/via-vab820-quad/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl b/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl new file mode 100644 index 00000000..7ef8d976 --- /dev/null +++ b/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl @@ -0,0 +1 @@ +Ensure the Wifi dongle is attached to your device, and that the ethernet cable is plugged into your device and leads to an internet-connected router diff --git a/partials/hw.device-type/visual-appearance-when-off.tpl b/contracts/hw.device-type/visual-appearance-when-off.tpl similarity index 100% rename from partials/hw.device-type/visual-appearance-when-off.tpl rename to contracts/hw.device-type/visual-appearance-when-off.tpl diff --git a/contracts/hw.device-type/zc702-zynq7.json b/contracts/hw.device-type/zc702-zynq7/contract.json similarity index 88% rename from contracts/hw.device-type/zc702-zynq7.json rename to contracts/hw.device-type/zc702-zynq7/contract.json index f4823c40..23227360 100644 --- a/contracts/hw.device-type/zc702-zynq7.json +++ b/contracts/hw.device-type/zc702-zynq7/contract.json @@ -15,7 +15,5 @@ "media": { "installation": "sdcard" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/sw.blob/download.tpl b/contracts/sw.blob/download.tpl similarity index 100% rename from partials/sw.blob/download.tpl rename to contracts/sw.blob/download.tpl diff --git a/contracts/sw.blob/entry.json b/contracts/sw.blob/entry/contract.json similarity index 93% rename from contracts/sw.blob/entry.json rename to contracts/sw.blob/entry/contract.json index 570a9c15..229d4849 100644 --- a/contracts/sw.blob/entry.json +++ b/contracts/sw.blob/entry/contract.json @@ -3,15 +3,14 @@ "type": "sw.blob", "name": "resin entry.sh script", "version": "1", - "data": { + "assets": { "bin": { "main": "entry.sh" } }, - "requires": "", "variants": [ { - "data": { + "assets": { "bin": { "name": "entry-alpine.sh", "url": "file://./assets/entry-alpine.sh", @@ -23,7 +22,7 @@ ] }, { - "data": { + "assets": { "bin": { "name": "entry-no-systemd-debian.sh", "url": "file://./assets/entry-no-systemd-debian.sh", @@ -35,7 +34,7 @@ ] }, { - "data": { + "assets": { "bin": { "name": "entry-systemd-debian.sh", "url": "file://./assets/entry-systemd-debian.sh", @@ -54,7 +53,7 @@ ] }, { - "data": { + "assets": { "bin": { "name": "entry-fedora.sh", "url": "file://./assets/entry-fedora.sh", diff --git a/contracts/sw.blob/nodejs.json b/contracts/sw.blob/nodejs/contract.json similarity index 94% rename from contracts/sw.blob/nodejs.json rename to contracts/sw.blob/nodejs/contract.json index e376f086..7bc33a2e 100644 --- a/contracts/sw.blob/nodejs.json +++ b/contracts/sw.blob/nodejs/contract.json @@ -9,7 +9,7 @@ "libc": "{{libc}}" } ], - "data": { + "assets": { "bin": { "checksumType": "sha256" } @@ -22,7 +22,7 @@ "libc": "musl-libc", "variants": [ { - "data": { + "assets": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-armhf.tar.gz", "checksum": "99ea7697fd1a4fc297cbcfca98d920e19a8a5ffead5239db58c6f4383f56e21c" @@ -38,7 +38,7 @@ ] }, { - "data": { + "assets": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-amd64.tar.gz", "checksum": "d9591863975989387aa7369a95eaea11db9183d3c2d56b35cd2e58f15d7e17a3" @@ -49,7 +49,7 @@ ] }, { - "data": { + "assets": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-alpine-i386.tar.gz", "checksum": "140651bbd447316ac45f7fdf50a11c728f628b1d8e4c9f5deb83b5fe23c87824" @@ -65,7 +65,7 @@ "libc": "glibc", "variants": [ { - "data": { + "assets": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armel.tar.gz", "checksum": "7be6f13e407bff7eab3883764dca59dbedb751613cf23cbfe75a618a7c3ce333" @@ -76,7 +76,7 @@ ] }, { - "data": { + "assets": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armv6l.tar.gz", "checksum": "af669f5fc7cb5269978144a8b6469923657119b3ee712d6bf70167e36b6812c2" @@ -87,7 +87,7 @@ ] }, { - "data": { + "assets": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-armv7hf.tar.gz", "checksum": "849a55c62a726386649fb9c6da8e41ac3611d8b3a1ac481959516fc95047262a" @@ -98,7 +98,7 @@ ] }, { - "data": { + "assets": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-i386.tar.gz", "checksum": "a47a28aed8307d4328ce23e5dda57d6b4bde7ddf60b41f354850f1f9cfe37750" }, @@ -107,7 +107,7 @@ ] }, { - "data": { + "assets": { "bin": { "url": "http://resin-packages.s3.amazonaws.com/node/v{{version}}/node-v{{version}}-linux-x64.tar.gz", "checksum": "52382b93865a5edd834db10e8f60822680d26dc2b8cadccafc351b0082a9052a" diff --git a/contracts/sw.blob/qemu.json b/contracts/sw.blob/qemu/contract.json similarity index 94% rename from contracts/sw.blob/qemu.json rename to contracts/sw.blob/qemu/contract.json index 53be2cde..b4a28ef5 100644 --- a/contracts/sw.blob/qemu.json +++ b/contracts/sw.blob/qemu/contract.json @@ -3,16 +3,15 @@ "type": "sw.blob", "version": "1", "name": "QEMU v{{version}}", - "data": { + "assets": { "bin": { "checksumType": "sha256" } }, - "requires": "", "variants": [ { "version": "2.9.0.resin1-arm", - "data": { + "assets": { "bin": { "name": "qemu-arm-static", "url": "file://./assets/qemu-arm-static", @@ -32,7 +31,7 @@ }, { "version": "2.9.0.resin1-aarch64", - "data": { + "assets": { "bin": { "name": "qemu-aarch64-static", "url": "file://./assets/qemu-aarch64-static", diff --git a/contracts/sw.blob/resin-xbuild.json b/contracts/sw.blob/resin-xbuild/contract.json similarity index 89% rename from contracts/sw.blob/resin-xbuild.json rename to contracts/sw.blob/resin-xbuild/contract.json index 7841982f..7abe2107 100644 --- a/contracts/sw.blob/resin-xbuild.json +++ b/contracts/sw.blob/resin-xbuild/contract.json @@ -3,7 +3,7 @@ "type": "sw.blob", "name": "Resin XBuild v{{version}}", "version": "1.0.0", - "data": { + "assets": { "bin": { "name": "resin-xbuild{{version}}.tar.gz", "url": "http://resin-packages.s3.amazonaws.com/resin-xbuild/v{{version}}/resin-xbuild{{version}}.tar.gz", @@ -11,7 +11,5 @@ "checksumType": "sha256", "main": "resin-xbuild" } - }, - "requires": "", - "variants": "" + } } diff --git a/contracts/sw.blob/tini.json b/contracts/sw.blob/tini/contract.json similarity index 95% rename from contracts/sw.blob/tini.json rename to contracts/sw.blob/tini/contract.json index c2734f68..0465a5e4 100644 --- a/contracts/sw.blob/tini.json +++ b/contracts/sw.blob/tini/contract.json @@ -3,8 +3,7 @@ "type": "sw.blob", "name": "tini", "version": "0.14.0", - "requires": "", - "data": { + "assets": { "bin": { "checksumType": "sha256", "main": "tini" @@ -12,7 +11,7 @@ }, "variants": [ { - "data": { + "assets": { "bin": { "name": "tini{{version}}.linux-armv7hf.tar.gz", "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-armv7hf.tar.gz", @@ -30,7 +29,7 @@ ] }, { - "data": { + "assets": { "bin": { "name": "tini{{version}}.linux-armel.tar.gz", "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-armel.tar.gz", @@ -43,7 +42,7 @@ ] }, { - "data": { + "assets": { "bin": { "name": "tini{{version}}.linux-aarch64.tar.gz", "url": "http://resin-packages.s3.amazonaws.com/tini/v{{version}}/tini{{version}}.linux-aarch64.tar.gz", @@ -56,7 +55,7 @@ ] }, { - "data": { + "assets": { "bin": { "name": "tini{{version}}.linux-i386.tar.gz", "checksum": "9f4a0b536efdcbe92bc81c6e68dbf8dc1c5739e58f4e7e3a91f07094655149e8", @@ -69,7 +68,7 @@ ] }, { - "data": { + "assets": { "bin": { "name": "tini{{version}}.linux-amd64.tar.gz", "checksum": "a662ee1594cb037909237c87d577b6e4dee9879f1c23279f1a829683e542e4a0", diff --git a/partials/sw.image-writer+hw.device-type/etcher/flash.tpl b/contracts/sw.image-writer+hw.device-type/etcher/flash.tpl similarity index 100% rename from partials/sw.image-writer+hw.device-type/etcher/flash.tpl rename to contracts/sw.image-writer+hw.device-type/etcher/flash.tpl diff --git a/partials/sw.image-writer/download.tpl b/contracts/sw.image-writer/download.tpl similarity index 100% rename from partials/sw.image-writer/download.tpl rename to contracts/sw.image-writer/download.tpl diff --git a/contracts/sw.image-writer/etcher.json b/contracts/sw.image-writer/etcher/contract.json similarity index 86% rename from contracts/sw.image-writer/etcher.json rename to contracts/sw.image-writer/etcher/contract.json index 742acad0..ccfa4d9e 100644 --- a/contracts/sw.image-writer/etcher.json +++ b/contracts/sw.image-writer/etcher/contract.json @@ -3,13 +3,11 @@ "type": "sw.image-writer", "name": "Etcher for macOS", "version": "1.1.2", - "data": { + "assets": { "bin": { "url": "https://github.com/resin-io/etcher/releases/download/v{{version}}/Etcher-{{version}}.dmg", "checksum": "b562c7ff89e0de86003ee1cc14a1ee08ab5988a543b6e22235fe3773a48074a4", "checksumType": "sha256" } - }, - "requires": "", - "variants": "" + } } diff --git a/partials/sw.os+arch.sw/alpine+aarch64/from.tpl b/contracts/sw.os+arch.sw/alpine+aarch64/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/alpine+aarch64/from.tpl rename to contracts/sw.os+arch.sw/alpine+aarch64/from.tpl diff --git a/partials/sw.os+arch.sw/alpine+amd64/from.tpl b/contracts/sw.os+arch.sw/alpine+amd64/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/alpine+amd64/from.tpl rename to contracts/sw.os+arch.sw/alpine+amd64/from.tpl diff --git a/partials/sw.os+arch.sw/alpine+armhf/from.tpl b/contracts/sw.os+arch.sw/alpine+armhf/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/alpine+armhf/from.tpl rename to contracts/sw.os+arch.sw/alpine+armhf/from.tpl diff --git a/partials/sw.os+arch.sw/alpine+i386/from.tpl b/contracts/sw.os+arch.sw/alpine+i386/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/alpine+i386/from.tpl rename to contracts/sw.os+arch.sw/alpine+i386/from.tpl diff --git a/partials/sw.os+arch.sw/alpine/base-dependencies.tpl b/contracts/sw.os+arch.sw/alpine/base-dependencies.tpl similarity index 100% rename from partials/sw.os+arch.sw/alpine/base-dependencies.tpl rename to contracts/sw.os+arch.sw/alpine/base-dependencies.tpl diff --git a/partials/sw.os+arch.sw/alpine/init-system.tpl b/contracts/sw.os+arch.sw/alpine/init-system.tpl similarity index 100% rename from partials/sw.os+arch.sw/alpine/init-system.tpl rename to contracts/sw.os+arch.sw/alpine/init-system.tpl diff --git a/partials/sw.os+arch.sw/alpine/os-config.tpl b/contracts/sw.os+arch.sw/alpine/os-config.tpl similarity index 100% rename from partials/sw.os+arch.sw/alpine/os-config.tpl rename to contracts/sw.os+arch.sw/alpine/os-config.tpl diff --git a/partials/sw.os+arch.sw/alpine/tini.tpl b/contracts/sw.os+arch.sw/alpine/tini.tpl similarity index 100% rename from partials/sw.os+arch.sw/alpine/tini.tpl rename to contracts/sw.os+arch.sw/alpine/tini.tpl diff --git a/partials/sw.os+arch.sw/debian+aarch64/from.tpl b/contracts/sw.os+arch.sw/debian+aarch64/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian+aarch64/from.tpl rename to contracts/sw.os+arch.sw/debian+aarch64/from.tpl diff --git a/partials/sw.os+arch.sw/debian+amd64/from.tpl b/contracts/sw.os+arch.sw/debian+amd64/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian+amd64/from.tpl rename to contracts/sw.os+arch.sw/debian+amd64/from.tpl diff --git a/partials/sw.os+arch.sw/debian+armel/from.tpl b/contracts/sw.os+arch.sw/debian+armel/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian+armel/from.tpl rename to contracts/sw.os+arch.sw/debian+armel/from.tpl diff --git a/partials/sw.os+arch.sw/debian+armel/qemu.tpl b/contracts/sw.os+arch.sw/debian+armel/qemu.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian+armel/qemu.tpl rename to contracts/sw.os+arch.sw/debian+armel/qemu.tpl diff --git a/partials/sw.os+arch.sw/debian+armv7hf/from.tpl b/contracts/sw.os+arch.sw/debian+armv7hf/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian+armv7hf/from.tpl rename to contracts/sw.os+arch.sw/debian+armv7hf/from.tpl diff --git a/partials/sw.os+arch.sw/debian+i386/from.tpl b/contracts/sw.os+arch.sw/debian+i386/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian+i386/from.tpl rename to contracts/sw.os+arch.sw/debian+i386/from.tpl diff --git a/partials/sw.os+arch.sw/debian/base-dependencies.tpl b/contracts/sw.os+arch.sw/debian/base-dependencies.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian/base-dependencies.tpl rename to contracts/sw.os+arch.sw/debian/base-dependencies.tpl diff --git a/partials/sw.os+arch.sw/debian/init-system.tpl b/contracts/sw.os+arch.sw/debian/init-system.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian/init-system.tpl rename to contracts/sw.os+arch.sw/debian/init-system.tpl diff --git a/partials/sw.os+arch.sw/debian/os-config.tpl b/contracts/sw.os+arch.sw/debian/os-config.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian/os-config.tpl rename to contracts/sw.os+arch.sw/debian/os-config.tpl diff --git a/partials/sw.os+arch.sw/debian@jessie/init-system.tpl b/contracts/sw.os+arch.sw/debian@jessie/init-system.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian@jessie/init-system.tpl rename to contracts/sw.os+arch.sw/debian@jessie/init-system.tpl diff --git a/partials/sw.os+arch.sw/debian@wheezy/init-system.tpl b/contracts/sw.os+arch.sw/debian@wheezy/init-system.tpl similarity index 100% rename from partials/sw.os+arch.sw/debian@wheezy/init-system.tpl rename to contracts/sw.os+arch.sw/debian@wheezy/init-system.tpl diff --git a/partials/sw.os+arch.sw/fedora+aarch64/from.tpl b/contracts/sw.os+arch.sw/fedora+aarch64/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/fedora+aarch64/from.tpl rename to contracts/sw.os+arch.sw/fedora+aarch64/from.tpl diff --git a/partials/sw.os+arch.sw/fedora+amd64/from.tpl b/contracts/sw.os+arch.sw/fedora+amd64/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/fedora+amd64/from.tpl rename to contracts/sw.os+arch.sw/fedora+amd64/from.tpl diff --git a/partials/sw.os+arch.sw/fedora+armv7hf/from.tpl b/contracts/sw.os+arch.sw/fedora+armv7hf/from.tpl similarity index 100% rename from partials/sw.os+arch.sw/fedora+armv7hf/from.tpl rename to contracts/sw.os+arch.sw/fedora+armv7hf/from.tpl diff --git a/partials/sw.os+arch.sw/fedora+armv7hf/os-config.tpl b/contracts/sw.os+arch.sw/fedora+armv7hf/os-config.tpl similarity index 100% rename from partials/sw.os+arch.sw/fedora+armv7hf/os-config.tpl rename to contracts/sw.os+arch.sw/fedora+armv7hf/os-config.tpl diff --git a/partials/sw.os+arch.sw/fedora/base-dependencies.tpl b/contracts/sw.os+arch.sw/fedora/base-dependencies.tpl similarity index 100% rename from partials/sw.os+arch.sw/fedora/base-dependencies.tpl rename to contracts/sw.os+arch.sw/fedora/base-dependencies.tpl diff --git a/partials/sw.os+arch.sw/fedora/init-system.tpl b/contracts/sw.os+arch.sw/fedora/init-system.tpl similarity index 100% rename from partials/sw.os+arch.sw/fedora/init-system.tpl rename to contracts/sw.os+arch.sw/fedora/init-system.tpl diff --git a/partials/sw.os+arch.sw/fedora/os-config.tpl b/contracts/sw.os+arch.sw/fedora/os-config.tpl similarity index 100% rename from partials/sw.os+arch.sw/fedora/os-config.tpl rename to contracts/sw.os+arch.sw/fedora/os-config.tpl diff --git a/partials/sw.os+arch.sw/fedora@24/init-system.tpl b/contracts/sw.os+arch.sw/fedora@24/init-system.tpl similarity index 100% rename from partials/sw.os+arch.sw/fedora@24/init-system.tpl rename to contracts/sw.os+arch.sw/fedora@24/init-system.tpl diff --git a/partials/sw.os+arch.sw/qemu.tpl b/contracts/sw.os+arch.sw/qemu.tpl similarity index 100% rename from partials/sw.os+arch.sw/qemu.tpl rename to contracts/sw.os+arch.sw/qemu.tpl diff --git a/partials/sw.os+arch.sw/resin-xbuild.tpl b/contracts/sw.os+arch.sw/resin-xbuild.tpl similarity index 100% rename from partials/sw.os+arch.sw/resin-xbuild.tpl rename to contracts/sw.os+arch.sw/resin-xbuild.tpl diff --git a/partials/sw.os+arch.sw/tini.tpl b/contracts/sw.os+arch.sw/tini.tpl similarity index 100% rename from partials/sw.os+arch.sw/tini.tpl rename to contracts/sw.os+arch.sw/tini.tpl diff --git a/partials/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl b/contracts/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl rename to contracts/sw.os+hw.device-type/alpine+raspberry-pi/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl b/contracts/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl rename to contracts/sw.os+hw.device-type/alpine+raspberrypi-pi2/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl b/contracts/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl rename to contracts/sw.os+hw.device-type/alpine+raspberrypi3/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/alpine/dependencies.tpl b/contracts/sw.os+hw.device-type/alpine/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/alpine/dependencies.tpl rename to contracts/sw.os+hw.device-type/alpine/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian+beaglebone-black/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian+beaglebone-green-wifi/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian+beaglebone-green/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl rename to contracts/sw.os+hw.device-type/debian+cybertan-ze250/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl rename to contracts/sw.os+hw.device-type/debian+intel-edison/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/debian+iot2000/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+iot2000/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+iot2000/dependencies.tpl rename to contracts/sw.os+hw.device-type/debian+iot2000/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl rename to contracts/sw.os+hw.device-type/debian+raspberry-pi2/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian+raspberry-pi2/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl rename to contracts/sw.os+hw.device-type/debian+raspberrypi3/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl b/contracts/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian+raspberrypi3/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian+up-board/dependencies.tpl b/contracts/sw.os+hw.device-type/debian+up-board/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian+up-board/dependencies.tpl rename to contracts/sw.os+hw.device-type/debian+up-board/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/debian/dependencies.tpl b/contracts/sw.os+hw.device-type/debian/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian/dependencies.tpl rename to contracts/sw.os+hw.device-type/debian/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/debian/distro-config.tpl b/contracts/sw.os+hw.device-type/debian/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian@buster+raspberry-pi2/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian@buster+raspberrypi3/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-black/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-green-wifi/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl b/contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl rename to contracts/sw.os+hw.device-type/debian@wheezy+beaglebone-green/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/dependencies.tpl b/contracts/sw.os+hw.device-type/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/dependencies.tpl rename to contracts/sw.os+hw.device-type/dependencies.tpl diff --git a/partials/sw.os+hw.device-type/distro-config.tpl b/contracts/sw.os+hw.device-type/distro-config.tpl similarity index 100% rename from partials/sw.os+hw.device-type/distro-config.tpl rename to contracts/sw.os+hw.device-type/distro-config.tpl diff --git a/partials/sw.os+hw.device-type/fedora/dependencies.tpl b/contracts/sw.os+hw.device-type/fedora/dependencies.tpl similarity index 100% rename from partials/sw.os+hw.device-type/fedora/dependencies.tpl rename to contracts/sw.os+hw.device-type/fedora/dependencies.tpl diff --git a/partials/sw.os-flasher/description-of-internal-process.tpl b/contracts/sw.os-flasher/description-of-internal-process.tpl similarity index 100% rename from partials/sw.os-flasher/description-of-internal-process.tpl rename to contracts/sw.os-flasher/description-of-internal-process.tpl diff --git a/partials/sw.os-image/download.tpl b/contracts/sw.os-image/download.tpl similarity index 100% rename from partials/sw.os-image/download.tpl rename to contracts/sw.os-image/download.tpl diff --git a/contracts/sw.os-image/resinos.json b/contracts/sw.os-image/resinos/contract.json similarity index 92% rename from contracts/sw.os-image/resinos.json rename to contracts/sw.os-image/resinos/contract.json index 191b4533..d5787952 100644 --- a/contracts/sw.os-image/resinos.json +++ b/contracts/sw.os-image/resinos/contract.json @@ -9,10 +9,9 @@ "slug": "raspberrypi3" } ], - "data": { + "assets": { "url": "https://files.resin.io/resinos/raspberrypi3/{{version}}/image/resin.img.zip", "checksumType": "sha256", "checksum": "29c1fef73e8636c79ab1d835bc1d90f115d7683585eaf39874a2eab739b74baf" - }, - "variants": "" + } } diff --git a/partials/sw.os-image/resinos/download.tpl b/contracts/sw.os-image/resinos/download.tpl similarity index 100% rename from partials/sw.os-image/resinos/download.tpl rename to contracts/sw.os-image/resinos/download.tpl diff --git a/contracts/sw.os/alpine.json b/contracts/sw.os/alpine/contract.json similarity index 96% rename from contracts/sw.os/alpine.json rename to contracts/sw.os/alpine/contract.json index fc893fc9..d520a9a4 100644 --- a/contracts/sw.os/alpine.json +++ b/contracts/sw.os/alpine/contract.json @@ -2,7 +2,7 @@ "slug": "alpine", "type": "sw.os", "version": "1", - "data":{ "libc": "musl-libc" }, + "data": { "libc": "musl-libc" }, "name": "Alpine Linux {{version}}", "requires": [ { "type": "sw.blob", "slug": "tini" }, diff --git a/contracts/sw.os/debian.json b/contracts/sw.os/debian/contract.json similarity index 98% rename from contracts/sw.os/debian.json rename to contracts/sw.os/debian/contract.json index d97fd5d7..d0f5f1ce 100644 --- a/contracts/sw.os/debian.json +++ b/contracts/sw.os/debian/contract.json @@ -3,6 +3,7 @@ "type": "sw.os", "version": "1", "data": { "libc": "glibc" }, + "name": "Debian {{version}}", "requires": [ { "type": "sw.blob", "slug": "tini" }, { "type": "sw.blob", "slug": "resin-xbuild" }, diff --git a/contracts/sw.os/fedora.json b/contracts/sw.os/fedora/contract.json similarity index 100% rename from contracts/sw.os/fedora.json rename to contracts/sw.os/fedora/contract.json diff --git a/contracts/sw.os/resinos.json b/contracts/sw.os/resinos/contract.json similarity index 92% rename from contracts/sw.os/resinos.json rename to contracts/sw.os/resinos/contract.json index 5f942f97..4e77dac1 100644 --- a/contracts/sw.os/resinos.json +++ b/contracts/sw.os/resinos/contract.json @@ -13,6 +13,5 @@ "type": "sw.os-image", "slug": "resinos" } - ], - "variants": "" + ] } diff --git a/contracts/sw.stack/go.json b/contracts/sw.stack/go/contract.json similarity index 98% rename from contracts/sw.stack/go.json rename to contracts/sw.stack/go/contract.json index fc5d7d2d..cee716d6 100644 --- a/contracts/sw.stack/go.json +++ b/contracts/sw.stack/go/contract.json @@ -3,7 +3,6 @@ "type": "sw.stack", "name": "Go {{version}}", "version": "1", - "data": "", "requires": [ { "or": [ diff --git a/contracts/sw.stack/java.json b/contracts/sw.stack/java/contract.json similarity index 98% rename from contracts/sw.stack/java.json rename to contracts/sw.stack/java/contract.json index 85906b02..a6fb4756 100644 --- a/contracts/sw.stack/java.json +++ b/contracts/sw.stack/java/contract.json @@ -3,7 +3,6 @@ "type": "sw.stack", "name": "Java {{version}}", "version": "1", - "data": "", "requires": [ { "or": [ diff --git a/contracts/sw.stack/nodejs.json b/contracts/sw.stack/nodejs/contract.json similarity index 99% rename from contracts/sw.stack/nodejs.json rename to contracts/sw.stack/nodejs/contract.json index 318c8d76..cd4614c7 100644 --- a/contracts/sw.stack/nodejs.json +++ b/contracts/sw.stack/nodejs/contract.json @@ -3,7 +3,6 @@ "type": "sw.stack", "name": "Node.js {{version}}", "version": "1", - "data": "", "requires": [ { "or": [ diff --git a/contracts/sw.stack/python.json b/contracts/sw.stack/python/contract.json similarity index 98% rename from contracts/sw.stack/python.json rename to contracts/sw.stack/python/contract.json index e7d20d71..716520c7 100644 --- a/contracts/sw.stack/python.json +++ b/contracts/sw.stack/python/contract.json @@ -3,7 +3,6 @@ "type": "sw.stack", "name": "Python {{version}}", "version": "1", - "data": "", "requires": [ { "or": [ diff --git a/contracts/sw.variant/jdk.json b/contracts/sw.variant/jdk.json deleted file mode 100644 index d0d85cb3..00000000 --- a/contracts/sw.variant/jdk.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "slug": "jdk", - "version": "1", - "type": "sw.variant", - "name": "JDK", - "data": "", - "requires": [ - { - "or": [ - { "type": "sw.os", "slug": "fedora" }, - { "type": "sw.os", "slug": "debian" }, - { "type": "sw.os", "slug": "raspbian" }, - { "type": "sw.os", "slug": "alpine" } - ] - }, - { - "type": "sw.stack", - "slug": "java" - } - ], - "variants": "" -} diff --git a/contracts/sw.variant/jre.json b/contracts/sw.variant/jre.json deleted file mode 100644 index 9ca22260..00000000 --- a/contracts/sw.variant/jre.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "slug": "jre", - "version": "1", - "type": "sw.variant", - "name": "JRE", - "data": "", - "requires": [ - { - "or": [ - { "type": "sw.os", "slug": "fedora" }, - { "type": "sw.os", "slug": "debian" }, - { "type": "sw.os", "slug": "raspbian" }, - { "type": "sw.os", "slug": "alpine" } - ] - }, - { - "type": "sw.stack", - "slug": "java" - } - ], - "variants": "" -} diff --git a/contracts/sw.variant/onbuild.json b/contracts/sw.variant/onbuild.json deleted file mode 100644 index b8975215..00000000 --- a/contracts/sw.variant/onbuild.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "slug": "onbuild", - "version": "1", - "type": "sw.variant", - "name": "On Build", - "data": "", - "requires": [ - { - "or": [ - { "type": "sw.os", "slug": "fedora" }, - { "type": "sw.os", "slug": "debian" }, - { "type": "sw.os", "slug": "raspbian" }, - { "type": "sw.os", "slug": "alpine" } - ] - }, - { - "or": [ - { "type": "sw.stack", "slug": "go" }, - { "type": "sw.stack", "slug": "nodejs" }, - { "type": "sw.stack", "slug": "python" } - ] - } - ], - "variants": "" -} diff --git a/contracts/sw.variant/slim.json b/contracts/sw.variant/slim.json deleted file mode 100644 index f8c151f4..00000000 --- a/contracts/sw.variant/slim.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "slug": "slim", - "version": "1", - "type": "sw.variant", - "name": "Slim", - "data": "", - "requires": [ - { - "or": [ - { "type": "sw.os", "slug": "fedora" }, - { "type": "sw.os", "slug": "debian" }, - { "type": "sw.os", "slug": "raspbian" }, - { "type": "sw.os", "slug": "alpine" } - ] - }, - { - "or": [ - { "type": "sw.stack", "slug": "go" }, - { "type": "sw.stack", "slug": "nodejs" }, - { "type": "sw.stack", "slug": "python" } - ] - } - ], - "variants": "" -} From ef1720077a9e7297a87d17d615398f06989d530f Mon Sep 17 00:00:00 2001 From: Trong Nghia Nguyen Date: Mon, 14 May 2018 16:31:43 +0700 Subject: [PATCH 3/4] Update scripts to check new contract file structure. --- scripts/check-contracts.js | 11 +++------- scripts/utils.js | 41 ++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/scripts/check-contracts.js b/scripts/check-contracts.js index c411309f..7a61d752 100644 --- a/scripts/check-contracts.js +++ b/scripts/check-contracts.js @@ -16,17 +16,12 @@ 'use strict' +const path = require('path') const utils = require('./utils') - +const CONTRACTS_PATH = path.join(__dirname, '..', 'contracts') let success = true -for (const contract of utils.readContracts()) { - if (contract.source.slug !== contract.name) { - success = false - console.error(contract.path) - console.error(` The contract slug is ${contract.source.slug}, but the file name is ${contract.name}`) - } - +for (const contract of utils.readContracts(CONTRACTS_PATH)) { if (contract.source.type !== contract.type) { success = false console.error(contract.path) diff --git a/scripts/utils.js b/scripts/utils.js index 413ba019..62b0ba46 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -18,29 +18,26 @@ const fs = require('fs') const path = require('path') -const CONTRACTS_PATH = path.join(__dirname, '..', 'contracts') -const TYPES = fs.readdirSync(CONTRACTS_PATH) -exports.readContracts = () => { - return TYPES.reduce((accumulator, type) => { - const typeDirectory = path.join(CONTRACTS_PATH, type) - return accumulator.concat(fs.readdirSync(typeDirectory).map((fileName) => { - const contractPath = path.join(CONTRACTS_PATH, type, fileName) +const getAllFiles = dir => + fs.readdirSync(dir).reduce((files, file) => { + const name = path.join(dir, file) + const isDirectory = fs.statSync(name).isDirectory() + return isDirectory ? [...files, ...getAllFiles(name)] : [...files, name] + }, []) - let sourceObject = {} - try { - sourceObject = require(contractPath) - } catch (error) { - console.error(`Can't parse ${contractPath}`) - process.exit(1) - } +exports.readContracts = (dir) => { + const allFiles = getAllFiles(dir) + let contracts = [] - return { - type, - source: sourceObject, - path: contractPath, - name: path.basename(fileName, '.json') - } - })) - }, []) + allFiles.forEach((file) => { + if (path.extname(file) === '.json') { + contracts.push({ + type: path.basename(path.dirname(path.dirname(file))), + source: require(file), + path: file + }) + } + }) + return contracts } From 9807f1805c3298da7a87eaba2323d554ae569d7f Mon Sep 17 00:00:00 2001 From: Trong Nghia Nguyen Date: Tue, 22 May 2018 00:48:09 +0700 Subject: [PATCH 4/4] Add CircleCI configuration file --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 00000000..4c2de42a --- /dev/null +++ b/circle.yml @@ -0,0 +1,3 @@ +machine: + node: + version: 8.11.2