From 352dbcf47738fb7fd9f2c4f88a7569323eec8fd6 Mon Sep 17 00:00:00 2001 From: Joonsub Lee Date: Thu, 21 May 2015 10:16:01 +0900 Subject: [PATCH] Remove files related with x11 repos. Request by TV profile's project leader. X11 repositories will be removed from obs project soon. Change-Id: I33455356bc7cfba8a38b567cb02e3dc5ebb7b285 --- ks/tv-boot-armv7l-odroidu3.yaml | 2 +- ks/tv-boot-armv7l-odroidxu3.yaml | 2 +- ks/tv-x11-armv7l-odroidu3.yaml | 14 --- patterns/tv-applications-x11.yaml | 23 ---- ...lications-wayland.yaml => tv-applications.yaml} | 6 +- patterns/tv-crosswalk-wayland.yaml | 5 - patterns/tv-crosswalk-x11.yaml | 6 - patterns/tv-crosswalk.yaml | 5 + patterns/tv-efl-x11.yaml | 20 ---- patterns/{tv-efl-wayland.yaml => tv-efl.yaml} | 6 +- patterns/tv-enlightenment-x11.yaml | 10 -- ...htenment-wayland.yaml => tv-enlightenment.yaml} | 6 +- patterns/tv-x11-temp.yaml | 4 - patterns/tv-x11.yaml | 10 -- tv-repos.yaml | 16 --- tv-targets.yaml | 6 +- tv.yaml | 122 ++------------------- 17 files changed, 25 insertions(+), 238 deletions(-) delete mode 100644 ks/tv-x11-armv7l-odroidu3.yaml delete mode 100644 patterns/tv-applications-x11.yaml rename patterns/{tv-applications-wayland.yaml => tv-applications.yaml} (81%) delete mode 100644 patterns/tv-crosswalk-wayland.yaml delete mode 100644 patterns/tv-crosswalk-x11.yaml create mode 100644 patterns/tv-crosswalk.yaml delete mode 100644 patterns/tv-efl-x11.yaml rename patterns/{tv-efl-wayland.yaml => tv-efl.yaml} (81%) delete mode 100644 patterns/tv-enlightenment-x11.yaml rename patterns/{tv-enlightenment-wayland.yaml => tv-enlightenment.yaml} (52%) delete mode 100644 patterns/tv-x11-temp.yaml delete mode 100644 patterns/tv-x11.yaml diff --git a/ks/tv-boot-armv7l-odroidu3.yaml b/ks/tv-boot-armv7l-odroidu3.yaml index e2f0176..8fe26c0 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: - - tv-x11_armv7l + - tv-wayland_armv7l diff --git a/ks/tv-boot-armv7l-odroidxu3.yaml b/ks/tv-boot-armv7l-odroidxu3.yaml index eb8531f..50daea6 100644 --- a/ks/tv-boot-armv7l-odroidxu3.yaml +++ b/ks/tv-boot-armv7l-odroidxu3.yaml @@ -8,4 +8,4 @@ Mic2Options: -f loop --pack-to=@NAME@.tar.gz FileName: tv-boot-armv7l-odroidxu3 Group: TV Boot Odroid XU3 Repos: - - tv-x11_armv7l + - tv-wayland_armv7l diff --git a/ks/tv-x11-armv7l-odroidu3.yaml b/ks/tv-x11-armv7l-odroidu3.yaml deleted file mode 100644 index e0f4c64..0000000 --- a/ks/tv-x11-armv7l-odroidu3.yaml +++ /dev/null @@ -1,14 +0,0 @@ -Name: tv-x11-armv7l-odroidu3 -Architecture: armv7l -Schedule: "*" -Active: True -Platform: X11 -Part: tv-mbr-3parts -Mic2Options: -f loop --pack-to=@NAME@.tar.gz -FileName: tv-x11-armv7l-odroidu3 -Repos: - - tv-x11_armv7l -ExtraPackages: - - system-plugin-u3 - - mmfw-sysconf-target-u3 - - model-config-generic diff --git a/patterns/tv-applications-x11.yaml b/patterns/tv-applications-x11.yaml deleted file mode 100644 index de26a1a..0000000 --- a/patterns/tv-applications-x11.yaml +++ /dev/null @@ -1,23 +0,0 @@ -Summary: TV Applications X11 -Description: TV Applications X11 -Name: tv-applications-x11 -Packages: -- org.tizen.homescreen-tv-ref -- org.tizen.video-player-tv-ref -- app-content-provider -- app-content-provider-daemons -- 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.settings-tv-ref -- org.tizen.app-launcher-tv-ref -- org.tizen.setup-wizard-tv-ref -- app-installers -- tpk-backend -- wgt-backend -- org.tizen.browser -- org.tizen.screen-reader diff --git a/patterns/tv-applications-wayland.yaml b/patterns/tv-applications.yaml similarity index 81% rename from patterns/tv-applications-wayland.yaml rename to patterns/tv-applications.yaml index 370838b..b515d29 100644 --- a/patterns/tv-applications-wayland.yaml +++ b/patterns/tv-applications.yaml @@ -1,6 +1,6 @@ -Summary: TV Applications Wayland -Description: TV Applications Wayland -Name: tv-applications-wayland +Summary: TV Applications +Description: TV Applications +Name: tv-applications Packages: - org.tizen.video-player-tv-ref - app-content-provider diff --git a/patterns/tv-crosswalk-wayland.yaml b/patterns/tv-crosswalk-wayland.yaml deleted file mode 100644 index df0be59..0000000 --- a/patterns/tv-crosswalk-wayland.yaml +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 6c117c9..0000000 --- a/patterns/tv-crosswalk-x11.yaml +++ /dev/null @@ -1,6 +0,0 @@ -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 new file mode 100644 index 0000000..b2b67a7 --- /dev/null +++ b/patterns/tv-crosswalk.yaml @@ -0,0 +1,5 @@ +Summary: TV Crosswalk +Description: TV Crosswalk +Name: tv-crosswalk +Packages: +- wrt-widgets diff --git a/patterns/tv-efl-x11.yaml b/patterns/tv-efl-x11.yaml deleted file mode 100644 index ff32aa8..0000000 --- a/patterns/tv-efl-x11.yaml +++ /dev/null @@ -1,20 +0,0 @@ -Summary: TV EFL X11 -Description: TV EFL X11 -Name: tv-efl-x11 -Packages: -- efl-extension -- efl-theme-tizen-tv -- efl-misc -- org.tizen.elm-demo-tizen-tv -- capi-ui-efl-util -- elementary-tools -- default-fonts-sdk -- default-fonts-fc-sdk -- efl-modules -- at-spi2-core -- libatspi0 -- typelib-1_0-Atspi-2_0 -- libatk-bridge-2_0-0 -- atk-locale -- libatk -- typelib-Atk diff --git a/patterns/tv-efl-wayland.yaml b/patterns/tv-efl.yaml similarity index 81% rename from patterns/tv-efl-wayland.yaml rename to patterns/tv-efl.yaml index 18d12d6..8c1eef2 100644 --- a/patterns/tv-efl-wayland.yaml +++ b/patterns/tv-efl.yaml @@ -1,6 +1,6 @@ -Summary: TV EFL Wayland -Description: TV EFL Wayland -Name: tv-efl-wayland +Summary: TV EFL +Description: TV EFL +Name: tv-efl Packages: - efl-extension - efl-theme-tizen-tv diff --git a/patterns/tv-enlightenment-x11.yaml b/patterns/tv-enlightenment-x11.yaml deleted file mode 100644 index 853d87f..0000000 --- a/patterns/tv-enlightenment-x11.yaml +++ /dev/null @@ -1,10 +0,0 @@ -Summary: TV Enlightenment X11 -Description: TV Enlightenment X11 -Name: tv-enlightenment-x11 -Packages: -- e-mod-tizen-wm-policy -- e-mod-tizen-effect -- e-mod-tizen-devicemgr -- e-mod-tizen-keyrouter -- e-tizen-data -- e-tizen-testcase diff --git a/patterns/tv-enlightenment-wayland.yaml b/patterns/tv-enlightenment.yaml similarity index 52% rename from patterns/tv-enlightenment-wayland.yaml rename to patterns/tv-enlightenment.yaml index 3de5530..48f022f 100644 --- a/patterns/tv-enlightenment-wayland.yaml +++ b/patterns/tv-enlightenment.yaml @@ -1,6 +1,6 @@ -Summary: TV Enlightenment Wayland -Description: TV Enlightenment Wayland -Name: tv-enlightenment-wayland +Summary: TV Enlightenment +Description: TV Enlightenment +Name: tv-enlightenment Packages: - enlightenment - e-tizen-data diff --git a/patterns/tv-x11-temp.yaml b/patterns/tv-x11-temp.yaml deleted file mode 100644 index 6f98f06..0000000 --- a/patterns/tv-x11-temp.yaml +++ /dev/null @@ -1,4 +0,0 @@ -Summary: TV X11 Temp -Description: TV X11 Temp -Name: tv-x11-temp -Packages: [] diff --git a/patterns/tv-x11.yaml b/patterns/tv-x11.yaml deleted file mode 100644 index 936a27a..0000000 --- a/patterns/tv-x11.yaml +++ /dev/null @@ -1,10 +0,0 @@ -Summary: TV X11 -Description: TV X11 -Name: tv-x11 -Packages: -- x11-common -- libtbm-exynos4412 -- xf86-input-evdevmultitouch -- xf86-input-gesture -- xf86-misc-odroidu3 -- xf86-video-exynos diff --git a/tv-repos.yaml b/tv-repos.yaml index 63ccbfe..02ac8b1 100644 --- a/tv-repos.yaml +++ b/tv-repos.yaml @@ -1,20 +1,4 @@ Repositories: - - Name: tv - Url: http://download.tizen.org/snapshots/tizen/tv/@BUILD_ID@/repos/tv/@ARCH@/packages/ - Options: --save --ssl_verify=no - - - Name: tv-debug - Url: http://download.tizen.org/snapshots/tizen/tv/@BUILD_ID@/repos/tv/@ARCH@/debug/ - Options: --save --ssl_verify=no - - - Name: tv-x11_armv7l - Url: http://download.tizen.org/snapshots/tizen/tv/@BUILD_ID@/repos/arm-x11/packages/ - Options: --ssl_verify=no - - - 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 diff --git a/tv-targets.yaml b/tv-targets.yaml index 8bf7a41..86fa303 100644 --- a/tv-targets.yaml +++ b/tv-targets.yaml @@ -1,13 +1,9 @@ --- Targets: - - Name: arm-x11 + - Name: arm-wayland Images: - tv-boot-armv7l-odroidu3.yaml - tv-boot-armv7l-odroidxu3.yaml - - tv-x11-armv7l-odroidu3.yaml - - - Name: arm-wayland - Images: - tv-wayland-armv7l-odroidu3.yaml - Name: emulator32-wayland diff --git a/tv.yaml b/tv.yaml index 05e0b83..5f153a0 100644 --- a/tv.yaml +++ b/tv.yaml @@ -36,103 +36,6 @@ Boot-Odroidxu3: - TV Boot Odroid XU3 Repos: [] -X11: - Part: tv-mbr - UserGroups: "audio,video" - Groups: - - Generic Base - - TV Base - - Generic Console Tools - - Generic Packaging - - TV Packaging - - Generic Adaptation - - TV Adaptation - - Generic X11 - - TV X11 - - TV Middleware - - Generic Applications - - TV Applications X11 - - Generic Multimedia - - TV Multimedia - - Generic Desktop Applications - - Generic Crosswalk - - TV Crosswalk X11 - - TV Dali - - TV EFL X11 - - TV Enlightenment X11 - - TV Input Framework - - TV Web Framework - - TV Bluetooth - PostScripts: - - generic-base - - tv-base - - generic-console-tools - - generic-packaging - - tv-packaging - - generic-adaptation - - tv-adaptation - - generic-x11 - - tv-x11 - - tv-middleware - - generic-applications - - generic-multimedia - - generic-desktop-applications - - generic-crosswalk - - tv-crosswalk - - tv-mbr-3parts - - tv-bluetooth - Repos: [] - NoChrootScripts: - - buildname - -X11-64: - Part: tv-mbr - UserGroups: "audio,video" - Groups: - - Generic Base - - TV Base - - Generic Console Tools - - Generic Packaging - - TV Packaging - - Generic Adaptation - - TV Adaptation - - Generic X11 - - TV X11 - - TV Middleware - - Generic Applications - - TV Applications X11 - - Generic Multimedia - - TV Multimedia - - Generic Desktop Applications - - Generic Crosswalk - - TV Crosswalk X11 - - TV Dali - - TV EFL X11 - - TV Enlightenment X11 - - TV Input Framework - - TV Bluetooth - PostScripts: - - generic-base - - tv-base - - generic-console-tools - - generic-packaging - - tv-packaging - - generic-adaptation - - tv-adaptation - - generic-x11 - - tv-x11 - - tv-middleware - - generic-applications - - generic-multimedia - - generic-desktop-applications - - generic-crosswalk - - tv-crosswalk - - tv-mbr-3parts - - tv-bluetooth - Repos: [] - NoChrootScripts: - - buildname - Wayland: Part: tv-mbr UserGroups: "audio,video" @@ -147,15 +50,15 @@ Wayland: - TV Wayland - TV Middleware - Generic Applications - - TV Applications Wayland + - TV Applications - Generic Multimedia - TV Multimedia - Generic Desktop Applications - Generic Crosswalk - - TV Crosswalk Wayland + - TV Crosswalk - TV Dali - - TV EFL Wayland - - TV Enlightenment Wayland + - TV EFL + - TV Enlightenment - TV Input Framework - TV Web Framework - TV Wayland Temp @@ -181,15 +84,6 @@ Wayland: NoChrootScripts: - buildname -Wayland-64: - Part: tv-mbr - UserGroups: "audio,video" - Groups: - PostScripts: - Repos: [] - NoChrootScripts: - - buildname - Emulator-wayland: Part: tv-mbr UserGroups: "audio,video" @@ -204,15 +98,15 @@ Emulator-wayland: - TV Wayland - TV Middleware - Generic Applications - - TV Applications Wayland + - TV Applications - Generic Multimedia - TV Multimedia - Generic Desktop Applications - Generic Crosswalk - - TV Crosswalk Wayland + - TV Crosswalk - TV Dali - - TV EFL Wayland - - TV Enlightenment Wayland + - TV EFL + - TV Enlightenment - TV Input Framework - TV Web Framework - TV Wayland Temp -- 2.7.4