summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislaw Wadas <s.wadas@samsung.com>2016-03-29 16:49:25 +0200
committerStanislaw Wadas <s.wadas@samsung.com>2016-03-29 08:11:21 -0700
commite60070aae000d184003f812375e3a84316afba45 (patch)
tree5c634844d92c2c9e6bfaa4fb40c11fc73b22abe4
parent477d9e3a7b897a8f82b929458ccdda5fc30fd3ec (diff)
downloadmeta-e60070aae000d184003f812375e3a84316afba45.tar.gz
meta-e60070aae000d184003f812375e3a84316afba45.tar.bz2
meta-e60070aae000d184003f812375e3a84316afba45.zip
[TRE-111] Single image for artik devicesubmit/tizen_common/20160329.171015
Change-Id: Ibbea9251d9fd4b38b22502e46828fb9a502a38e8
-rw-r--r--common-targets.yaml3
-rw-r--r--ks/common-wayland-3parts-armv7l-artik.yaml (renamed from ks/common-wayland-3parts-armv7l-artik5.yaml)4
-rw-r--r--ks/common-wayland-3parts-armv7l-artik10.yaml13
3 files changed, 3 insertions, 17 deletions
diff --git a/common-targets.yaml b/common-targets.yaml
index bb0564f..a02d6ab 100644
--- 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
index 126d1c0..76233e7 100644
--- 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
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