Fix info.ini generator for Tizen 3.0

Bug-Tizen: TC-2047

Change-Id: Ie3a3d59818902c8ec74922e0fd875e4338cace55
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/packaging/capi-system-info.spec b/packaging/capi-system-info.spec
index 7341a70..b7f26fe 100644 (file)
--- a/packaging/capi-system-info.spec
+++ b/packaging/capi-system-info.spec
@@ -50,8 +50,8 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
 %install
 %make_install
-mkdir -p %{buildroot}/etc
-cp -f script/make_info_file.sh %{buildroot}%{_sysconfdir}/make_info_file.sh
+mkdir -p %{buildroot}%{_bindir}
+cp -f script/make_info_file.sh %{buildroot}%{_bindir}/make_info_file.sh
 
 %post -p /sbin/ldconfig
 
@@ -61,7 +61,7 @@ cp -f script/make_info_file.sh %{buildroot}%{_sysconfdir}/make_info_file.sh
 %manifest %{name}.manifest
 %license LICENSE.APLv2
 %{_libdir}/libcapi-system-info.so.*
-%attr(0744,root,-) %{_sysconfdir}/make_info_file.sh
+%attr(0744,root,-) %{_bindir}/make_info_file.sh
 
 %files devel
 %manifest %{name}.manifest

diff --git a/script/make_info_file.sh b/script/make_info_file.sh
index 11d1382..44ea27f 100644 (file)
--- a/script/make_info_file.sh
+++ b/script/make_info_file.sh
@@ -1,20 +1,14 @@
-#! /bin/bash
+#!/bin/sh
 # make_info_file.sh : make /etc/info.ini
 #
 
-if [ $# != 2 ]; then
-        echo "Usage : make_info_file.sh [model] [build] "
-        exit
-fi
+. /etc/tizen-build.conf
 
-MODEL=$1
-BUILD=$2
-
-cat >/etc/info.ini <<EOF
+cat <<EOF > /etc/info.ini
 [Version]
-Model=$MODEL;
-Build=$BUILD;
+Model=$TZ_BUILD_RELEASE_NAME;
+Build=$TZ_BUILD_ID;
 [Build]
-Date=`date +%Y.%m.%d`;
-Time=`date +%H:%M:%S`;
+Date=$TZ_BUILD_DATE;
+Time=$TZ_BUILD_TIME;
 EOF