From 291eb647a44626aef0b899584d9ebebf009e7d2a Mon Sep 17 00:00:00 2001 From: Joonsub Lee Date: Thu, 12 Mar 2015 15:27:26 +0900 Subject: [PATCH] Disable 3parts images and enable to make wayland images (+ Adjust repository name: remove 'common' name in tv-repos.yaml) As same as https://review.tizen.org/gerrit/#/c/36777/, I have needs to enable wayland images in TV profile. Change-Id: I41a868408fad16c29f223539ed911b2d60dcc279 --- ks/tv-boot-armv7l-odroidu3.yaml | 2 +- ks/tv-wayland-arm64-odroidu3.yaml | 10 ++++ ks/tv-wayland-armv7l-odroidu3.yaml | 10 ++++ ks/tv-x11-3parts-arm64.yaml | 2 +- ks/tv-x11-3parts-armv7l-odroidu3.yaml | 4 +- ks/tv-x11-arm64-odroidu3.yaml | 2 +- ks/tv-x11-armv7l-odroidu3.yaml | 2 +- patterns/tv-applications-wayland.yaml | 21 +++++++ ...v-application.yaml => tv-applications-x11.yaml} | 6 +- patterns/tv-crosswalk-wayland.yaml | 5 ++ patterns/tv-crosswalk-x11.yaml | 6 ++ patterns/tv-crosswalk.yaml | 6 -- patterns/tv-enlightenment-wayland.yaml | 4 ++ ...nlightenment.yaml => tv-enlightenment-x11.yaml} | 6 +- patterns/tv-wayland-temp.yaml | 13 ++++ patterns/tv-web-framework-wayland.yaml | 5 ++ patterns/tv-web-framework-x11.yaml | 6 ++ patterns/tv-web-framework.yaml | 6 -- patterns/tv-x11-temp.yaml | 4 ++ tv-repos.yaml | 12 +++- tv-targets.yaml | 6 +- tv.yaml | 69 ++++++++++++++++++---- 22 files changed, 166 insertions(+), 41 deletions(-) create mode 100644 ks/tv-wayland-arm64-odroidu3.yaml create mode 100644 ks/tv-wayland-armv7l-odroidu3.yaml create mode 100644 patterns/tv-applications-wayland.yaml rename patterns/{tv-application.yaml => tv-applications-x11.yaml} (85%) create mode 100644 patterns/tv-crosswalk-wayland.yaml create mode 100644 patterns/tv-crosswalk-x11.yaml delete mode 100644 patterns/tv-crosswalk.yaml create mode 100644 patterns/tv-enlightenment-wayland.yaml rename patterns/{tv-enlightenment.yaml => tv-enlightenment-x11.yaml} (60%) create mode 100644 patterns/tv-wayland-temp.yaml create mode 100644 patterns/tv-web-framework-wayland.yaml create mode 100644 patterns/tv-web-framework-x11.yaml delete mode 100644 patterns/tv-web-framework.yaml create mode 100644 patterns/tv-x11-temp.yaml diff --git a/ks/tv-boot-armv7l-odroidu3.yaml b/ks/tv-boot-armv7l-odroidu3.yaml index 9b870b0..e2f0176 100644 --- a/ks/tv-boot-armv7l-odroidu3.yaml +++ b/ks/tv-boot-armv7l-odroidu3.yaml @@ -11,4 +11,4 @@ Attachment: - /var/tmp/u-boot/u-boot-mmc.bin - /var/tmp/u-boot/params.bin Repos: - - common-x11_armv7l + - tv-x11_armv7l diff --git a/ks/tv-wayland-arm64-odroidu3.yaml b/ks/tv-wayland-arm64-odroidu3.yaml new file mode 100644 index 0000000..ce30aa6 --- /dev/null +++ b/ks/tv-wayland-arm64-odroidu3.yaml @@ -0,0 +1,10 @@ +Name: tv-wayland-arm64-odroidu3 +Architecture: aarch64 +Schedule: "*" +Active: False +Platform: Wayland-64 +Part: tv-mbr-3parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: tv-wayland-arm64-odroidu3 +Repos: + - tv-wayland_arm64 diff --git a/ks/tv-wayland-armv7l-odroidu3.yaml b/ks/tv-wayland-armv7l-odroidu3.yaml new file mode 100644 index 0000000..5e80488 --- /dev/null +++ b/ks/tv-wayland-armv7l-odroidu3.yaml @@ -0,0 +1,10 @@ +Name: tv-wayland-armv7l-odroidu3 +Architecture: armv7l +Schedule: "*" +Active: True +Platform: Wayland +Part: tv-mbr-3parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: tv-wayland-armv7l-odroidu3 +Repos: + - tv-wayland_armv7l diff --git a/ks/tv-x11-3parts-arm64.yaml b/ks/tv-x11-3parts-arm64.yaml index 0a55d75..7eed11c 100644 --- a/ks/tv-x11-3parts-arm64.yaml +++ b/ks/tv-x11-3parts-arm64.yaml @@ -7,4 +7,4 @@ Part: tv-mbr-3parts Mic2Options: -f loop --pack-to=@NAME@.tar.gz FileName: tv-x11-3parts-arm64 Repos: - - common-x11_arm64 + - tv-x11_arm64 diff --git a/ks/tv-x11-3parts-armv7l-odroidu3.yaml b/ks/tv-x11-3parts-armv7l-odroidu3.yaml index b8a81af..f9da504 100644 --- a/ks/tv-x11-3parts-armv7l-odroidu3.yaml +++ b/ks/tv-x11-3parts-armv7l-odroidu3.yaml @@ -1,10 +1,10 @@ Name: tv-x11-3parts-armv7l-odroidu3 Architecture: armv7l Schedule: "*" -Active: True +Active: False Platform: 3Parts-X11 Part: tv-mbr-3parts Mic2Options: -f loop --pack-to=@NAME@.tar.gz FileName: tv-x11-3parts-armv7l-odroidu3 Repos: - - common-x11_armv7l + - tv-x11_armv7l diff --git a/ks/tv-x11-arm64-odroidu3.yaml b/ks/tv-x11-arm64-odroidu3.yaml index 3df1c50..82da3e9 100644 --- a/ks/tv-x11-arm64-odroidu3.yaml +++ b/ks/tv-x11-arm64-odroidu3.yaml @@ -7,4 +7,4 @@ Part: tv-mbr-3parts Mic2Options: -f loop --pack-to=@NAME@.tar.gz FileName: tv-x11-arm64-odroidu3 Repos: - - common-x11_arm64 + - tv-x11_arm64 diff --git a/ks/tv-x11-armv7l-odroidu3.yaml b/ks/tv-x11-armv7l-odroidu3.yaml index 4bf9299..f9d6bf6 100644 --- a/ks/tv-x11-armv7l-odroidu3.yaml +++ b/ks/tv-x11-armv7l-odroidu3.yaml @@ -7,4 +7,4 @@ Part: tv-mbr-3parts Mic2Options: -f loop --pack-to=@NAME@.tar.gz FileName: tv-x11-armv7l-odroidu3 Repos: - - common-x11_armv7l + - tv-x11_armv7l diff --git a/patterns/tv-applications-wayland.yaml b/patterns/tv-applications-wayland.yaml new file mode 100644 index 0000000..ce06274 --- /dev/null +++ b/patterns/tv-applications-wayland.yaml @@ -0,0 +1,21 @@ +Summary: TV Applications Wayland +Description: TV Applications Wayland +Name: tv-applications-wayland +Packages: +- org.tizen.video-player-tv-ref +- app-content-provider +- app-content-provider-daemons +- app-content-favorite +- application-common +- org.tizen.file-browser-tv-ref +- org.tizen.gallery-tv-ref +- org.tizen.music-player-tv-ref +- org.tizen.source-list-tv-ref +- org.tizen.live-tv-ref +- org.tizen.noti-agent-tv-ref +- org.tizen.app-launcher-tv-ref +- app-content-history +- app-content-category +- app-installers +- tpk-backend +- wgt-backend diff --git a/patterns/tv-application.yaml b/patterns/tv-applications-x11.yaml similarity index 85% rename from patterns/tv-application.yaml rename to patterns/tv-applications-x11.yaml index 1c61d24..aea11b0 100644 --- a/patterns/tv-application.yaml +++ b/patterns/tv-applications-x11.yaml @@ -1,6 +1,6 @@ -Summary: TV Application -Description: TV Application -Name: tv-application +Summary: TV Applications X11 +Description: TV Applications X11 +Name: tv-applications-x11 Packages: - org.tizen.homescreen-tv-ref - org.tizen.video-player-tv-ref diff --git a/patterns/tv-crosswalk-wayland.yaml b/patterns/tv-crosswalk-wayland.yaml new file mode 100644 index 0000000..df0be59 --- /dev/null +++ b/patterns/tv-crosswalk-wayland.yaml @@ -0,0 +1,5 @@ +Summary: TV Crosswalk Wayland +Description: TV Crosswalk Wayland +Name: tv-crosswalk-wayland +Packages: +- wrt-widgets diff --git a/patterns/tv-crosswalk-x11.yaml b/patterns/tv-crosswalk-x11.yaml new file mode 100644 index 0000000..6c117c9 --- /dev/null +++ b/patterns/tv-crosswalk-x11.yaml @@ -0,0 +1,6 @@ +Summary: TV Crosswalk X11 +Description: TV Crosswalk X11 +Name: tv-crosswalk-x11 +Packages: +- wrt-widgets +- tizen-extensions-crosswalk diff --git a/patterns/tv-crosswalk.yaml b/patterns/tv-crosswalk.yaml deleted file mode 100644 index 049189c..0000000 --- a/patterns/tv-crosswalk.yaml +++ /dev/null @@ -1,6 +0,0 @@ -Summary: TV Crosswalk -Description: TV Crosswalk -Name: tv-crosswalk -Packages: -- wrt-widgets -- tizen-extensions-crosswalk diff --git a/patterns/tv-enlightenment-wayland.yaml b/patterns/tv-enlightenment-wayland.yaml new file mode 100644 index 0000000..e2526de --- /dev/null +++ b/patterns/tv-enlightenment-wayland.yaml @@ -0,0 +1,4 @@ +Summary: TV Enlightenment Wayland +Description: TV Enlightenment Wayland +Name: tv-enlightenment-wayland +Packages: [] diff --git a/patterns/tv-enlightenment.yaml b/patterns/tv-enlightenment-x11.yaml similarity index 60% rename from patterns/tv-enlightenment.yaml rename to patterns/tv-enlightenment-x11.yaml index 6a6e818..853d87f 100644 --- a/patterns/tv-enlightenment.yaml +++ b/patterns/tv-enlightenment-x11.yaml @@ -1,6 +1,6 @@ -Summary: TV Enlightenment -Description: TV Enlightenment -Name: tv-enlightenment +Summary: TV Enlightenment X11 +Description: TV Enlightenment X11 +Name: tv-enlightenment-x11 Packages: - e-mod-tizen-wm-policy - e-mod-tizen-effect diff --git a/patterns/tv-wayland-temp.yaml b/patterns/tv-wayland-temp.yaml new file mode 100644 index 0000000..97d7cab --- /dev/null +++ b/patterns/tv-wayland-temp.yaml @@ -0,0 +1,13 @@ +Summary: TV Wayland Temp +Description: TV Wayland Temp +Name: tv-wayland-temp +Packages: +- capi-network-wifi +- ibus-libs +- libfontenc +- libjson-glib +- libmm-ta +- libpciaccess +- libtbm-exynos4412 +- monotype-fonts +- ui-gadget-1 diff --git a/patterns/tv-web-framework-wayland.yaml b/patterns/tv-web-framework-wayland.yaml new file mode 100644 index 0000000..caa483a --- /dev/null +++ b/patterns/tv-web-framework-wayland.yaml @@ -0,0 +1,5 @@ +Summary: TV Web Framework Wayland +Description: TV Web Framework Wayland +Name: tv-web-framework-wayland +Packages: +- browser-provider diff --git a/patterns/tv-web-framework-x11.yaml b/patterns/tv-web-framework-x11.yaml new file mode 100644 index 0000000..225224d --- /dev/null +++ b/patterns/tv-web-framework-x11.yaml @@ -0,0 +1,6 @@ +Summary: TV Web Framework X11 +Description: TV Web Framework X11 +Name: tv-web-framework-x11 +Packages: +- chromium-efl +- browser-provider diff --git a/patterns/tv-web-framework.yaml b/patterns/tv-web-framework.yaml deleted file mode 100644 index 06f453c..0000000 --- a/patterns/tv-web-framework.yaml +++ /dev/null @@ -1,6 +0,0 @@ -Summary: TV Web Framework -Description: TV Web Framework -Name: tv-web-framework -Packages: -- chromium-efl -- browser-provider diff --git a/patterns/tv-x11-temp.yaml b/patterns/tv-x11-temp.yaml new file mode 100644 index 0000000..6f98f06 --- /dev/null +++ b/patterns/tv-x11-temp.yaml @@ -0,0 +1,4 @@ +Summary: TV X11 Temp +Description: TV X11 Temp +Name: tv-x11-temp +Packages: [] diff --git a/tv-repos.yaml b/tv-repos.yaml index fb93987..1a8a186 100644 --- a/tv-repos.yaml +++ b/tv-repos.yaml @@ -7,11 +7,19 @@ Repositories: Url: http://download.tizen.org/snapshots/tizen/tv/@BUILD_ID@/repos/tv/@ARCH@/debug/ Options: --save --ssl_verify=no - - Name: common-x11_armv7l + - Name: tv-x11_armv7l Url: http://download.tizen.org/snapshots/tizen/tv/@BUILD_ID@/repos/arm-x11/packages/ Options: --ssl_verify=no - - Name: common-x11_arm64 + - Name: tv-x11_arm64 Url: http://download.tizen.org/snapshots/tizen/tv/@BUILD_ID@/repos/arm64-x11/packages/ Options: --ssl_verify=no + - Name: tv-wayland_armv7l + Url: http://download.tizen.org/snapshots/tizen/tv/@BUILD_ID@/repos/arm-wayland/packages/ + Options: --ssl_verify=no + + - Name: tv-wayland_arm64 + Url: http://download.tizen.org/snapshots/tizen/tv/@BUILD_ID@/repos/arm-wayland/packages/ + Options: --ssl_verify=no + diff --git a/tv-targets.yaml b/tv-targets.yaml index d32eb87..7633439 100644 --- a/tv-targets.yaml +++ b/tv-targets.yaml @@ -3,11 +3,9 @@ Targets: - Name: arm-x11 Images: - tv-boot-armv7l-odroidu3.yaml - - tv-x11-3parts-armv7l-odroidu3.yaml - tv-x11-armv7l-odroidu3.yaml - - Name: arm64-x11 + - Name: arm-wayland Images: - - tv-x11-3parts-arm64.yaml - - tv-x11-arm64-odroidu3.yaml + - tv-wayland-armv7l-odroidu3.yaml diff --git a/tv.yaml b/tv.yaml index 0d7e8aa..3ddc589 100644 --- a/tv.yaml +++ b/tv.yaml @@ -137,24 +137,24 @@ X11: UserGroups: "audio,video" Groups: - Generic Applications + - TV Applications X11 - Generic Base - Generic Console Tools - Generic Crosswalk + - TV Crosswalk X11 - Generic Desktop Applications - Generic Multimedia + - TV Multimedia - Generic Packaging - Generic X11 + - TV X11 - TV Adaptation - - TV Application - - TV Crosswalk - TV Dali - TV EFL - - TV Enlightenment + - TV Enlightenment X11 - TV Input Framework - TV Middleware - - TV Multimedia - - TV Web Framework - - TV X11 + - TV Web Framework X11 PostScripts: - generic-applications - generic-base @@ -179,23 +179,23 @@ X11-64: UserGroups: "audio,video" Groups: - Generic Applications + - TV Applications X11 - Generic Base - Generic Console Tools - Generic Crosswalk - Generic Desktop Applications - Generic Multimedia + - TV Multimedia - Generic Packaging - Generic X11 + - TV X11 - TV Adaptation - - TV Application - - TV Crosswalk + - TV Crosswalk X11 - TV Dali - TV EFL - - TV Enlightenment + - TV Enlightenment X11 - TV Input Framework - TV Middleware - - TV Multimedia - - TV X11 PostScripts: - generic-applications - generic-base @@ -215,3 +215,50 @@ X11-64: NoChrootScripts: - buildname +Wayland: + Part: tv-mbr + UserGroups: "audio,video" + Groups: + - Generic Applications + - TV Applications Wayland + - Generic Base + - Generic Console Tools + - Generic Crosswalk + - Generic Desktop Applications + - Generic Multimedia + - TV Multimedia + - Generic Packaging + - TV Adaptation + - TV Crosswalk Wayland + - TV Dali + - TV EFL + - TV Enlightenment Wayland + - TV Input Framework + - TV Middleware + - TV Web Framework Wayland + PostScripts: + - generic-applications + - generic-base + - generic-console-tools + - generic-crosswalk + - generic-desktop-applications + - generic-multimedia + - generic-packaging + - tv-adaptation + - tv-crosswalk + - tv-mbr-3parts + - tv-users + - tv-generate-env + Repos: [] + NoChrootScripts: + - buildname + +Wayland-64: + Part: tv-mbr + UserGroups: "audio,video" + Groups: + PostScripts: + Repos: [] + NoChrootScripts: + - buildname + -- 2.7.4