[Feature][T8TSK-239]add core num in /proc/version, fix the commit id
Change-Id: I4779d2b4930d04544ea4e3a0730369806508ec1f
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf b/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
index 05b1222..af12815 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
+++ b/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
@@ -237,4 +237,5 @@
#xf.li@20230207 modiry for version number start
LYNQ_CONFIG_VERSION = "T800_UNSET_v02.MP1_MR3.02b06.00.01"
LYNQ_CONFIG_SW_VERSION = "T800_UNSET_v02.MP1_MR1.01b06.00"
+LYNQ_CONFIG_COMMITID = "1f9f15454"
#xf.li@20230207 modiry for version number end
diff --git a/meta-sdk/meta/poky/meta/classes/kernel.bbclass b/meta-sdk/meta/poky/meta/classes/kernel.bbclass
index e9fd5cd..83ddf1d 100644
--- a/meta-sdk/meta/poky/meta/classes/kernel.bbclass
+++ b/meta-sdk/meta/poky/meta/classes/kernel.bbclass
@@ -161,6 +161,8 @@
#export KBUILD_BUILD_USER ?= "oe-user"
#export KBUILD_BUILD_HOST ?= "oe-host"
export LYNQ_VERSION ?= "${LYNQ_CONFIG_VERSION}"
+export COMMITID ?= "${LYNQ_CONFIG_COMMITID}"
+export CORE_NUM ?= "${CORE_NUM}"
#LXF 2022.10.12 modify for T8TSK-91 in sdk end
KERNEL_RELEASE ?= "${KERNEL_VERSION}"
diff --git a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
index c86db99..4cbe0d8 100755
--- a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
+++ b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
@@ -213,6 +213,7 @@
#xf.li@20230207 modiry for version number start
LYNQ_CONFIG_VERSION = "T800_UNSET_v02.MP1_MR3.02b06.00.01"
LYNQ_CONFIG_SW_VERSION = "T800_UNSET_v02.MP1_MR1.01b06.00"
+LYNQ_CONFIG_COMMITID = "1f9f15454"
#xf.li@20230207 modiry for version number end
#liu hong add for gsw remove connman 20230425 start
diff --git a/meta/poky/meta/classes/kernel.bbclass b/meta/poky/meta/classes/kernel.bbclass
index f85849f..235be45 100644
--- a/meta/poky/meta/classes/kernel.bbclass
+++ b/meta/poky/meta/classes/kernel.bbclass
@@ -161,6 +161,8 @@
#export KBUILD_BUILD_USER ?= "oe-user"
#export KBUILD_BUILD_HOST ?= "oe-host"
export LYNQ_VERSION ?= "${LYNQ_CONFIG_VERSION}"
+export COMMITID ?= "${LYNQ_CONFIG_COMMITID}"
+export CORE_NUM ?= "${CORE_NUM}"
#LXF 2022.10.10 modify for T8TSK-91 end
KERNEL_RELEASE ?= "${KERNEL_VERSION}"
diff --git a/src/kernel/linux/v4.19/scripts/mkcompile_h b/src/kernel/linux/v4.19/scripts/mkcompile_h
index 4aaaa32..69887f6 100755
--- a/src/kernel/linux/v4.19/scripts/mkcompile_h
+++ b/src/kernel/linux/v4.19/scripts/mkcompile_h
@@ -51,9 +51,6 @@
LINUX_COMPILE_HOST=$KBUILD_BUILD_HOST
fi
#LXF 2022.10.10 modify for T8TSK-91 start
-COMMITID=$(git rev-parse --short HEAD)
-#LYNQ_VERSION="T800_UNSET_v02.MP1_MR3.02b06.00.01"
-
UTS_VERSION="#$VERSION"
CONFIG_FLAGS=""
if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
@@ -75,7 +72,7 @@
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
#LXF 2022.10.10 modify for T8TSK-91 start
printf '#define LINUX_COMPILE_BY "%s"\n' "$LINUX_COMPILE_BY"
- printf '#define LYNQ_VERSION "%s"\n' "$LYNQ_VERSION"
+ printf '#define LYNQ_VERSION "%s"\n' "$LYNQ_VERSION core_num=$CORE_NUM"
#echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
#LXF 2022.10.10 modify for T8TSK-91 end
echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
diff --git a/update_version.sh b/update_version.sh
index 8790303..e3b425f 100644
--- a/update_version.sh
+++ b/update_version.sh
@@ -2,9 +2,14 @@
LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"T800_UNSET_v02.MP1_MR3.02b06.00.01\""
LYNQ_SW_VERSION="LYNQ_CONFIG_SW_VERSION = \"T800_UNSET_v02.MP1_MR1.01b06.00\""
+COMMIT_ID="$(git rev-parse --short HEAD)"
+LYNQ_COMMITID="LYNQ_CONFIG_COMMITID = \"${COMMIT_ID}\""
eval sed -i 's/^.*LYNQ_CONFIG_VERSION.*$/"${LYNQ_SW_INSIDE_VERSION}"/' $(pwd)/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
eval sed -i 's/^.*LYNQ_CONFIG_SW_VERSION.*$/"${LYNQ_SW_VERSION}"/' $(pwd)/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
+eval sed -i 's/^.*LYNQ_CONFIG_COMMITID.*$/"${LYNQ_COMMITID}"/' $(pwd)/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
+
eval sed -i 's/^.*LYNQ_CONFIG_VERSION.*$/"${LYNQ_SW_INSIDE_VERSION}"/' $(pwd)/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
eval sed -i 's/^.*LYNQ_CONFIG_SW_VERSION.*$/"${LYNQ_SW_VERSION}"/' $(pwd)/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
+eval sed -i 's/^.*LYNQ_CONFIG_COMMITID.*$/"${LYNQ_COMMITID}"/' $(pwd)/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf