Remove unneeded separate hal-api-common file

hal-api-common file doesn't contain the any sub-domain.
It means that it is not necessary to make the separate domain-halapis-common.inc.
So that remove the separate hal-api-common file and then
specify the hal-api-common information into domain-halapis.inc directly.

Change-Id: Ie51061e2bc4f8144cc12d4fe3e367fa404552f8e
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 6bea2d2d84666bd84d2bf785f47644f25adeef49..85512099ef33972d0e9657bed81759871cb27382 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -74,7 +74,6 @@ Source1417:   domain-csapis-machinelearning.inc
 %endif
 
 Source1500:    domain-halapis.inc
-Source1501:    domain-halapis-common.inc
 
 Source2010:    epicfeature-development.inc
 Source2020:    epicfeature-application.inc
@@ -395,7 +394,6 @@ python ./rule_checker.py
 %endif
 
 %{include_if_mainbuild %{SOURCE1500}}
-%{include_if_mainbuild %{SOURCE1501}}
 ############## EPIC FEATURES ######################
 
 # Dev tools

diff --git a/packaging/domain-halapis-common.inc b/packaging/domain-halapis-common.inc
deleted file mode 100644 (file)
index 5ab2569..0000000
--- a/packaging/domain-halapis-common.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: TBD: This is temporary block for TDC Demo. You may proceed with this later anyway.
-# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
-
-####################
-## Common HAL API ##
-####################
-%package sub1-domain_HALAPI-Common
-Summary: Common HAL API
-Requires: hal-api-common
-
-%description sub1-domain_HALAPI-Common
-Common HAL API supports the helper functions for all HAL API packages.
-All HAL API packages must need the same operation to handle the shared library
-of HAL backend. So that common HAL API provides the helper functions in order
-to remove the duplicate code and reduce the code fragmentation. By using the
-consistent coding style on HAL API packages, it improves the readability
-and makes it easy understanding.
-%files sub1-domain_HALAPI-Common

diff --git a/packaging/domain-halapis.inc b/packaging/domain-halapis.inc
index 245d618b919dbdefe88f188033e5e9400c3a6138..be1445cc9131782f533c38aa5c5e90fb44563fea 100644 (file)
--- a/packaging/domain-halapis.inc
+++ b/packaging/domain-halapis.inc
@@ -12,3 +12,19 @@ HAL API packages provide their own HAL API interface such as tbm, audio, locatio
 bluetooth, sensor and so on. In order to use Tizen on new h/w device, please implment
 the HAL backend packages according to HAL API interface provided by HAL API packages.
 %files root-domain_HALAPI
+
+######################
+### Common HAL API ###
+######################
+%package sub1-domain_HALAPI-Common
+Summary: Common HAL API
+Requires: hal-api-common
+
+%description sub1-domain_HALAPI-Common
+Common HAL API supports the helper functions for all HAL API packages.
+All HAL API packages must need the same operation to handle the shared library
+of HAL backend. So that common HAL API provides the helper functions in order
+to remove the duplicate code and reduce the code fragmentation. By using the
+consistent coding style on HAL API packages, it improves the readability
+and makes it easy understanding.
+%files sub1-domain_HALAPI-Common