From 409fd40e36d6abba32a963560b3f296c30775cd0 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Wed, 5 Apr 2017 13:25:19 +0900 Subject: [PATCH] Preset: Rule Compliance Change-Id: Ibcd3f3714d23700a64f8439d7eef9faebc8e127b Signed-off-by: MyungJoo Ham --- packaging/building-blocks.spec | 15 +++--- packaging/platform-preset-common.inc | 16 +++---- packaging/platform-preset-home_appliance.inc | 18 ++++---- packaging/platform-preset-iot.inc | 22 ++++----- packaging/platform-preset-ivi.inc | 22 ++++----- packaging/platform-preset-mobile.inc | 68 ++++++++++++++-------------- packaging/platform-preset-tv.inc | 22 ++++----- packaging/platform-preset-wearable.inc | 22 ++++----- 8 files changed, 102 insertions(+), 103 deletions(-) diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec index 64f73e7..a6b35d0 100644 --- a/packaging/building-blocks.spec +++ b/packaging/building-blocks.spec @@ -28,7 +28,6 @@ Source2001: epicfeature-headless.inc Source2010: epicfeature-development.inc Source2020: epicfeature-platform.inc -Source3000: platform-preset.inc Source3100: platform-preset-mobile.inc Source3200: platform-preset-wearable.inc Source3300: platform-preset-tv.inc @@ -96,13 +95,13 @@ and to most domains. %package category-presets Summary: Tizen Presets -Suggests: %{name}-root-preset-mobile -Suggests: %{name}-root-preset-tv -Suggests: %{name}-root-preset-wearable -Suggests: %{name}-root-preset-ivi -Suggests: %{name}-root-preset-iot -Suggests: %{name}-root-preset-common -Suggests: %{name}-root-preset-home_appliance +Suggests: %{name}-root-preset_mobile +Suggests: %{name}-root-preset_tv +Suggests: %{name}-root-preset_wearable +Suggests: %{name}-root-preset_ivi +Suggests: %{name}-root-preset_iot +Suggests: %{name}-root-preset_common +Suggests: %{name}-root-preset_home_appliance %description category-presets This meta pacakge lists all Tizen blocks (meta packages) designating Tizen platform presets, HAL/device-support presets, and diff --git a/packaging/platform-preset-common.inc b/packaging/platform-preset-common.inc index ccf93ab..77a61cf 100644 --- a/packaging/platform-preset-common.inc +++ b/packaging/platform-preset-common.inc @@ -2,13 +2,13 @@ # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. -%package root-preset-common +%package root-preset_common Summary: Common Profile Presets -Conflicts: %{name}-root-preset-mobile -Conflicts: %{name}-root-preset-tv -Conflicts: %{name}-root-preset-wearable -Conflicts: %{name}-root-preset-iot -Conflicts: %{name}-root-preset-ivi -%description root-preset-common +Conflicts: %{name}-root-preset_mobile +Conflicts: %{name}-root-preset_tv +Conflicts: %{name}-root-preset_wearable +Conflicts: %{name}-root-preset_iot +Conflicts: %{name}-root-preset_ivi +%description root-preset_common Tizen Platform Presets for "Common Profile" -%files root-preset-common +%files root-preset_common diff --git a/packaging/platform-preset-home_appliance.inc b/packaging/platform-preset-home_appliance.inc index 956f7d6..20082c5 100644 --- a/packaging/platform-preset-home_appliance.inc +++ b/packaging/platform-preset-home_appliance.inc @@ -2,14 +2,14 @@ # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. -%package root-preset-home_appliance +%package root-preset_home_appliance Summary: Common Profile Presets -Conflicts: %{name}-root-preset-mobile -Conflicts: %{name}-root-preset-tv -Conflicts: %{name}-root-preset-wearable -Conflicts: %{name}-root-preset-iot -Conflicts: %{name}-root-preset-ivi -Conflicts: %{name}-root-preset-common -%description root-preset-home_appliance +Conflicts: %{name}-root-preset_mobile +Conflicts: %{name}-root-preset_tv +Conflicts: %{name}-root-preset_wearable +Conflicts: %{name}-root-preset_iot +Conflicts: %{name}-root-preset_ivi +Conflicts: %{name}-root-preset_common +%description root-preset_home_appliance Tizen Platform Presets for "Home Appliances" -%files root-preset-home_appliance +%files root-preset_home_appliance diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc index a1bc1ac..0fbfc10 100644 --- a/packaging/platform-preset-iot.inc +++ b/packaging/platform-preset-iot.inc @@ -1,23 +1,23 @@ # Maintainer: Tizen IoT PM # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. -%package root-preset-iot +%package root-preset_iot Summary: IOT Device Presets -Conflicts: %{name}-root-preset-mobile -Conflicts: %{name}-root-preset-tv -Conflicts: %{name}-root-preset-wearable -Conflicts: %{name}-root-preset-ivi -Suggests: %{name}-sub1-preset-iot-headless_minimal -%description root-preset-iot +Conflicts: %{name}-root-preset_mobile +Conflicts: %{name}-root-preset_tv +Conflicts: %{name}-root-preset_wearable +Conflicts: %{name}-root-preset_ivi +Suggests: %{name}-sub1-preset_iot-headless_minimal +%description root-preset_iot Tizen IoT Device Presets -%files root-preset-iot +%files root-preset_iot -%package sub1-preset-iot-headless_minimal +%package sub1-preset_iot-headless_minimal Summary: IoT Headless Minimal Preset Requires: %{name}-root-feature_Headless -%description sub1-preset-iot-headless_minimal +%description sub1-preset_iot-headless_minimal Tizen IoT Headless/Minimal Preset -%files sub1-preset-iot-headless_minimal +%files sub1-preset_iot-headless_minimal diff --git a/packaging/platform-preset-ivi.inc b/packaging/platform-preset-ivi.inc index d84749e..74dad94 100644 --- a/packaging/platform-preset-ivi.inc +++ b/packaging/platform-preset-ivi.inc @@ -1,22 +1,22 @@ # Maintainer: Tizen IVI PM # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. -%package root-preset-ivi +%package root-preset_ivi Summary: IVI Profile Presets -Conflicts: %{name}-root-preset-mobile -Conflicts: %{name}-root-preset-tv -Conflicts: %{name}-root-preset-wearable -Conflicts: %{name}-root-preset-iot -Suggests: %{name}-sub1-preset-ivi-proto -%description root-preset-ivi +Conflicts: %{name}-root-preset_mobile +Conflicts: %{name}-root-preset_tv +Conflicts: %{name}-root-preset_wearable +Conflicts: %{name}-root-preset_iot +Suggests: %{name}-sub1-preset_ivi-proto +%description root-preset_ivi Tizen IVI Platform Presets -%files root-preset-ivi +%files root-preset_ivi -%package sub1-preset-ivi-proto +%package sub1-preset_ivi-proto Summary: IVI OdroidXU3 Prototype Preset # image-configuration must have this file supplied. %list_with_require %{_datadir}/image-configurations/ivi-target-odroidxu3.ks -%description sub1-preset-ivi-proto +%description sub1-preset_ivi-proto Tizen IVI Prototype Preset -%files sub1-preset-ivi-proto +%files sub1-preset_ivi-proto diff --git a/packaging/platform-preset-mobile.inc b/packaging/platform-preset-mobile.inc index c919aff..e2e4d0d 100644 --- a/packaging/platform-preset-mobile.inc +++ b/packaging/platform-preset-mobile.inc @@ -1,29 +1,29 @@ # Maintainer: Tizen Mobile PM # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. -%package root-preset-mobile +%package root-preset_mobile Summary: Mobile Profile Presets -Conflicts: %{name}-root-preset-tv -Conflicts: %{name}-root-preset-wearable -Conflicts: %{name}-root-preset-ivi -Conflicts: %{name}-root-preset-iot -Suggests: %{name}-sub1-preset-mobile-tm1 -Suggests: %{name}-sub1-preset-mobile-tm2_aarch64 -Suggests: %{name}-sub1-preset-mobile-tm2_armv7l -Suggests: %{name}-sub1-preset-mobile-minimal -%description root-preset-mobile +Conflicts: %{name}-root-preset_tv +Conflicts: %{name}-root-preset_wearable +Conflicts: %{name}-root-preset_ivi +Conflicts: %{name}-root-preset_iot +Suggests: %{name}-sub1-preset_mobile-tm1 +Suggests: %{name}-sub1-preset_mobile-tm2_aarch64 +Suggests: %{name}-sub1-preset_mobile-tm2_armv7l +Suggests: %{name}-sub1-preset_mobile-minimal +%description root-preset_mobile Tizen Mobile Platform Presets -%files root-preset-mobile +%files root-preset_mobile -%package sub1-preset-mobile-tm1 +%package sub1-preset_mobile-tm1 Summary: Mobile-TM1 Preset -Conflicts: %{name}-sub1-preset-mobile-tm2_aarch64 -Conflicts: %{name}-sub1-preset-mobile-tm2_armv7l -Conflicts: %{name}-sub1-preset-mobile-minimal +Conflicts: %{name}-sub1-preset_mobile-tm2_aarch64 +Conflicts: %{name}-sub1-preset_mobile-tm2_armv7l +Conflicts: %{name}-sub1-preset_mobile-minimal # image-configuration must have this file supplied. %list_with_require %{_datadir}/image-configurations/mobile-wayland-armv7l-tm1.ks -%description sub1-preset-mobile-tm1 +%description sub1-preset_mobile-tm1 Tizen Mobile TM1 Preset, which is using armv7l. You may use this preset for other architectures; however, please note that the TM1 model itself is for armv7l only. @@ -31,40 +31,40 @@ This block is allowed for other architectures only to let other arch devices start with TM1 packages. You may need mobile + tm1 MIC post script as well. (TIC RECIPE for POST is not READY YET) -%files sub1-preset-mobile-tm1 +%files sub1-preset_mobile-tm1 -%package sub1-preset-mobile-tm2_aarch64 +%package sub1-preset_mobile-tm2_aarch64 Summary: Mobile-TM2 Preset -Conflicts: %{name}-sub1-preset-mobile-tm1 -Conflicts: %{name}-sub1-preset-mobile-tm2_armv7l -Conflicts: %{name}-sub1-preset-mobile-minimal +Conflicts: %{name}-sub1-preset_mobile-tm1 +Conflicts: %{name}-sub1-preset_mobile-tm2_armv7l +Conflicts: %{name}-sub1-preset_mobile-minimal # image-configuration must have this file supplied. %list_with_require %{_datadir}/image-configurations/mobile-wayland-arm64-tm2.ks -%description sub1-preset-mobile-tm2_aarch64 +%description sub1-preset_mobile-tm2_aarch64 Tizen Mobile TM2 Preset. This is for aarch64 architecture only. For architectural/post-script note, please refer to tm1 twin. -%files sub1-preset-mobile-tm2_aarch64 +%files sub1-preset_mobile-tm2_aarch64 -%package sub1-preset-mobile-tm2_armv7l +%package sub1-preset_mobile-tm2_armv7l Summary: Mobile-TM2 Preset -Conflicts: %{name}-sub1-preset-mobile-tm1 -Conflicts: %{name}-sub1-preset-mobile-tm2_aarch64 -Conflicts: %{name}-sub1-preset-mobile-minimal +Conflicts: %{name}-sub1-preset_mobile-tm1 +Conflicts: %{name}-sub1-preset_mobile-tm2_aarch64 +Conflicts: %{name}-sub1-preset_mobile-minimal # image-configuration must have this file supplied. %list_with_require %{_datadir}/image-configurations/mobile-wayland-armv7l-tm2.ks -%description sub1-preset-mobile-tm2_armv7l +%description sub1-preset_mobile-tm2_armv7l Tizen Mobile TM2 Preset. This is for armv7l architecture only. Although TM2 has 64bit processor, we may use 32bit userspace binaries for it. For architectural/post-script note, please refer to tm1 twin. -%files sub1-preset-mobile-tm2_armv7l +%files sub1-preset_mobile-tm2_armv7l -%package sub1-preset-mobile-minimal +%package sub1-preset_mobile-minimal Summary: Mobile Minimal Preset -Conflicts: %{name}-sub1-preset-mobile-tm1 -Conflicts: %{name}-sub1-preset-mobile-tm2 -%description sub1-preset-mobile-minimal +Conflicts: %{name}-sub1-preset_mobile-tm1 +Conflicts: %{name}-sub1-preset_mobile-tm2 +%description sub1-preset_mobile-minimal Tizen Mobile Minimal Platform Preset Mobile-PM: fill in minimal API sets for mobile profile. -%files sub1-preset-mobile-minimal +%files sub1-preset_mobile-minimal diff --git a/packaging/platform-preset-tv.inc b/packaging/platform-preset-tv.inc index 1e0f5ce..41ec22d 100644 --- a/packaging/platform-preset-tv.inc +++ b/packaging/platform-preset-tv.inc @@ -1,23 +1,23 @@ # Maintainer: Tizen TV PM # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. -%package root-preset-tv +%package root-preset_tv Summary: TV Profile Presets -Conflicts: %{name}-root-preset-mobile -Conflicts: %{name}-root-preset-wearable -Conflicts: %{name}-root-preset-ivi -Conflicts: %{name}-root-preset-iot -Suggests: %{name}-sub1-preset-tv-odroid -%description root-preset-tv +Conflicts: %{name}-root-preset_mobile +Conflicts: %{name}-root-preset_wearable +Conflicts: %{name}-root-preset_ivi +Conflicts: %{name}-root-preset_iot +Suggests: %{name}-sub1-preset_tv-odroid +%description root-preset_tv Tizen TV Platform Presets -%files root-preset-tv +%files root-preset_tv -%package sub1-preset-tv-odroid +%package sub1-preset_tv-odroid Summary: TV-Odroid Preset # image-configuration must have this file supplied. %list_with_require %{_datadir}/image-configurations/tv-wayland-armv7l-odroidu3.ks -%description sub1-preset-tv-odroid +%description sub1-preset_tv-odroid Tizen TV Odroid Preset -%files sub1-preset-tv-odroid +%files sub1-preset_tv-odroid diff --git a/packaging/platform-preset-wearable.inc b/packaging/platform-preset-wearable.inc index b9a3588..2e48a26 100644 --- a/packaging/platform-preset-wearable.inc +++ b/packaging/platform-preset-wearable.inc @@ -1,23 +1,23 @@ # Maintainer: Tizen Wearable PM # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. -%package root-preset-wearable +%package root-preset_wearable Summary: Wearable Profile Presets -Conflicts: %{name}-root-preset-mobile -Conflicts: %{name}-root-preset-tv -Conflicts: %{name}-root-preset-ivi -Conflicts: %{name}-root-preset-iot -Suggests: %{name}-sub1-preset-wearable-tw2 -%description root-preset-wearable +Conflicts: %{name}-root-preset_mobile +Conflicts: %{name}-root-preset_tv +Conflicts: %{name}-root-preset_ivi +Conflicts: %{name}-root-preset_iot +Suggests: %{name}-sub1-preset_wearable-tw2 +%description root-preset_wearable Tizen Wearable Platform Presets -%files root-preset-wearable +%files root-preset_wearable -%package sub1-preset-wearable-tw2 +%package sub1-preset_wearable-tw2 Summary: Wearable-TW2 Preset # image-configuration must have this file supplied. %list_with_require %{_datadir}/image-configurations/wearable-wayland-armv7l-tw2.ks -%description sub1-preset-wearable-tw2 +%description sub1-preset_wearable-tw2 Tizen Wearable TW1 (Gear 2) Preset -%files sub1-preset-wearable-tw2 +%files sub1-preset_wearable-tw2 -- 2.7.4