From 419ae036fbc8a2ab974cd9cf3cca0a1fe48a8b4d Mon Sep 17 00:00:00 2001 From: Joonsub Lee Date: Wed, 1 Apr 2015 16:48:02 +0900 Subject: [PATCH] Refactoring tv.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 Change-Id: I749062ebabdb73c62b977dbc7aa0dd189657ebce --- ks/tv-x11-3parts-arm64.yaml | 10 -- ks/tv-x11-3parts-armv7l-odroidu3.yaml | 10 -- patterns/tv-3parts-middleware.yaml | 13 --- patterns/tv-middleware.yaml | 1 - scripts/common-middleware.post | 3 - scripts/tv-middleware.post | 3 + tv.yaml | 203 +++++++++------------------------- 7 files changed, 58 insertions(+), 185 deletions(-) delete mode 100644 ks/tv-x11-3parts-arm64.yaml delete mode 100644 ks/tv-x11-3parts-armv7l-odroidu3.yaml delete mode 100644 patterns/tv-3parts-middleware.yaml delete mode 100644 scripts/common-middleware.post create mode 100644 scripts/tv-middleware.post diff --git a/ks/tv-x11-3parts-arm64.yaml b/ks/tv-x11-3parts-arm64.yaml deleted file mode 100644 index 7eed11c..0000000 --- a/ks/tv-x11-3parts-arm64.yaml +++ /dev/null @@ -1,10 +0,0 @@ -Name: tv-x11-3parts-arm64 -Architecture: aarch64 -Schedule: "*" -Active: False -Platform: 3Parts-X11-64 -Part: tv-mbr-3parts -Mic2Options: -f loop --pack-to=@NAME@.tar.gz -FileName: tv-x11-3parts-arm64 -Repos: - - tv-x11_arm64 diff --git a/ks/tv-x11-3parts-armv7l-odroidu3.yaml b/ks/tv-x11-3parts-armv7l-odroidu3.yaml deleted file mode 100644 index f9da504..0000000 --- a/ks/tv-x11-3parts-armv7l-odroidu3.yaml +++ /dev/null @@ -1,10 +0,0 @@ -Name: tv-x11-3parts-armv7l-odroidu3 -Architecture: armv7l -Schedule: "*" -Active: False -Platform: 3Parts-X11 -Part: tv-mbr-3parts -Mic2Options: -f loop --pack-to=@NAME@.tar.gz -FileName: tv-x11-3parts-armv7l-odroidu3 -Repos: - - tv-x11_armv7l diff --git a/patterns/tv-3parts-middleware.yaml b/patterns/tv-3parts-middleware.yaml deleted file mode 100644 index 8bdb8c1..0000000 --- a/patterns/tv-3parts-middleware.yaml +++ /dev/null @@ -1,13 +0,0 @@ -Summary: TV 3parts Middleware -Description: TV 3parts Middleware -Name: tv-3parts-middleware -Packages: -- calendar-service -- csf-framework -- evolution-data-server -- libprivilege-control-conf -- notification-service -- pkgmgr-server -- sqlite3 -- sdbd -- security-server diff --git a/patterns/tv-middleware.yaml b/patterns/tv-middleware.yaml index c18c66a..6fcbd7d 100644 --- a/patterns/tv-middleware.yaml +++ b/patterns/tv-middleware.yaml @@ -11,7 +11,6 @@ Packages: - buxton - cynara - resourced -- linux-firmware - security-manager - libsecurity-manager-client - iotivity diff --git a/scripts/common-middleware.post b/scripts/common-middleware.post deleted file mode 100644 index b79d397..0000000 --- a/scripts/common-middleware.post +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -echo "############### common-middleware.post ################" - diff --git a/scripts/tv-middleware.post b/scripts/tv-middleware.post new file mode 100644 index 0000000..1c55793 --- /dev/null +++ b/scripts/tv-middleware.post @@ -0,0 +1,3 @@ +#!/bin/sh +echo "############### tv-middleware.post ################" + diff --git a/tv.yaml b/tv.yaml index 0522d8a..cd0eb97 100644 --- a/tv.yaml +++ b/tv.yaml @@ -27,152 +27,51 @@ Boot-Odroidu3: - TV Boot Odroid U3 Repos: [] -3Parts-X11: +X11: Part: tv-mbr UserGroups: "audio,video" Groups: - - Common Middleware - - Generic Adaptation - - Generic Applications - Generic Base - - Generic Bluetooth + - TV Base - Generic Console Tools - - Generic Crosswalk - - Generic Desktop Applications - - Generic Multimedia - Generic Packaging - - Generic Qt5 - - Generic X11 - - TV 3parts Middleware - - TV Adaptation - - TV Application - - TV Base - - TV Crosswalk - - TV Dali - - TV Desktop Applications - - TV EFL - - TV Enlightenment - - TV Input Framework - - TV Multimedia - TV Packaging - - TV Qt5 - - TV Web Framework - - TV X11 - PostScripts: - - common-middleware - - generic-adaptation - - generic-applications - - generic-base - - generic-console-tools - - generic-crosswalk - - generic-bluetooth - - generic-desktop-applications - - generic-multimedia - - generic-packaging - - generic-qt5 - - generic-x11 - - tv-adaptation - - tv-base - - tv-crosswalk - - tv-desktop-applications - - tv-packaging - - tv-qt5 - - tv-x11 - Repos: [] - NoChrootScripts: - - buildname - -3Parts-X11-64: - Part: tv-mbr - UserGroups: "audio,video" - Groups: - - Common Middleware - Generic Adaptation - - Generic Applications - - Generic Base - - Generic Bluetooth - - Generic Console Tools - - Generic Desktop Applications - - Generic Multimedia - - Generic Packaging - - Generic Qt5 - - Generic X11 - - TV 3parts Middleware - - TV Application - TV Adaptation - - TV Base - - TV Dali - - TV Desktop Applications - - TV EFL - - TV Enlightenment - - TV Input Framework - - TV Multimedia - - TV Packaging - - TV Qt5 + - Generic X11 - TV X11 - PostScripts: - - common-middleware - - generic-adaptation - - generic-applications - - generic-base - - generic-bluetooth - - generic-console-tools - - generic-desktop-applications - - generic-multimedia - - generic-packaging - - generic-qt5 - - generic-x11 - - tv-adaptation - - tv-base - - tv-desktop-applications - - tv-packaging - - tv-qt5 - - tv-x11 - Repos: [] - NoChrootScripts: - - buildname - -X11: - Part: tv-mbr - UserGroups: "audio,video" - Groups: + - TV Middleware - Generic Applications - TV Applications X11 - - Generic Base - - TV Base - - Generic Console Tools - - Generic Crosswalk - - TV Crosswalk X11 - - Generic Desktop Applications - Generic Multimedia - TV Multimedia - - Generic Packaging - - Generic X11 - - TV X11 - - TV Adaptation + - Generic Desktop Applications + - Generic Crosswalk + - TV Crosswalk X11 - TV Dali - TV EFL - TV Enlightenment X11 - TV Input Framework - - TV Middleware - TV Web Framework X11 PostScripts: - - generic-applications - generic-base + - tv-base - generic-console-tools - - generic-crosswalk - - generic-desktop-applications - - generic-multimedia - generic-packaging - - generic-x11 + - tv-packaging + - generic-adaptation - tv-adaptation - - tv-base - - tv-crosswalk + - generic-x11 - tv-x11 + - tv-middleware + - generic-applications + - generic-multimedia + - generic-desktop-applications + - generic-crosswalk + - tv-crosswalk - tv-mbr-3parts - tv-users - tv-generate-env - - tv-packaging Repos: [] NoChrootScripts: - buildname @@ -181,42 +80,46 @@ X11-64: Part: tv-mbr UserGroups: "audio,video" Groups: - - Generic Applications - - TV Applications X11 - Generic Base - TV Base - Generic Console Tools - - Generic Crosswalk - - Generic Desktop Applications - - Generic Multimedia - - TV Multimedia - Generic Packaging + - TV Packaging + - Generic Adaptation + - TV Adaptation - Generic X11 - TV X11 - - TV Adaptation + - TV Middleware + - Generic Applications + - TV Applications X11 + - Generic Multimedia + - TV Multimedia + - Generic Desktop Applications + - Generic Crosswalk - TV Crosswalk X11 - TV Dali - TV EFL - TV Enlightenment X11 - TV Input Framework - - TV Middleware PostScripts: - - generic-applications - generic-base + - tv-base - generic-console-tools - - generic-crosswalk - - generic-desktop-applications - - generic-multimedia - generic-packaging - - generic-x11 + - tv-packaging + - generic-adaptation - tv-adaptation - - tv-base - - tv-crosswalk + - generic-x11 - tv-x11 + - tv-middleware + - generic-applications + - generic-multimedia + - generic-desktop-applications + - generic-crosswalk + - tv-crosswalk - tv-mbr-3parts - tv-users - tv-generate-env - - tv-packaging Repos: [] NoChrootScripts: - buildname @@ -225,42 +128,46 @@ Wayland: Part: tv-mbr UserGroups: "audio,video" Groups: - - Generic Applications - - TV Applications Wayland - Generic Base - TV Base - Generic Console Tools - - Generic Crosswalk - - Generic Desktop Applications - - Generic Multimedia - - TV Multimedia - Generic Packaging + - Generic Adaptation + - TV Adaptation - Generic Wayland - TV Wayland - - TV Adaptation + - TV Middleware + - Generic Applications + - TV Applications Wayland + - Generic Multimedia + - TV Multimedia + - Generic Desktop Applications + - Generic Crosswalk - TV Crosswalk Wayland - TV Dali - TV EFL - TV Enlightenment Wayland - TV Input Framework - - TV Middleware - TV Web Framework Wayland - TV Wayland Temp PostScripts: - - generic-applications - generic-base + - tv-base - generic-console-tools - - generic-crosswalk - - generic-desktop-applications - - generic-multimedia - generic-packaging + - tv-packaging + - generic-adaptation - tv-adaptation - - tv-base + - generic-wayland + - tv-middleware + - generic-applications + - generic-multimedia + - generic-desktop-applications + - generic-crosswalk - tv-crosswalk - tv-mbr-3parts - tv-users - tv-generate-env - - tv-packaging Repos: [] NoChrootScripts: - buildname -- 2.7.4