Update comments

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

Hide file tree

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