From: Pawel Wieczorek Date: Mon, 28 Aug 2017 09:40:23 +0000 (+0200) Subject: [TRE-1496] Rename selected Artik and RPi3 images X-Git-Tag: accepted/tizen/unified/20170828.164935^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6071715722a1534cc1016c830700b851d2e75126;p=profile%2Fcommon%2Fmeta.git [TRE-1496] Rename selected Artik and RPi3 images Change-Id: I486f48543ec37561294cb8bb59a2822ac1676562 Signed-off-by: Pawel Wieczorek --- diff --git a/common-targets.yaml b/common-targets.yaml index 9988a97..ec639b5 100644 --- a/common-targets.yaml +++ b/common-targets.yaml @@ -11,21 +11,21 @@ Targets: - common-minimal-mbr-x86_64.yaml - common-boot-armv7l-odroidu3.yaml - common-boot-armv7l-odroidxu3.yaml - - common-boot-armv7l-artik5.yaml + - iot-boot-armv7l-artik520.yaml - iot-boot-armv7l-artik530.yaml - common-boot-armv7l-artik10.yaml - - common-headless-2parts-armv7l-rpi3.yaml - - iot-iot_core-2parts-armv7l-artik710.yaml - - iot-iot_core-2parts-armv7l-artik520.yaml - - common-iot_core-2parts-armv7l-rpi3.yaml + - iot-gps_tracker-2parts-armv7l-rpi3.yaml + - iot-headless-2parts-armv7l-artik530_710.yaml + - iot-headless-2parts-armv7l-artik520.yaml + - iot-headless-2parts-armv7l-rpi3.yaml - common-docker-2parts-armv7l-rpi3.yaml - common-wayland-3parts-armv7l-odroidu3.yaml - common-wayland-3parts-armv7l-artik.yaml - - iot-headed-3parts-armv7l-artik710.yaml + - iot-headed-3parts-armv7l-artik530_710.yaml - common-wayland-3parts-armv7l-rpi3.yaml - common-wayland-3parts-arm64.yaml - iot-boot-arm64-artik710.yaml - - common-boot-arm64-rpi3.yaml + - iot-boot-arm64-rpi3.yaml - Name: emulator diff --git a/common.yaml b/common.yaml index 28e25e3..78ce390 100644 --- a/common.yaml +++ b/common.yaml @@ -116,13 +116,13 @@ Boot-Artik10: - Common Boot Artik 10 Repos: [] -Boot-Artik5: +Boot-Artik520: Part: common-artik-mbr-boot Desktop: None SaveRepos: False UserGroups: "audio,video" Groups: - - Common Boot Artik 5 + - IoT Boot Artik 520 Repos: [] Boot-Artik530: @@ -149,7 +149,7 @@ Boot-RPi3: SaveRepos: False UserGroups: "audio,video" Groups: - - Common Boot RPi3 + - IoT Boot RPi3 Repos: [] Wayland: @@ -252,11 +252,11 @@ RPi3: NoChrootScripts: - buildname -RPi3 Headless: +RPi3 GPS Tracker: Part: common-mbr-2parts-rpi3-ramdisk Groups: - Common Adaptation - - Common Adaptation RPi3 Headless + - IoT Adaptation RPi3 GPS Tracker PostScripts: - common-adaptation-rpi3 - generic-base @@ -281,11 +281,11 @@ RPi3 Headless: NoChrootScripts: - buildname -RPi3 IoT Core: +RPi3 Headless: Part: common-mbr-2parts-rpi3-ramdisk Groups: - Common Adaptation - - Common Adaptation RPi3 IoT Core + - IoT Adaptation RPi3 Headless PostScripts: - common-adaptation-rpi3 - generic-base @@ -338,11 +338,11 @@ RPi3 Docker: NoChrootScripts: - buildname -Artik710 IoT Core: +Artik530_710 Headless: Part: common-mbr-2parts-rpi3-ramdisk Groups: - Common Adaptation - - Common Adaptation Artik710 IoT Core + - IoT Adaptation Artik530_710 Headless PostScripts: - common-adaptation-rpi3 - generic-base @@ -367,11 +367,11 @@ Artik710 IoT Core: NoChrootScripts: - buildname -Artik520 IoT Core: +Artik520 Headless: Part: common-mbr-2parts-rpi3-ramdisk Groups: - Common Adaptation - - Common Adaptation Artik520 IoT Core + - IoT Adaptation Artik520 Headless PostScripts: - common-adaptation-rpi3 - generic-base diff --git a/ks/common-boot-arm64-rpi3.yaml b/ks/iot-boot-arm64-rpi3.yaml similarity index 66% rename from ks/common-boot-arm64-rpi3.yaml rename to ks/iot-boot-arm64-rpi3.yaml index 7bdbfdf..d2f8272 100644 --- a/ks/common-boot-arm64-rpi3.yaml +++ b/ks/iot-boot-arm64-rpi3.yaml @@ -1,11 +1,11 @@ -Name: common-boot-arm64-rpi3 +Name: iot-boot-arm64-rpi3 Architecture: aarch64 Schedule: "*" Active: True Platform: Boot-RPi3 Part: common-mbr-boot Mic2Options: -A aarch64 -f loop --pack-to=@NAME@.tar.gz -FileName: common-boot-arm64-rpi3 -Group: Common Boot RPi3 +FileName: iot-boot-arm64-rpi3 +Group: IoT Boot RPi3 Repos: - unified-standard diff --git a/ks/common-boot-armv7l-artik5.yaml b/ks/iot-boot-armv7l-artik520.yaml similarity index 65% rename from ks/common-boot-armv7l-artik5.yaml rename to ks/iot-boot-armv7l-artik520.yaml index 9e5f7ea..bbad57a 100644 --- a/ks/common-boot-armv7l-artik5.yaml +++ b/ks/iot-boot-armv7l-artik520.yaml @@ -1,16 +1,16 @@ -Name: common-boot-armv7l-artik5 +Name: iot-boot-armv7l-artik520 Architecture: armv7l Schedule: "*" Active: True -Platform: Boot-Artik5 +Platform: Boot-Artik520 Part: common-artik-mbr-boot Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz -FileName: common-boot-armv7l-artik5 -Group: Common Boot Artik 5 +FileName: iot-boot-armv7l-artik520 +Group: IoT Boot Artik 520 Attachment: - /boot/exynos3250-artik5.dtb - /boot/zImage - /boot/u-boot/params.bin - /boot/u-boot/u-boot.bin Repos: - - unified-standard \ No newline at end of file + - unified-standard diff --git a/ks/common-headless-2parts-armv7l-rpi3.yaml b/ks/iot-gps_tracker-2parts-armv7l-rpi3.yaml similarity index 56% rename from ks/common-headless-2parts-armv7l-rpi3.yaml rename to ks/iot-gps_tracker-2parts-armv7l-rpi3.yaml index 076c703..7036772 100644 --- a/ks/common-headless-2parts-armv7l-rpi3.yaml +++ b/ks/iot-gps_tracker-2parts-armv7l-rpi3.yaml @@ -1,13 +1,13 @@ -Name: common-headless-2parts-armv7l-rpi3 +Name: iot-gps_tracker-2parts-armv7l-rpi3 Architecture: armv7l Schedule: "*" Active: True -Platform: RPi3 Headless +Platform: RPi3 GPS Tracker Part: common-mbr-2parts-rpi3-ramdisk Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz -FileName: common-headless-2parts-armv7l-rpi3 +FileName: iot-gps_tracker-2parts-armv7l-rpi3 Repos: - unified-standard - base-standard Groups: - - Common Adaptation RPi3 Headless + - IoT Adaptation RPi3 GPS Tracker diff --git a/ks/iot-headed-3parts-armv7l-artik710.yaml b/ks/iot-headed-3parts-armv7l-artik530_710.yaml similarity index 69% rename from ks/iot-headed-3parts-armv7l-artik710.yaml rename to ks/iot-headed-3parts-armv7l-artik530_710.yaml index 6d54d43..7091274 100644 --- a/ks/iot-headed-3parts-armv7l-artik710.yaml +++ b/ks/iot-headed-3parts-armv7l-artik530_710.yaml @@ -1,16 +1,16 @@ -Name: iot-headed-3parts-armv7l-artik710 +Name: iot-headed-3parts-armv7l-artik530_710 Architecture: armv7l Schedule: "*" Active: True Platform: Artik Part: common-mbr-3parts Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz -FileName: iot-headed-3parts-armv7l-artik710 +FileName: iot-headed-3parts-armv7l-artik530_710 Repos: - unified-standard - base-standard Groups: - Common Adaptation Artik - - Common Adaptation Artik 710 + - IoT Adaptation Artik530_710 RemovePackages: - bluetooth-tools-no-firmware diff --git a/ks/iot-iot_core-2parts-armv7l-artik710.yaml b/ks/iot-headless-2parts-armv7l-artik520.yaml similarity index 57% rename from ks/iot-iot_core-2parts-armv7l-artik710.yaml rename to ks/iot-headless-2parts-armv7l-artik520.yaml index 924da62..fddbbb2 100644 --- a/ks/iot-iot_core-2parts-armv7l-artik710.yaml +++ b/ks/iot-headless-2parts-armv7l-artik520.yaml @@ -1,14 +1,14 @@ -Name: iot-iot_core-2parts-armv7l-artik710 +Name: iot-headless-2parts-armv7l-artik520 Architecture: armv7l Schedule: "*" Active: True -Platform: Artik710 IoT Core +Platform: Artik520 Headless Part: common-mbr-2parts-rpi3-ramdisk Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz Language: C -FileName: iot-iot_core-2parts-armv7l-artik710 +FileName: iot-headless-2parts-armv7l-artik520 Repos: - unified-standard - base-standard Groups: - - Common Adaptation Artik710 IoT Core + - IoT Adaptation Artik520 Headless diff --git a/ks/iot-iot_core-2parts-armv7l-artik520.yaml b/ks/iot-headless-2parts-armv7l-artik530_710.yaml similarity index 55% rename from ks/iot-iot_core-2parts-armv7l-artik520.yaml rename to ks/iot-headless-2parts-armv7l-artik530_710.yaml index fe689ff..9dcc96c 100644 --- a/ks/iot-iot_core-2parts-armv7l-artik520.yaml +++ b/ks/iot-headless-2parts-armv7l-artik530_710.yaml @@ -1,14 +1,14 @@ -Name: iot-iot_core-2parts-armv7l-artik520 +Name: iot-headless-2parts-armv7l-artik530_710 Architecture: armv7l Schedule: "*" Active: True -Platform: Artik520 IoT Core +Platform: Artik530_710 Headless Part: common-mbr-2parts-rpi3-ramdisk Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz Language: C -FileName: iot-iot_core-2parts-armv7l-artik520 +FileName: iot-headless-2parts-armv7l-artik530_710 Repos: - unified-standard - base-standard Groups: - - Common Adaptation Artik520 IoT Core + - IoT Adaptation Artik530_710 Headless diff --git a/ks/common-iot_core-2parts-armv7l-rpi3.yaml b/ks/iot-headless-2parts-armv7l-rpi3.yaml similarity index 59% rename from ks/common-iot_core-2parts-armv7l-rpi3.yaml rename to ks/iot-headless-2parts-armv7l-rpi3.yaml index ddf3989..c6632c8 100644 --- a/ks/common-iot_core-2parts-armv7l-rpi3.yaml +++ b/ks/iot-headless-2parts-armv7l-rpi3.yaml @@ -1,14 +1,14 @@ -Name: common-iot_core-2parts-armv7l-rpi3 +Name: iot-headless-2parts-armv7l-rpi3 Architecture: armv7l Schedule: "*" Active: True -Platform: RPi3 IoT Core +Platform: RPi3 Headless Part: common-mbr-2parts-rpi3-ramdisk-recovery Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz Language: C -FileName: common-iot_core-2parts-armv7l-rpi3 +FileName: iot-headless-2parts-armv7l-rpi3 Repos: - unified-standard - base-standard Groups: - - Common Adaptation RPi3 IoT Core + - IoT Adaptation RPi3 Headless diff --git a/patterns/common-boot-artik5.yaml b/patterns/common-boot-artik5.yaml deleted file mode 100644 index d53b390..0000000 --- a/patterns/common-boot-artik5.yaml +++ /dev/null @@ -1,7 +0,0 @@ -Summary: Common Boot Artik 5 -Description: Common Boot Artik 5 -Name: common-boot-artik5 -Packages: -- arm-artik5-linux-kernel -- arm-artik5-linux-kernel-modules -- u-boot-artik5 diff --git a/patterns/common-adaptation-artik520-iot_core.yaml b/patterns/iot-adaptation-artik520-headless.yaml similarity index 87% rename from patterns/common-adaptation-artik520-iot_core.yaml rename to patterns/iot-adaptation-artik520-headless.yaml index 5eec6ba..3f64fd1 100755 --- a/patterns/common-adaptation-artik520-iot_core.yaml +++ b/patterns/iot-adaptation-artik520-headless.yaml @@ -1,6 +1,6 @@ -Summary: Common Adaptation Artik520 IoT Core -Description: Common Adaptation Artik520 IoT Core -Name: common-adaptation-artik520-iot_core +Summary: IoT Adaptation Artik520 Headless +Description: IoT Adaptation Artik520 Headless +Name: iot-adaptation-artik520-headless Packages: - amd - appcore-agent diff --git a/patterns/common-adaptation-artik710-iot_core.yaml b/patterns/iot-adaptation-artik530_710-headless.yaml similarity index 84% rename from patterns/common-adaptation-artik710-iot_core.yaml rename to patterns/iot-adaptation-artik530_710-headless.yaml index f94f6e1..33ea82c 100755 --- a/patterns/common-adaptation-artik710-iot_core.yaml +++ b/patterns/iot-adaptation-artik530_710-headless.yaml @@ -1,6 +1,6 @@ -Summary: Common Adaptation Artik710 IoT Core -Description: Common Adaptation Artik710 IoT Core -Name: common-adaptation-artik710-iot_core +Summary: IoT Adaptation Artik530_710 Headless +Description: IoT Adaptation Artik530_710 Headless +Name: iot-adaptation-artik530_710-headless Packages: - amd - appcore-agent @@ -71,4 +71,4 @@ Packages: - avahi-libs - avahi #From TRE-1470 -- building-blocks-sub2-domain_API-AppFramework-TPK_Installation \ No newline at end of file +- building-blocks-sub2-domain_API-AppFramework-TPK_Installation diff --git a/patterns/common-adaptation-artik710.yaml b/patterns/iot-adaptation-artik530_710.yaml similarity index 63% rename from patterns/common-adaptation-artik710.yaml rename to patterns/iot-adaptation-artik530_710.yaml index f4a7cf6..8b2c8f2 100644 --- a/patterns/common-adaptation-artik710.yaml +++ b/patterns/iot-adaptation-artik530_710.yaml @@ -1,6 +1,6 @@ -Summary: Common Adaptation Artik 710 -Description: Common Adaptation Artik 710 -Name: common-adaptation-artik710 +Summary: IoT Adaptation Artik530_710 +Description: IoT Adaptation Artik530_710 +Name: iot-adaptation-artik530_710 Packages: - alsa-ucm-data-alc5658 - audio-hal-alc5658 diff --git a/patterns/common-adaptation-rpi3-headless.yaml b/patterns/iot-adaptation-rpi3-gps_tracker.yaml similarity index 93% rename from patterns/common-adaptation-rpi3-headless.yaml rename to patterns/iot-adaptation-rpi3-gps_tracker.yaml index 73e26de..96edc90 100644 --- a/patterns/common-adaptation-rpi3-headless.yaml +++ b/patterns/iot-adaptation-rpi3-gps_tracker.yaml @@ -1,6 +1,6 @@ -Summary: Common Adaptation RPi3 Headless -Description: Common Adaptation RPi3 Headless -Name: common-adaptation-rpi3-headless +Summary: IoT Adaptation RPi3 GPS Tracker +Description: IoT Adaptation RPi3 GPS Tracker +Name: iot-adaptation-rpi3-gps_tracker Packages: - amd - appcore-agent diff --git a/patterns/common-adaptation-rpi3-iot_core.yaml b/patterns/iot-adaptation-rpi3-headless.yaml similarity index 91% rename from patterns/common-adaptation-rpi3-iot_core.yaml rename to patterns/iot-adaptation-rpi3-headless.yaml index 5fb06cf..43b20ec 100755 --- a/patterns/common-adaptation-rpi3-iot_core.yaml +++ b/patterns/iot-adaptation-rpi3-headless.yaml @@ -1,6 +1,6 @@ -Summary: Common Adaptation RPi3 IoT Core -Description: Common Adaptation RPi3 IoT Core -Name: common-adaptation-rpi3-iot_core +Summary: IoT Adaptation RPi3 Headless +Description: IoT Adaptation RPi3 Headless +Name: iot-adaptation-rpi3-headless Packages: - amd - appcore-agent diff --git a/patterns/iot-boot-artik520.yaml b/patterns/iot-boot-artik520.yaml new file mode 100644 index 0000000..214040b --- /dev/null +++ b/patterns/iot-boot-artik520.yaml @@ -0,0 +1,7 @@ +Summary: IoT Boot Artik 520 +Description: IoT Boot Artik 520 +Name: iot-boot-artik520 +Packages: +- arm-artik5-linux-kernel +- arm-artik5-linux-kernel-modules +- u-boot-artik5 diff --git a/patterns/common-boot-rpi3.yaml b/patterns/iot-boot-rpi3.yaml similarity index 55% rename from patterns/common-boot-rpi3.yaml rename to patterns/iot-boot-rpi3.yaml index 3e1a9dd..719d5da 100644 --- a/patterns/common-boot-rpi3.yaml +++ b/patterns/iot-boot-rpi3.yaml @@ -1,6 +1,6 @@ -Summary: Common Boot RPi3 -Description: Common Boot RPi3 -Name: common-boot-rpi3 +Summary: IoT Boot RPi3 +Description: IoT Boot RPi3 +Name: iot-boot-rpi3 Packages: - arm64-rpi3-linux-kernel - arm64-rpi3-linux-kernel-modules