From 7dc3bf316ad330cdff30e5c607df1f65aae9c15f Mon Sep 17 00:00:00 2001 From: Joonsub Lee Date: Fri, 13 Mar 2015 18:45:27 +0900 Subject: [PATCH] Disable 3parts image and add wayland image Since wayland repositories are added in obs, I have needs to generate mobile wayland image. But this change is not completed yet. I generate this patch for testing in prerelease. So, please don't review this without my verify. Change-Id: I52ce2429200386273ae0845aa5e1bee3893f69ca --- ks/mobile-wayland-armv7l-n4.yaml | 10 +++ ks/mobile-x11-3parts-arm64.yaml | 2 +- ks/mobile-x11-3parts-armv7l-odroidu3.yaml | 2 +- mobile-repos.yaml | 5 ++ mobile-targets.yaml | 5 +- mobile.yaml | 95 +++++++++++++++++----- patterns/mobile-application.yaml | 1 + ...l => mobile-connectivity-framework-3parts.yaml} | 6 +- .../mobile-connectivity-framework-wayland.yaml | 8 ++ patterns/mobile-connectivity-framework-x11.yaml | 11 +++ patterns/mobile-enlightenment-wayland.yaml | 4 + ...htenment.yaml => mobile-enlightenment-x11.yaml} | 6 +- ...dleware.yaml => mobile-middleware-wayland.yaml} | 24 +++--- patterns/mobile-middleware-x11.yaml | 19 +++++ patterns/mobile-multimedia.yaml | 10 +++ patterns/mobile-security.yaml | 2 + patterns/mobile-wayland-temp.yaml | 23 ++++++ patterns/mobile-wayland.yaml | 5 ++ patterns/mobile-x11-temp.yaml | 19 +++++ patterns/mobile-x11.yaml | 3 +- scripts/mobile-middleware-wayland.post | 3 + scripts/mobile-middleware-x11.post | 3 + 22 files changed, 224 insertions(+), 42 deletions(-) create mode 100644 ks/mobile-wayland-armv7l-n4.yaml rename patterns/{mobile-connectivity-framework.yaml => mobile-connectivity-framework-3parts.yaml} (52%) create mode 100644 patterns/mobile-connectivity-framework-wayland.yaml create mode 100644 patterns/mobile-connectivity-framework-x11.yaml create mode 100644 patterns/mobile-enlightenment-wayland.yaml rename patterns/{mobile-enlightenment.yaml => mobile-enlightenment-x11.yaml} (57%) rename patterns/{mobile-middleware.yaml => mobile-middleware-wayland.yaml} (53%) create mode 100644 patterns/mobile-middleware-x11.yaml create mode 100644 patterns/mobile-wayland-temp.yaml create mode 100644 patterns/mobile-wayland.yaml create mode 100644 patterns/mobile-x11-temp.yaml create mode 100644 scripts/mobile-middleware-wayland.post create mode 100644 scripts/mobile-middleware-x11.post diff --git a/ks/mobile-wayland-armv7l-n4.yaml b/ks/mobile-wayland-armv7l-n4.yaml new file mode 100644 index 0000000..c5f7be5 --- /dev/null +++ b/ks/mobile-wayland-armv7l-n4.yaml @@ -0,0 +1,10 @@ +Name: mobile-wayland-armv7l-n4 +Architecture: armv7l +Schedule: "*" +Active: True +Platform: Wayland +Part: mobile-mbr-3parts +Mic2Options: -f loop --pack-to=@NAME@.tar.gz +FileName: mobile-wayland-armv7l-n4 +Repos: + - mobile-wayland_armv7l diff --git a/ks/mobile-x11-3parts-arm64.yaml b/ks/mobile-x11-3parts-arm64.yaml index cb4af2b..ed67a09 100644 --- a/ks/mobile-x11-3parts-arm64.yaml +++ b/ks/mobile-x11-3parts-arm64.yaml @@ -1,7 +1,7 @@ Name: mobile-x11-3parts-arm64 Architecture: aarch64 Schedule: "*" -Active: True +Active: False Platform: 3Parts-X11-64 Part: mobile-mbr-3parts Mic2Options: -f loop --pack-to=@NAME@.tar.gz diff --git a/ks/mobile-x11-3parts-armv7l-odroidu3.yaml b/ks/mobile-x11-3parts-armv7l-odroidu3.yaml index 7091aaa..c48f12d 100644 --- a/ks/mobile-x11-3parts-armv7l-odroidu3.yaml +++ b/ks/mobile-x11-3parts-armv7l-odroidu3.yaml @@ -1,7 +1,7 @@ Name: mobile-x11-3parts-armv7l-odroidu3 Architecture: armv7l Schedule: "*" -Active: True +Active: False Platform: 3Parts-X11 Part: mobile-mbr-3parts Mic2Options: -f loop --pack-to=@NAME@.tar.gz diff --git a/mobile-repos.yaml b/mobile-repos.yaml index cd5c53e..5f7cf62 100644 --- a/mobile-repos.yaml +++ b/mobile-repos.yaml @@ -14,3 +14,8 @@ Repositories: - Name: mobile-x11_arm64 Url: http://download.tizen.org/snapshots/tizen/mobile/@BUILD_ID@/repos/arm64-x11/packages/ Options: --ssl_verify=no + + - Name: mobile-wayland_armv7l + Url: http://download.tizen.org/snapshots/tizen/mobile/@BUILD_ID@/repos/arm-wayland/packages/ + Options: --ssl_verify=no + diff --git a/mobile-targets.yaml b/mobile-targets.yaml index 29a8ed7..f304080 100644 --- a/mobile-targets.yaml +++ b/mobile-targets.yaml @@ -4,11 +4,12 @@ Targets: Images: - mobile-boot-armv7l-odroidu3.yaml - mobile-boot-armv7l-RD-PQ.yaml - - mobile-x11-3parts-armv7l-odroidu3.yaml - mobile-x11-armv7l-n4.yaml - Name: arm64-x11 Images: - - mobile-x11-3parts-arm64.yaml - mobile-x11-arm64-n4.yaml + - Name: arm-wayland + Images: + - mobile-wayland-armv7l-n4.yaml diff --git a/mobile.yaml b/mobile.yaml index d29c474..816f9c7 100644 --- a/mobile.yaml +++ b/mobile.yaml @@ -58,7 +58,7 @@ Boot-RD-PQ: - Mobile Adaptation - Mobile Base - Mobile Crosswalk - - Mobile Connectivity Framework + - Mobile Connectivity Framework 3Parts - Mobile Dali - Mobile Desktop Applications - Mobile Enlightenment @@ -108,7 +108,7 @@ Boot-RD-PQ: - Generic X11 - Mobile Adaptation - Mobile Base - - Mobile Connectivity Framework + - Mobile Connectivity Framework 3Parts - Mobile Dali - Mobile Desktop Applications - Mobile Enlightenment @@ -145,36 +145,40 @@ X11: Part: mobile-mbr UserGroups: "audio,video" Groups: + - Generic Adaptation + - Mobile Adaptation - Generic Applications + - Mobile Application - Generic Base - Generic Console Tools - Generic Crosswalk + - Mobile Crosswalk - Generic Desktop Applications - Generic Multimedia + - Mobile Multimedia - Generic Packaging - Generic X11 - - Mobile Adaptation - - Mobile Application - - Mobile Crosswalk + - Mobile Connectivity Framework X11 - Mobile Dali - Mobile EFL - - Mobile Enlightenment + - Mobile Enlightenment X11 - Mobile Input Framework - - Mobile Middleware - - Mobile Multimedia + - Mobile Middleware X11 - Mobile X11 + - Mobile X11 Temp PostScripts: + - generic-adaptation + - mobile-adaptation - generic-applications - generic-base - generic-console-tools - generic-crosswalk + - mobile-crosswalk - generic-desktop-applications - generic-multimedia - generic-packaging - generic-x11 - - mobile-adaptation - - mobile-crosswalk - - mobile-middleware + - mobile-middleware-x11 - mobile-x11 Repos: [] NoChrootScripts: @@ -184,37 +188,90 @@ X11-64: Part: mobile-mbr UserGroups: "audio,video" Groups: + - Generic Adaptation + - Mobile Adaptation - Generic Applications + - Mobile Application - Generic Base - Generic Console Tools - Generic Crosswalk + - Mobile Crosswalk - Generic Desktop Applications - Generic Multimedia + - Mobile Multimedia - Generic Packaging - Generic X11 - - Mobile Adaptation - - Mobile Application - - Mobile Crosswalk + - Mobile Connectivity Framework X11 - Mobile Dali - Mobile EFL - - Mobile Enlightenment + - Mobile Enlightenment X11 - Mobile Input Framework - - Mobile Middleware - - Mobile Multimedia + - Mobile Middleware X11 - Mobile X11 + - Mobile X11 Temp PostScripts: + - generic-adaptation + - mobile-adaptation - generic-applications - generic-base - generic-console-tools - generic-crosswalk + - mobile-crosswalk - generic-desktop-applications - generic-multimedia - generic-packaging - generic-x11 + - mobile-middleware-x11 + - mobile-x11 + Repos: [] + NoChrootScripts: + - buildname + +Wayland: + Part: mobile-mbr + UserGroups: "audio,video" + Groups: + - Generic Adaptation + - Mobile Adaptation + - Generic Applications + - Mobile Application + - Generic Base + - Generic Console Tools + - Generic Crosswalk + - Mobile Crosswalk + - Generic Desktop Applications + - Generic Multimedia + - Mobile Multimedia + - Generic Packaging + - Mobile Connectivity Framework Wayland + - Mobile Dali + - Mobile EFL + - Mobile Enlightenment Wayland + - Mobile Input Framework + - Mobile Middleware Wayland + - Mobile Wayland + - Mobile Wayland Temp + PostScripts: + - generic-adaptation - mobile-adaptation + - generic-applications + - generic-base + - generic-console-tools + - generic-crosswalk - mobile-crosswalk - - mobile-middleware - - mobile-x11 + - generic-desktop-applications + - generic-multimedia + - generic-packaging + - mobile-middleware-wayland + Repos: [] + NoChrootScripts: + - buildname + +Wayland-64: + Part: mobile-mbr + UserGroups: "audio,video" + Groups: + PostScripts: Repos: [] NoChrootScripts: - buildname diff --git a/patterns/mobile-application.yaml b/patterns/mobile-application.yaml index 989601a..379c0b1 100644 --- a/patterns/mobile-application.yaml +++ b/patterns/mobile-application.yaml @@ -5,3 +5,4 @@ Packages: - app-installers - tpk-backend - wgt-backend +- capi-appfw-app-manager diff --git a/patterns/mobile-connectivity-framework.yaml b/patterns/mobile-connectivity-framework-3parts.yaml similarity index 52% rename from patterns/mobile-connectivity-framework.yaml rename to patterns/mobile-connectivity-framework-3parts.yaml index e040e26..7581fb1 100644 --- a/patterns/mobile-connectivity-framework.yaml +++ b/patterns/mobile-connectivity-framework-3parts.yaml @@ -1,6 +1,6 @@ -Summary: Mobile Connectivity Framework -Description: Mobile Connectivity Framework -Name: mobile-connectivity-framework +Summary: Mobile Connectivity Framework 3Parts +Description: Mobile Connectivity Framework 3Parts +Name: mobile-connectivity-framework-3parts Packages: - mobileap-agent - wifi-direct-manager diff --git a/patterns/mobile-connectivity-framework-wayland.yaml b/patterns/mobile-connectivity-framework-wayland.yaml new file mode 100644 index 0000000..726c443 --- /dev/null +++ b/patterns/mobile-connectivity-framework-wayland.yaml @@ -0,0 +1,8 @@ +Summary: Mobile Connectivity Framework Wayland +Description: Mobile Connectivity Framework Wayland +Name: mobile-connectivity-framework-wayland +Packages: +- capi-network-nfc +- libwifi-direct +- net-config +- nfc-client-lib-neard diff --git a/patterns/mobile-connectivity-framework-x11.yaml b/patterns/mobile-connectivity-framework-x11.yaml new file mode 100644 index 0000000..079db70 --- /dev/null +++ b/patterns/mobile-connectivity-framework-x11.yaml @@ -0,0 +1,11 @@ +Summary: Mobile Connectivity Framework X11 +Description: Mobile Connectivity Framework X11 +Name: mobile-connectivity-framework-x11 +Packages: +- capi-network-wifi +- capi-network-connection +- capi-network-nfc +- libnet-client +- libwifi-direct +- net-config +- nfc-client-lib-neard diff --git a/patterns/mobile-enlightenment-wayland.yaml b/patterns/mobile-enlightenment-wayland.yaml new file mode 100644 index 0000000..25a8ee2 --- /dev/null +++ b/patterns/mobile-enlightenment-wayland.yaml @@ -0,0 +1,4 @@ +Summary: Mobile Enlightenment Wayland +Description: Mobile Enlightenment Wayland +Name: mobile-enlightenment-wayland +Packages: [] diff --git a/patterns/mobile-enlightenment.yaml b/patterns/mobile-enlightenment-x11.yaml similarity index 57% rename from patterns/mobile-enlightenment.yaml rename to patterns/mobile-enlightenment-x11.yaml index aaa5ec9..7006b93 100644 --- a/patterns/mobile-enlightenment.yaml +++ b/patterns/mobile-enlightenment-x11.yaml @@ -1,6 +1,6 @@ -Summary: Mobile Enlightenment -Description: Mobile Enlightenment -Name: mobile-enlightenment +Summary: Mobile Enlightenment X11 +Description: Mobile Enlightenment X11 +Name: mobile-enlightenment-x11 Packages: - e-mod-tizen-wm-policy - e-mod-tizen-effect diff --git a/patterns/mobile-middleware.yaml b/patterns/mobile-middleware-wayland.yaml similarity index 53% rename from patterns/mobile-middleware.yaml rename to patterns/mobile-middleware-wayland.yaml index 1814882..0094084 100644 --- a/patterns/mobile-middleware.yaml +++ b/patterns/mobile-middleware-wayland.yaml @@ -1,16 +1,18 @@ -Summary: Mobile Middleware -Description: Mobile Middleware -Name: mobile-middleware +Summary: Mobile Middleware Wayland +Description: Mobile Middleware Wayland +Name: mobile-middleware-wayland Packages: -- model-config-generic -- usb-server -- libprivilege-control-conf -- pkgmgr-server -- sqlite3 -- sdbd - buxton - cynara +- libprivilege-control-conf +- libsecurity-manager-client +- model-config-generic +- pkgmgr-server - resourced -- linux-firmware +- sdbd - security-manager -- libsecurity-manager-client +- usb-server +- cyad +- drm-client +- libtasn1-tools +- neardal diff --git a/patterns/mobile-middleware-x11.yaml b/patterns/mobile-middleware-x11.yaml new file mode 100644 index 0000000..e7c284c --- /dev/null +++ b/patterns/mobile-middleware-x11.yaml @@ -0,0 +1,19 @@ +Summary: Mobile Middleware X11 +Description: Mobile Middleware X11 +Name: mobile-middleware-x11 +Packages: +- buxton +- cynara +- libprivilege-control-conf +- libsecurity-manager-client +- model-config-generic +- pkgmgr-server +- resourced +- sdbd +- security-manager +- security-server +- usb-server +- neardal +- cyad +- drm-client +- libtasn1-tools diff --git a/patterns/mobile-multimedia.yaml b/patterns/mobile-multimedia.yaml index c69b00d..2091423 100644 --- a/patterns/mobile-multimedia.yaml +++ b/patterns/mobile-multimedia.yaml @@ -17,3 +17,13 @@ Packages: - gst-libav - capi-media-recorder - gst-plugins-ugly +- capi-content-media-content +- capi-media-image-util +- capi-media-metadata-extractor +- capi-media-sound-manager +- capi-media-wav-player +- libmedia-service +- libmedia-thumbnail +- libmedia-utils +- media-server +- media-thumbnail-server diff --git a/patterns/mobile-security.yaml b/patterns/mobile-security.yaml index 4f39c9e..cfe96fd 100644 --- a/patterns/mobile-security.yaml +++ b/patterns/mobile-security.yaml @@ -4,3 +4,5 @@ Name: mobile-security Packages: - security-manager - libsecurity-manager-client +- libtasn1-tools +- security-manager-policy diff --git a/patterns/mobile-wayland-temp.yaml b/patterns/mobile-wayland-temp.yaml new file mode 100644 index 0000000..20c0bdf --- /dev/null +++ b/patterns/mobile-wayland-temp.yaml @@ -0,0 +1,23 @@ +Summary: Mobile Wayland Temp +Description: Mobile Wayland Temp +Name: mobile-wayland-temp +Packages: +- capi-appfw-package-manager +- capi-system-device +- capi-system-power +- capi-web-favorites +- capi-web-url-download +- download-provider +- ibus-libs +- libboost_program_options1_57_0 +- libfontenc +- libjson-glib +- libmessage-port +- libmm-ta +- libpciaccess +- libsvi +- libtapi +- libtapi3 +- message-port +- monotype-fonts +- ui-gadget-1 diff --git a/patterns/mobile-wayland.yaml b/patterns/mobile-wayland.yaml new file mode 100644 index 0000000..5c07262 --- /dev/null +++ b/patterns/mobile-wayland.yaml @@ -0,0 +1,5 @@ +Summary: Mobile Wayland +Description: Mobile Wayland +Name: mobile-wayland +Packages: +- libtbm-exynos4412 diff --git a/patterns/mobile-x11-temp.yaml b/patterns/mobile-x11-temp.yaml new file mode 100644 index 0000000..f073bdf --- /dev/null +++ b/patterns/mobile-x11-temp.yaml @@ -0,0 +1,19 @@ +Summary: Mobile X11 Temp +Description: Mobile X11 Temp +Name: mobile-x11-temp +Packages: +- xkeyboard-config +- libsvi +- capi-system-device +- capi-system-power +- capi-system-system-settings +- capi-web-favorites +- capi-web-url-download +- download-provider +- libboost_program_options1_57_0 +- libjson-glib +- libmessage-port +- libtapi +- libtapi3 +- message-port +- ui-gadget-1 diff --git a/patterns/mobile-x11.yaml b/patterns/mobile-x11.yaml index c4bb001..7a921dd 100644 --- a/patterns/mobile-x11.yaml +++ b/patterns/mobile-x11.yaml @@ -2,9 +2,8 @@ Summary: Mobile X11 Description: Mobile X11 Name: mobile-x11 Packages: -- x11-common - libtbm-exynos4412 +- x11-common - xf86-input-evdevmultitouch - xf86-input-gesture -- xf86-misc-exynos4412 - xf86-video-exynos diff --git a/scripts/mobile-middleware-wayland.post b/scripts/mobile-middleware-wayland.post new file mode 100644 index 0000000..91b8df0 --- /dev/null +++ b/scripts/mobile-middleware-wayland.post @@ -0,0 +1,3 @@ +#!/bin/sh +echo "############### mobile-middleware-wayland.post ################" + diff --git a/scripts/mobile-middleware-x11.post b/scripts/mobile-middleware-x11.post new file mode 100644 index 0000000..e8fc10f --- /dev/null +++ b/scripts/mobile-middleware-x11.post @@ -0,0 +1,3 @@ +#!/bin/sh +echo "############### mobile-middleware-x11.post ################" + -- 2.7.4