revise packaging for unified build

Change-Id: I3e563a416116c1405b4ebd178fb79ab61b806fd7

diff --git a/init-buxton-config.sh b/init-buxton-config.sh
deleted file mode 100755 (executable)
index 1772ea4..0000000
--- a/init-buxton-config.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# model conf
-buxtonctl --direct create-group ro-base model_conf
-buxtonctl --direct set-label ro-base model_conf deviced
-
-# model name
-buxtonctl --direct set-string ro-base model_conf model_name "b2"
-buxtonctl --direct set-label ro-base model_conf model_name deviced
-

diff --git a/packaging/model-config-tw1.spec b/packaging/model-config-tw1.spec
index f4867f02622767aae140e8902e0600a045645694..d200cb86fed1c64ebe6d1a3e5b867ef16b2b0f13 100644 (file)
--- a/packaging/model-config-tw1.spec
+++ b/packaging/model-config-tw1.spec
@@ -2,12 +2,13 @@
 
 Name:          model-config-tw1
 Summary:       A Model configuration
-Version:       0.0.1
+Version:       0.0.4
 Release:       0
 Group:         System/Configuration
 License:       Apache-2.0
 BuildArch:     noarch
 Source0:       %{name}-%{version}.tar.gz
+Provides:      model-config
 
 %description
 Model configuration data package
@@ -20,19 +21,12 @@ Model configuration data package
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/config
-cp -f model-config.xml %{buildroot}%{_sysconfdir}/config/model-config.xml
+cp -f model-config.xml %{buildroot}%{_sysconfdir}/config/%{name}.xml
 
-mkdir -p %{buildroot}%{_sharedstatedir}/buxton
-mkdir -p %{buildroot}%{_libdir}/buxton
-cp -f init-buxton-config.sh %{buildroot}%{_libdir}/buxton/init-buxton-config.sh
-
-%posttrans
-%{_libdir}/buxton/init-buxton-config.sh
-rm -rf %{_libdir}/buxton/init-buxton-config.sh
+%post
+ln -sf %{name}.xml %{_sysconfdir}/config/model-config.xml
 
 %files
-%dir %{_sharedstatedir}/buxton
-%config %{_sysconfdir}/config/model-config.xml
-%{_libdir}/buxton/init-buxton-config.sh
 %manifest model-config.manifest
+%config %{_sysconfdir}/config/%{name}.xml
 %license LICENSE.Apache-2.0