diff options
| author | wchang kim <wchang.kim@samsung.com> | 2017-09-13 11:28:33 +0900 |
|---|---|---|
| committer | wchang kim <wchang.kim@samsung.com> | 2017-09-13 11:28:33 +0900 |
| commit | 1a2480cf18e5e8cafe205c500b122189dc03279b (patch) | |
| tree | 26ae0a94798d056036f3040adbe4cb8c6453d867 | |
| parent | 0057df0e4d5757a11222d2bc5b2903f22895b869 (diff) | |
| parent | f52c6d28e18cfaa83072c95a79c04d02fd97c372 (diff) | |
| download | building-blocks-submit/tizen_4.0/20170913.023543.tar.gz building-blocks-submit/tizen_4.0/20170913.023543.tar.bz2 building-blocks-submit/tizen_4.0/20170913.023543.zip | |
Merge branch 'tizen' into tizen_4.0submit/tizen_4.0/20170913.023543accepted/tizen/4.0/unified/20170913.153708
Conflicts:
packaging/platform-preset-boards-rpi3.inc
Change-Id: Ic25252d5874ba4fee3415fa0d02b20502db41398
| -rw-r--r-- | packaging/building-blocks.spec | 36 | ||||
| -rw-r--r-- | packaging/platform-preset-boards-rpi3.inc | 2 |
2 files changed, 20 insertions, 18 deletions
diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec index 1f924c6..5f76531 100644 --- a/packaging/building-blocks.spec +++ b/packaging/building-blocks.spec @@ -13,23 +13,24 @@ Group: Meta Source0: %{name}-%{version}.tar.gz # Domains are rearranged by API sets according to developer.tizen.org -Source1200: domain-apis-account.inc -Source1201: domain-apis-appfw.inc -Source1202: domain-apis-base.inc -Source1203: domain-apis-content.inc -Source1204: domain-apis-context.inc -Source1205: domain-apis-location.inc -Source1206: domain-apis-maps.inc -Source1207: domain-apis-messaging.inc -Source1208: domain-apis-multimedia.inc -Source1209: domain-apis-network.inc -Source1210: domain-apis-security.inc -Source1211: domain-apis-social.inc -Source1212: domain-apis-system.inc -Source1213: domain-apis-telephony.inc -Source1214: domain-apis-ui.inc -Source1215: domain-apis-uix.inc -Source1216: domain-apis-web.inc +Source1200: domain-apis.inc +Source1201: domain-apis-account.inc +Source1202: domain-apis-appfw.inc +Source1203: domain-apis-base.inc +Source1204: domain-apis-content.inc +Source1205: domain-apis-context.inc +Source1206: domain-apis-location.inc +Source1207: domain-apis-maps.inc +Source1208: domain-apis-messaging.inc +Source1209: domain-apis-multimedia.inc +Source1210: domain-apis-network.inc +Source1211: domain-apis-security.inc +Source1212: domain-apis-social.inc +Source1213: domain-apis-system.inc +Source1214: domain-apis-telephony.inc +Source1215: domain-apis-ui.inc +Source1216: domain-apis-uix.inc +Source1217: domain-apis-web.inc Source2010: epicfeature-development.inc Source2020: epicfeature-platform.inc @@ -293,6 +294,7 @@ python ./rule_checker.py %{include_if_mainbuild %{SOURCE1214}} %{include_if_mainbuild %{SOURCE1215}} %{include_if_mainbuild %{SOURCE1216}} +%{include_if_mainbuild %{SOURCE1217}} #%{include_if_mainbuild %{SOURCE1210}} #%{include_if_mainbuild %{SOURCE1220}} diff --git a/packaging/platform-preset-boards-rpi3.inc b/packaging/platform-preset-boards-rpi3.inc index c10dbfb..5b97df4 100644 --- a/packaging/platform-preset-boards-rpi3.inc +++ b/packaging/platform-preset-boards-rpi3.inc @@ -217,7 +217,7 @@ Packages of Bluetooth HAL and Feature for RPI3. ### RPI3-BLE ### %package sub2-Preset_boards-RPI3-BLE -Summary: BLE (Not Implemented) +Summary: BLE Requires: %{name}-sub2-domain_API-Network-Bluetooth_LE Requires: bluetooth-firmware-bcm-rpi3 Requires: bluetooth-frwk-profile_common |