Re-organize contracts directory structure

balena-io · May 28, 2018 · 77db53b · 77db53b
1 parent 648fdda
commit 77db53b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 52 deletions.
diff --git a/contracts/arch.sw/armel/contract.json b/contracts/arch.sw/armel/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v5",
-  "data": { "arch": "armel" },
+  "arch": "armel",
   "requires": [
     {
-      "type": "hw.device-type",
-      "data": {
-        "arch": "armel"
-      }
+      "or": [
+        { "type": "hw.device-type", "arch": "armel" }
+      ]
     }
-  ]
+  ],
+  "variants": ""
 }
diff --git a/contracts/arch.sw/armhf/contract.json b/contracts/arch.sw/armhf/contract.json
@@ -3,23 +3,14 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM Hard Float",
-  "data": { "arch": "armhf" },
+  "arch": "armhf",
   "requires": [
     {
       "or": [
-        {
-          "type": "hw.device-type",
-          "data": {
-            "arch": "armv7hf"
-          }
-        },
-        {
-          "type": "hw.device-type",
-          "data": {
-            "arch": "rpi"
-          }
-        }
+        { "type": "hw.device-type", "arch": "armv7hf" },
+        { "type": "hw.device-type", "arch": "rpi" }
       ]
     }
-  ]
+  ],
+  "variants": ""
 }
diff --git a/contracts/arch.sw/armv7hf/contract.json b/contracts/arch.sw/armv7hf/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v7",
-  "data": { "arch": "armv7hf" },
+  "arch": "armv7hf",
   "requires": [
     {
-      "type": "hw.device-type",
-      "data": {
-        "arch": "armv7hf"
-      }
+      "or": [
+        { "type": "hw.device-type", "arch": "armv7hf" }
+      ]
     }
-  ]
+  ],
+  "variants": ""
 }
diff --git a/contracts/arch.sw/rpi/contract.json b/contracts/arch.sw/rpi/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v6",
-  "data": { "arch": "armv6hf" },
+  "arch": "armv6hf",
   "requires": [
     {
-      "type": "hw.device-type",
-      "data": {
-        "arch": "rpi"
-      }
+      "or": [
+        { "type": "hw.device-type", "arch": "rpi" }
+      ]
     }
-  ]
+  ],
+  "variants": ""
 }
diff --git a/...ce-type/via-vab820-quad/boot-external.tpl → ...device-type/vab820-quad/boot-external.tpl b/...ce-type/via-vab820-quad/boot-external.tpl → ...device-type/vab820-quad/boot-external.tpl
diff --git a/...ce-type/via-vab820-quad/boot-internal.tpl → ...device-type/vab820-quad/boot-internal.tpl b/...ce-type/via-vab820-quad/boot-internal.tpl → ...device-type/vab820-quad/boot-internal.tpl
diff --git a/...-type/via-vab820-quad/prepare-network.tpl → ...vice-type/vab820-quad/prepare-network.tpl b/...-type/via-vab820-quad/prepare-network.tpl → ...vice-type/vab820-quad/prepare-network.tpl
diff --git a/contracts/hw.device-type/via-vab820-quad/contract.json b/contracts/hw.device-type/via-vab820-quad/contract.json