From 0574942c82585b30746ccaf5d729e2cbeec9b60c Mon Sep 17 00:00:00 2001 From: Joonsub Lee Date: Mon, 6 Apr 2015 14:31:14 +0900 Subject: [PATCH] Refactoring mobile.yaml 1. Remove patterns and ks files related with 3parts images 2. Adjust pattern groups and postscripts' order to sync the image structure as Tizen:Common 3. Add Wayland 64bit image 4. Adjust package groups (TINF-871) Change-Id: I68c5499fba6ac30ec43338fd717693e6b775d6d9 --- ks/mobile-wayland-arm64-n4.yaml | 10 ++ ks/mobile-x11-3parts-arm64.yaml | 10 -- ks/mobile-x11-3parts-armv7l-odroidu3.yaml | 10 -- mobile-repos.yaml | 6 +- mobile.yaml | 252 +++++++++++------------------ patterns/mobile-application.yaml | 8 - patterns/mobile-applications.yaml | 8 + patterns/mobile-enlightenment-wayland.yaml | 1 + patterns/mobile-wayland.yaml | 3 - 9 files changed, 119 insertions(+), 189 deletions(-) create mode 100644 ks/mobile-wayland-arm64-n4.yaml delete mode 100644 ks/mobile-x11-3parts-arm64.yaml delete mode 100644 ks/mobile-x11-3parts-armv7l-odroidu3.yaml delete mode 100644 patterns/mobile-application.yaml create mode 100644 patterns/mobile-applications.yaml diff --git a/ks/mobile-wayland-arm64-n4.yaml b/ks/mobile-wayland-arm64-n4.yaml new file mode 100644 index 0000000..2feff1f --- /dev/null +++ b/ks/mobile-wayland-arm64-n4.yaml @@ -0,0 +1,10 @@ +Name: mobile-wayland-arm64-n4 +Architecture: aarch64 +Schedule: "*" +Active: True +Platform: Wayland-64 +Part: mobile-mbr-3parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: mobile-wayland-arm64-n4 +Repos: + - mobile-wayland_arm64 diff --git a/ks/mobile-x11-3parts-arm64.yaml b/ks/mobile-x11-3parts-arm64.yaml deleted file mode 100644 index ed67a09..0000000 --- a/ks/mobile-x11-3parts-arm64.yaml +++ /dev/null @@ -1,10 +0,0 @@ -Name: mobile-x11-3parts-arm64 -Architecture: aarch64 -Schedule: "*" -Active: False -Platform: 3Parts-X11-64 -Part: mobile-mbr-3parts -Mic2Options: -f loop --pack-to=@NAME@.tar.gz -FileName: mobile-x11-3parts-arm64 -Repos: - - mobile-x11_arm64 diff --git a/ks/mobile-x11-3parts-armv7l-odroidu3.yaml b/ks/mobile-x11-3parts-armv7l-odroidu3.yaml deleted file mode 100644 index c48f12d..0000000 --- a/ks/mobile-x11-3parts-armv7l-odroidu3.yaml +++ /dev/null @@ -1,10 +0,0 @@ -Name: mobile-x11-3parts-armv7l-odroidu3 -Architecture: armv7l -Schedule: "*" -Active: False -Platform: 3Parts-X11 -Part: mobile-mbr-3parts -Mic2Options: -f loop --pack-to=@NAME@.tar.gz -FileName: mobile-x11-3parts-armv7l-odroidu3 -Repos: - - mobile-x11_armv7l diff --git a/mobile-repos.yaml b/mobile-repos.yaml index 5f7cf62..e4b15fe 100644 --- a/mobile-repos.yaml +++ b/mobile-repos.yaml @@ -18,4 +18,8 @@ Repositories: - Name: mobile-wayland_armv7l Url: http://download.tizen.org/snapshots/tizen/mobile/@BUILD_ID@/repos/arm-wayland/packages/ Options: --ssl_verify=no - + + - Name: mobile-wayland_arm64 + Url: http://download.tizen.org/snapshots/tizen/mobile/@BUILD_ID@/repos/arm64-wayland/packages/ + Options: --ssl_verify=no + diff --git a/mobile.yaml b/mobile.yaml index 07b3963..f62a438 100644 --- a/mobile.yaml +++ b/mobile.yaml @@ -41,250 +41,188 @@ Boot-RD-PQ: - Mobile Boot RD PQ Repos: [] -3Parts-X11: +X11: Part: mobile-mbr UserGroups: "audio,video" Groups: - - Generic Adaptation - - Generic Applications - Generic Base - - Generic Bluetooth + - Mobile Base - Generic Console Tools - - Generic Crosswalk - - Generic Multimedia - Generic Packaging - - Generic Qt5 - - Generic X11 + - Mobile Packaging + - Generic Adaptation - Mobile Adaptation - - Mobile Base + - Generic X11 + - Mobile X11 + - Mobile X11 Temp + - Mobile Middleware X11 + - Generic Applications + - Mobile Applications + - Generic Multimedia + - Mobile Multimedia + - Generic Desktop Applications + - Generic Crosswalk - Mobile Crosswalk - - Mobile Connectivity Framework 3Parts - Mobile Dali - - Mobile Desktop Applications - - Mobile Enlightenment - - Mobile Input Framework - - Mobile 3Parts Middleware - - Mobile 3Parts Multimedia - - Mobile Packaging - - Mobile Qt5 - - Mobile Security - - Mobile X11 - Mobile EFL + - Mobile Enlightenment X11 + - Mobile Input Framework + - Mobile Connectivity Framework X11 PostScripts: - - generic-adaptation - - generic-applications - generic-base - - generic-bluetooth + - mobile-base - generic-console-tools - - generic-crosswalk - - generic-multimedia - generic-packaging - - generic-qt5 - - generic-x11 - - mobile-adaptation - - mobile-base - - mobile-crosswalk - - mobile-desktop-applications - - mobile-middleware - mobile-packaging - - mobile-qt5 + - generic-adaptation + - mobile-adaptation + - generic-x11 - mobile-x11 + - mobile-middleware-x11 + - generic-applications + - generic-multimedia + - generic-desktop-applications + - generic-crosswalk + - mobile-crosswalk Repos: [] NoChrootScripts: - buildname -3Parts-X11-64: +X11-64: Part: mobile-mbr UserGroups: "audio,video" Groups: - - Generic Adaptation - - Generic Applications - Generic Base - - Generic Bluetooth + - Mobile Base - Generic Console Tools - - Generic Multimedia - Generic Packaging - - Generic Qt5 - - Generic X11 - - Mobile Adaptation - - Mobile Base - - Mobile Connectivity Framework 3Parts - - Mobile Dali - - Mobile Desktop Applications - - Mobile Enlightenment - - Mobile Input Framework - - Mobile 3Parts Middleware - - Mobile 3Parts Multimedia - Mobile Packaging - - Mobile Qt5 - - Mobile Security - - Mobile X11 - - Mobile EFL - PostScripts: - - generic-adaptation - - generic-applications - - generic-base - - generic-bluetooth - - generic-console-tools - - generic-multimedia - - generic-packaging - - generic-qt5 - - generic-x11 - - mobile-adaptation - - mobile-base - - mobile-desktop-applications - - mobile-middleware - - mobile-packaging - - mobile-qt5 - - mobile-x11 - Repos: [] - NoChrootScripts: - - buildname - -X11: - Part: mobile-mbr - UserGroups: "audio,video" - Groups: - Generic Adaptation - Mobile Adaptation + - Generic X11 + - Mobile X11 + - Mobile X11 Temp + - Mobile Middleware X11 - Generic Applications - - Mobile Application - - Generic Base - - Mobile Base - - Generic Console Tools - - Generic Crosswalk - - Mobile Crosswalk - - Generic Desktop Applications + - Mobile Applications - Generic Multimedia - Mobile Multimedia - - Generic Packaging - - Mobile Packaging - - Generic X11 - - Mobile Connectivity Framework X11 + - Generic Desktop Applications + - Generic Crosswalk + - Mobile Crosswalk - Mobile Dali - Mobile EFL - Mobile Enlightenment X11 - Mobile Input Framework - - Mobile Middleware X11 - - Mobile X11 - - Mobile X11 Temp + - Mobile Connectivity Framework X11 PostScripts: - - generic-adaptation - - mobile-adaptation - - generic-applications - generic-base - - generic-console-tools - - generic-crosswalk - mobile-base - - mobile-crosswalk - - generic-desktop-applications - - generic-multimedia + - generic-console-tools - generic-packaging - mobile-packaging + - generic-adaptation + - mobile-adaptation - generic-x11 - - mobile-middleware-x11 - mobile-x11 + - mobile-middleware-x11 + - generic-applications + - generic-multimedia + - generic-desktop-applications + - generic-crosswalk + - mobile-crosswalk Repos: [] NoChrootScripts: - buildname -X11-64: +Wayland: Part: mobile-mbr UserGroups: "audio,video" Groups: - - Generic Adaptation - - Mobile Adaptation - - Generic Applications - - Mobile Application - Generic Base - Mobile Base - Generic Console Tools - - Generic Crosswalk - - Mobile Crosswalk - - Generic Desktop Applications - - Generic Multimedia - - Mobile Multimedia - Generic Packaging - Mobile Packaging - - Generic X11 - - Mobile Connectivity Framework X11 + - Generic Adaptation + - Mobile Adaptation + - Generic Wayland + - Mobile Wayland + - Mobile Wayland Temp + - Mobile Middleware Wayland + - Generic Applications + - Mobile Applications + - Generic Multimedia + - Mobile Multimedia + - Generic Desktop Applications + - Generic Crosswalk + - Mobile Crosswalk - Mobile Dali - Mobile EFL - - Mobile Enlightenment X11 + - Mobile Enlightenment Wayland - Mobile Input Framework - - Mobile Middleware X11 - - Mobile X11 - - Mobile X11 Temp + - Mobile Connectivity Framework Wayland PostScripts: + - generic-base + - mobile-base + - generic-console-tools + - generic-packaging + - mobile-packaging - generic-adaptation - mobile-adaptation + - generic-wayland + - mobile-middleware-wayland - generic-applications - - generic-base - - generic-console-tools + - generic-multimedia + - generic-desktop-applications - generic-crosswalk - - mobile-base - mobile-crosswalk - - generic-desktop-applications - - generic-multimedia - - generic-packaging - - mobile-packaging - - generic-x11 - - mobile-middleware-x11 - - mobile-x11 Repos: [] NoChrootScripts: - buildname -Wayland: +Wayland-64: Part: mobile-mbr UserGroups: "audio,video" Groups: - - Generic Adaptation - - Mobile Adaptation - - Generic Applications - - Mobile Application - Generic Base - Mobile Base - Generic Console Tools - - Generic Crosswalk - - Mobile Crosswalk - - Generic Desktop Applications - - Generic Multimedia - - Mobile Multimedia - Generic Packaging - Mobile Packaging + - Generic Adaptation + - Mobile Adaptation - Generic Wayland - Mobile Wayland - - Mobile Connectivity Framework Wayland + - Mobile Wayland Temp + - Mobile Middleware Wayland + - Generic Applications + - Mobile Applications + - Generic Multimedia + - Mobile Multimedia + - Generic Desktop Applications + - Generic Crosswalk + - Mobile Crosswalk - Mobile Dali - Mobile EFL - Mobile Enlightenment Wayland - Mobile Input Framework - - Mobile Middleware Wayland - - Mobile Wayland Temp + - Mobile Connectivity Framework Wayland PostScripts: - - generic-adaptation - - mobile-adaptation - - generic-applications - generic-base - - generic-console-tools - - generic-crosswalk - mobile-base - - mobile-crosswalk - - generic-desktop-applications - - generic-multimedia + - generic-console-tools - generic-packaging - mobile-packaging + - generic-adaptation + - mobile-adaptation + - generic-wayland - mobile-middleware-wayland - Repos: [] - NoChrootScripts: - - buildname - -Wayland-64: - Part: mobile-mbr - UserGroups: "audio,video" - Groups: - PostScripts: - Repos: [] + - generic-applications + - generic-multimedia + - generic-desktop-applications + - generic-crosswalk + - mobile-crosswalk + Repos: [] NoChrootScripts: - buildname diff --git a/patterns/mobile-application.yaml b/patterns/mobile-application.yaml deleted file mode 100644 index 379c0b1..0000000 --- a/patterns/mobile-application.yaml +++ /dev/null @@ -1,8 +0,0 @@ -Summary: Mobile Application -Description: Mobile Application -Name: mobile-application -Packages: -- app-installers -- tpk-backend -- wgt-backend -- capi-appfw-app-manager diff --git a/patterns/mobile-applications.yaml b/patterns/mobile-applications.yaml new file mode 100644 index 0000000..12383bb --- /dev/null +++ b/patterns/mobile-applications.yaml @@ -0,0 +1,8 @@ +Summary: Mobile Applications +Description: Mobile Applications +Name: mobile-applications +Packages: +- app-installers +- tpk-backend +- wgt-backend +- capi-appfw-app-manager diff --git a/patterns/mobile-enlightenment-wayland.yaml b/patterns/mobile-enlightenment-wayland.yaml index f933b03..53133c8 100644 --- a/patterns/mobile-enlightenment-wayland.yaml +++ b/patterns/mobile-enlightenment-wayland.yaml @@ -3,3 +3,4 @@ Description: Mobile Enlightenment Wayland Name: mobile-enlightenment-wayland Packages: - enlightenment +- e-tizen-data diff --git a/patterns/mobile-wayland.yaml b/patterns/mobile-wayland.yaml index be770e1..e4282a6 100644 --- a/patterns/mobile-wayland.yaml +++ b/patterns/mobile-wayland.yaml @@ -4,8 +4,5 @@ Name: mobile-wayland Packages: - libtbm-exynos4412 - tlm-config-common -- weston-common -- weston-common-config - weston-clients -- weston-common-tz-launcher - desktop-skin -- 2.7.4