Remove profile build dependencies 90/87290/1
authorMyungJoo Ham <myungjoo.ham@samsung.com>
Wed, 7 Sep 2016 06:45:11 +0000 (15:45 +0900)
committerMyungJoo Ham <myungjoo.ham@samsung.com>
Wed, 7 Sep 2016 08:22:52 +0000 (08:22 +0000)
- vconf-internal-keys-devel package is common for all FIVE profiles (OBS build projects)
- vconf-internal-keys package includes all FIVE sets of configurations
- vconf-internal-keys-config-profile_{PROFILENAME} configure per profile at install time (or image creation time)

We need to add Jira-TRE issue so that each profile's KS file includes vconf-internal-keys-config-profile_{PROFILENAME} before actually SR-ing this commit.
(vconf-internal-keys-config-profile_{PROFILENAME} should be installed BEFORE vconf-internal-keys)

Removed RPMLint error/warnings as well

Change-Id: I65bf93af03040c4fd46aedb0b7e35d1536202a4a
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
packaging/vconf-internal-keys.spec

index 2152f1d..10287cc 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       vconf-internal-keys
 Summary:    Internal shared keys for vconf
-Version:    0.0.157
+Version:    0.0.158
 Release:    0
 Group:      Application Framework/Configuration
 License:    Apache-2.0
@@ -10,6 +10,7 @@ BuildRequires:  xsltproc
 BuildRequires: model-build-features
 Requires:  vconf
 Requires:  findutils
+Requires:  vconf-internal-keys-config
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -20,21 +21,103 @@ configuration internal shared keys
 %package devel
 Summary:    Vconf internal keys (devel)
 Group:      Application Framework/Configuration
-#Requires: %{name} = %{version}-%{release}
 Requires:  pkgconfig(capi-base-common)
 
 %description devel
 Vconf internal key header files (devel)
 
+%package config-profile_mobile
+Summary:    Configure vconf internal shared keys for mobile
+Group:      Application Framework/Configuration
+Provides:   vconf-internal-keys-config
+
+%description config-profile_mobile
+The vconf-internal-keys configurator for mobile.
+Vconf-internal-keys requires one of config-profile_* packages
+installed to execute vconf configuration for buxton2.
+
+%package config-profile_common
+Summary:    Configure vconf internal shared keys for common
+Group:      Application Framework/Configuration
+Provides:   vconf-internal-keys-config
+
+%description config-profile_common
+The vconf-internal-keys configurator for common
+Vconf-internal-keys requires one of config-profile_* packages
+installed to execute vconf configuration for buxton2.
+
+%package config-profile_tv
+Summary:    Configure vconf internal shared keys for tv
+Group:      Application Framework/Configuration
+Provides:   vconf-internal-keys-config
+
+%description config-profile_tv
+The vconf-internal-keys configurator for tv
+Vconf-internal-keys requires one of config-profile_* packages
+installed to execute vconf configuration for buxton2.
+
+%package config-profile_wearable
+Summary:    Configure vconf internal shared keys for wearable
+Group:      Application Framework/Configuration
+Provides:   vconf-internal-keys-config
+
+%description config-profile_wearable
+The vconf-internal-keys configurator for wearable
+Vconf-internal-keys requires one of config-profile_* packages
+installed to execute vconf configuration for buxton2.
+
+%package config-profile_ivi
+Summary:    Configure vconf internal shared keys for ivi
+Group:      Application Framework/Configuration
+Provides:   vconf-internal-keys-config
+
+%description config-profile_ivi
+The vconf-internal-keys configurator for ivi
+Vconf-internal-keys requires one of config-profile_* packages
+installed to execute vconf configuration for buxton2.
+
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
 
+mkdir -p scripts_mobile
+mkdir -p scripts_common
+mkdir -p scripts_tv
+mkdir -p scripts_wearable
+mkdir -p scripts_ivi
+
 %ifarch %arm aarch64
-make model=%{profile}
+make model=mobile
+cp scripts/*.sh scripts_mobile/
+make clean
+make model=tv
+cp scripts/*.sh scripts_tv/
+make clean
+make model=wearable
+cp scripts/*.sh scripts_wearable/
+make clean
+make model=ivi
+cp scripts/*.sh scripts_ivi/
+make clean
+make model=common
+cp scripts/*.sh scripts_common/
+
 %else
-make model=%{profile}/emulator
+make model=mobile/emulator
+cp scripts/*.sh scripts_mobile/
+make clean
+make model=tv/emulator
+cp scripts/*.sh scripts_tv/
+make clean
+make model=wearable/emulator
+cp scripts/*.sh scripts_wearable/
+make clean
+make model=ivi/emulator
+cp scripts/*.sh scripts_ivi/
+make clean
+make model=common/emulator
+cp scripts/*.sh scripts_common/
 %endif
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
@@ -47,7 +130,16 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}
 mkdir -p %{buildroot}/opt/usr
-install -m 755 scripts/*.sh %{buildroot}/opt/usr
+mkdir -p %{buildroot}/opt/usr/vconf-internal-keys_scripts_mobile
+mkdir -p %{buildroot}/opt/usr/vconf-internal-keys_scripts_common
+mkdir -p %{buildroot}/opt/usr/vconf-internal-keys_scripts_tv
+mkdir -p %{buildroot}/opt/usr/vconf-internal-keys_scripts_wearable
+mkdir -p %{buildroot}/opt/usr/vconf-internal-keys_scripts_ivi
+install -m 755 scripts_mobile/*.sh %{buildroot}/opt/usr/vconf-internal-keys_scripts_mobile
+install -m 755 scripts_tv/*.sh %{buildroot}/opt/usr/vconf-internal-keys_scripts_tv
+install -m 755 scripts_common/*.sh %{buildroot}/opt/usr/vconf-internal-keys_scripts_common
+install -m 755 scripts_wearable/*.sh %{buildroot}/opt/usr/vconf-internal-keys_scripts_wearable
+install -m 755 scripts_ivi/*.sh %{buildroot}/opt/usr/vconf-internal-keys_scripts_ivi
 
 mkdir -p %{buildroot}/usr/include/vconf
 install -m 644 include/*.h %{buildroot}/usr/include/vconf
@@ -80,14 +172,45 @@ done
 
 %postun -p /sbin/ldconfig
 
+%post config-profile_mobile
+cp /opt/usr/vconf-internal-keys_scripts_mobile/*.sh /opt/usr/
+rm -rf /opt/usr/vconf-internal-keys_scripts_mobile
+
+%post config-profile_common
+cp /opt/usr/vconf-internal-keys_scripts_common/*.sh /opt/usr/
+rm -rf /opt/usr/vconf-internal-keys_scripts_common
+
+%post config-profile_tv
+cp /opt/usr/vconf-internal-keys_scripts_tv/*.sh /opt/usr/
+rm -rf /opt/usr/vconf-internal-keys_scripts_tv
+
+%post config-profile_wearable
+cp /opt/usr/vconf-internal-keys_scripts_wearable/*.sh /opt/usr/
+rm -rf /opt/usr/vconf-internal-keys_scripts_wearable
+
+%post config-profile_ivi
+cp /opt/usr/vconf-internal-keys_scripts_ivi/*.sh /opt/usr/
+rm -rf /opt/usr/vconf-internal-keys_scripts_ivi
+
 %files
-#%{_libdir}/lib*.so.*
-/opt/usr/*.sh
 %license LICENSE
 
 %files devel
 %defattr(-,root,root,-)
 /usr/include/vconf/*.h
 %{_libdir}/pkgconfig/*.pc
-#%{_libdir}/lib*.so
 
+%files config-profile_mobile
+/opt/usr/vconf-internal-keys_scripts_mobile/*.sh
+
+%files config-profile_common
+/opt/usr/vconf-internal-keys_scripts_common/*.sh
+
+%files config-profile_wearable
+/opt/usr/vconf-internal-keys_scripts_wearable/*.sh
+
+%files config-profile_tv
+/opt/usr/vconf-internal-keys_scripts_tv/*.sh
+
+%files config-profile_ivi
+/opt/usr/vconf-internal-keys_scripts_ivi/*.sh