Finalize tizen-build.conf data in a .post script

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

diff --git a/scripts/buildname.nochroot b/scripts/buildname.nochroot
index 5ed5601..b248084 100644 (file)
--- a/scripts/buildname.nochroot
+++ b/scripts/buildname.nochroot
@@ -3,16 +3,4 @@ if [ -n "$IMG_NAME" ]; then
        echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/tizen-release
        echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/os-release
        echo "$IMG_NAME @BUILD_ID@" >>$INSTALL_ROOT/etc/tizen-snapshot
-
-
-       build_ts=$(date -u +%s)
-       build_date=$(date -u --date @$build_ts +%Y%m%d_%H%M%S)
-       build_time=$(date -u --date @$build_ts +%H:%M:%S)
-
-       sed -ri \
-               -e 's|@BUILD_ID[@]|@BUILD_ID@|g' \
-               -e "s|@BUILD_DATE[@]|$build_date|g" \
-               -e "s|@BUILD_TIME[@]|$build_time|g" \
-               -e "s|@BUILD_TS[@]|$build_ts|g" \
-               $INSTALL_ROOT/etc/tizen-build.conf
 fi

diff --git a/scripts/generic-base.post b/scripts/generic-base.post
index 59472b4..bfe460d 100644 (file)
--- a/scripts/generic-base.post
+++ b/scripts/generic-base.post
@@ -1,6 +1,17 @@
 #!/bin/sh
 echo "#################### generic-base.post ####################"
 
+build_ts=$(date -u +%s)
+build_date=$(date -u --date @$build_ts +%Y%m%d_%H%M%S)
+build_time=$(date -u --date @$build_ts +%H:%M:%S)
+
+sed -ri \
+       -e 's|@BUILD_ID[@]|@BUILD_ID@|g' \
+       -e "s|@BUILD_DATE[@]|$build_date|g" \
+       -e "s|@BUILD_TIME[@]|$build_time|g" \
+       -e "s|@BUILD_TS[@]|$build_ts|g" \
+       /etc/tizen-build.conf
+
 # setup systemd default target for user session
 cat <<'EOF' >>/lib/systemd/user/default.target
 [Unit]
@@ -60,3 +71,6 @@ function generic_base_fix_user_homedir() {
 # fix TC-320 for SDK
 . /etc/tizen-build.conf
 [ "${TZ_BUILD_WITH_EMULATOR}" == "1" ] && generic_base_fix_user_homedir developer
+
+# Add info.ini for system-info CAPI (TC-2047)
+/usr/bin/make_info_file.sh