Merge branch 'stefan/version-update' into 'kirkstone'

openharmony-standard: adjust versions and model names for correct GetVerionId()

See merge request eclipse/oniro-oh/meta-openharmony!132

recipes-openharmony/openharmony/files/ohos.para

@@ -25,7 +25,7 @@ ro.secure=1
 security.perf_harden=1
 ro.allow.mock.location=0
 ro.debuggable=1
-ro.build.characteristics=default
+ro.build.characteristics=devboard
 
 # There is some kind of special handling if this is "OHOS"
 ro.product.model=OHOS

recipes-openharmony/openharmony/openharmony-standard_3.0.bb

@@ -171,21 +171,29 @@ GN_ARGS += 'host_toolchain="//oniro:host_toolchain"'
 GN_ARGS += 'install_oniro_third_party=false'
 
 # Configure HAL system parameters
-OHOS_MANUFACTURE = "Oniro Project"
+OHOS_MANUFACTURE = "Eclipse Oniro Project"
+OHOS_BRAND = "Eclipse Oniro"
 OHOS_SOFTWARE_MODEL = "Oniro OH"
-OHOS_HARDWARE_MODEL = "${MACHINE}"
-OHOS_HARDWARE_MODEL:qemuarma7 = "QEMU Arm Cortex-A7"
-OHOS_HARDWARE_MODEL:raspberrypi4-64 = "Raspberry Pi 4"
+OHOS_PRODUCT_SERIES = "${MACHINE}"
+OHOS_PRODUCT_SERIES:qemuarma7 = "QEMU Arm Cortex-A7"
+OHOS_PRODUCT_SERIES:raspberrypi4-64 = "Raspberry Pi 4"
 OHOS_HARDWARE_PROFILE = "aout:true,display:true"
 OHOS_HARDWARE_PROFILE:qemuarma7 = "aout:false,display:true,camera:false,radio:false,bluetooth:false,WIFI:false,usbhost:false"
 OHOS_HARDWARE_PROFILE:raspberrypi4-64 = "aout:false,display:false,camera:false,radio:false,bluetooth:false,WIFI:true,usbhost:false"
+OHOS_SDK_API_LEVEL = "7"
+OHOS_FEATURE_VERSION = "1"
 do_configure[prefuncs] += "do_configure_sysparam_hal"
 do_configure_sysparam_hal() {
     sed -i ${S}/base/startup/syspara_lite/hals/parameter/src/parameter_hal.cpp \
         -e 's/\(static const char OHOS_MANUFACTURE\[\]\) =.*/\1 = {"${OHOS_MANUFACTURE}"};/' \
+        -e 's/\(static const char OHOS_BRAND\[\]\) =.*/\1 = {"${OHOS_BRAND}"};/' \
+        -e 's/\(static const char OHOS_PRODUCT_SERIES\[\]\) =.*/\1 = {"${OHOS_PRODUCT_SERIES}"};/' \
         -e 's/\(static const char OHOS_SOFTWARE_MODEL\[\]\) =.*/\1 = {"${OHOS_SOFTWARE_MODEL}"};/' \
-        -e 's/\(static const char OHOS_HARDWARE_MODEL\[\]\) =.*/\1 = {"${OHOS_HARDWARE_MODEL}"};/' \
         -e 's/\(static const char OHOS_HARDWARE_PROFILE\[\]\) =.*/\1 = {"${OHOS_HARDWARE_PROFILE}"};/'
+    sed -i ${S}/base/startup/syspara_lite/interfaces/innerkits/native/syspara/src/parameter.c \
+        -e 's/\(static const int OHOS_SDK_API_LEVEL\) =.*/\1 = ${OHOS_SDK_API_LEVEL};/'
+    sed -i ${S}/base/startup/syspara_lite/interfaces/innerkits/native/syspara/src/sysversion.c \
+        -e 's/\(static int g_featureVersion\) =.*/\1 = ${OHOS_FEATURE_VERSION};/'
 }
 
 # OpenHarmony build system needs a bit of help to be able to find the right