[TRE-111] Single image for artik device

Change-Id: Ibbea9251d9fd4b38b22502e46828fb9a502a38e8

diff --git a/common-targets.yaml b/common-targets.yaml
index bb0564f..a02d6ab 100644 (file)
--- a/common-targets.yaml
+++ b/common-targets.yaml
@@ -25,8 +25,7 @@ Targets:
             - common-boot-armv7l-artik10.yaml
             - common-wayland-2parts-armv7l.yaml
             - common-wayland-3parts-armv7l-odroidu3.yaml
-            - common-wayland-3parts-armv7l-artik5.yaml
-            - common-wayland-3parts-armv7l-artik10.yaml
+            - common-wayland-3parts-armv7l-artik.yaml
 
     -   Name: arm64-wayland
         Images:

diff --git a/ks/common-wayland-3parts-armv7l-artik5.yaml b/ks/common-wayland-3parts-armv7l-artik.yaml
similarity index 71%
rename from ks/common-wayland-3parts-armv7l-artik5.yaml
rename to ks/common-wayland-3parts-armv7l-artik.yaml
index 126d1c0..76233e7 100644 (file)
--- a/ks/common-wayland-3parts-armv7l-artik5.yaml
+++ b/ks/common-wayland-3parts-armv7l-artik.yaml
@@ -1,11 +1,11 @@
-Name: common-wayland-3parts-armv7l-artik5
+Name: common-wayland-3parts-armv7l-artik
 Architecture: armv7l
 Schedule: "*"
 Active: True
 Platform: Artik
 Part: common-mbr-3parts
 Mic2Options: -f loop --pack-to=@NAME@.tar.gz
-FileName: common-wayland-3parts-armv7l-artik5
+FileName: common-wayland-3parts-armv7l-artik
 Repos:
     - common-wayland_armv7l
     - base_arm

diff --git a/ks/common-wayland-3parts-armv7l-artik10.yaml b/ks/common-wayland-3parts-armv7l-artik10.yaml
deleted file mode 100644 (file)
index 4a41428..0000000
--- a/ks/common-wayland-3parts-armv7l-artik10.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-Name: common-wayland-3parts-armv7l-artik10
-Architecture: armv7l
-Schedule: "*"
-Active: True
-Platform: Artik
-Part: common-mbr-3parts
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz
-FileName: common-wayland-3parts-armv7l-artik10
-Repos:
-    - common-wayland_armv7l
-    - base_arm
-Groups:
-    - Common Adaptation Artik