From bb9656dc183b97fa551e5fc395f4ce44af19eee0 Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dima@doty.ru>
Date: Sat, 20 Aug 2022 14:49:55 +0300
Subject: [PATCH] Use ipcinfo --xm-mac everywhere (#389)

* Change BRANCH_NAME to BRANCH according to CI changes

* Use ipcinfo --xm-mac everywhere
---
 general/package/ambarella-osdrv-s3l/files/script/S95ambarella   | 2 +-
 general/package/anyka-osdrv-ak3918ev200/files/script/S95anyka   | 2 +-
 .../package/fullhan-osdrv-fh8852v100/files/script/S95fullhan    | 2 +-
 .../package/fullhan-osdrv-fh8852v200/files/script/S95fullhan    | 2 +-
 general/package/goke-osdrv-gk7205v200/files/script/S95goke      | 2 +-
 .../package/grainmedia-osdrv-gm8136/files/script/S95grainmedia  | 2 +-
 .../hisilicon-osdrv-hi3516av100/files/script/S95hisilicon       | 2 +-
 .../hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon       | 2 +-
 .../hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon       | 2 +-
 .../hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon       | 2 +-
 .../hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon       | 2 +-
 .../hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon       | 2 +-
 .../hisilicon-osdrv-hi3519v101/files/script/S95hisilicon        | 2 +-
 general/package/novatek-osdrv-nt9856x/files/script/S95novatek   | 2 +-
 general/package/rockchip-osdrv-rv11xx/files/script/S95rockchip  | 2 +-
 general/package/xiongmai-osdrv-xm510/files/script/S95xiongmai   | 2 +-
 general/package/xiongmai-osdrv-xm530/files/script/S95xiongmai   | 2 +-
 scripts/executing_commands_for_glibc.sh                         | 2 +-
 scripts/executing_commands_for_musl.sh                          | 2 +-
 scripts/executing_commands_for_uclibc.sh                        | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/general/package/ambarella-osdrv-s3l/files/script/S95ambarella b/general/package/ambarella-osdrv-s3l/files/script/S95ambarella
index db13b41b..5fed0f8a 100755
--- a/general/package/ambarella-osdrv-s3l/files/script/S95ambarella
+++ b/general/package/ambarella-osdrv-s3l/files/script/S95ambarella
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t anyka "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t anyka "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t anyka "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t anyka "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t anyka "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/anyka-osdrv-ak3918ev200/files/script/S95anyka b/general/package/anyka-osdrv-ak3918ev200/files/script/S95anyka
index db13b41b..5fed0f8a 100755
--- a/general/package/anyka-osdrv-ak3918ev200/files/script/S95anyka
+++ b/general/package/anyka-osdrv-ak3918ev200/files/script/S95anyka
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t anyka "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t anyka "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t anyka "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t anyka "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t anyka "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan b/general/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan
index 0d154099..9de94a48 100755
--- a/general/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan
+++ b/general/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t fullhan "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t fullhan "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t fullhan "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t fullhan "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t fullhan "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan b/general/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan
index 045526fb..f57df16e 100755
--- a/general/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan
+++ b/general/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t fullhan "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t fullhan "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t fullhan "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t fullhan "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t fullhan "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/goke-osdrv-gk7205v200/files/script/S95goke b/general/package/goke-osdrv-gk7205v200/files/script/S95goke
index c445e4f0..793d0e8b 100755
--- a/general/package/goke-osdrv-gk7205v200/files/script/S95goke
+++ b/general/package/goke-osdrv-gk7205v200/files/script/S95goke
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t goke "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t goke "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t goke "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t goke "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t goke "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia b/general/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia
index 28df45c2..697c38f6 100755
--- a/general/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia
+++ b/general/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t grainmedia "Check MAC for GrainMedia devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t grainmedia "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t grainmedia "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t grainmedia "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t grainmedia "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon
index 5ee38bb4..35431617 100755
--- a/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon
+++ b/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon
index 153b0699..f3b4d652 100755
--- a/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon
+++ b/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon
index 66802846..e9df13c8 100755
--- a/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon
+++ b/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon
index 153b0699..f3b4d652 100755
--- a/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon
+++ b/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon
index b8b0e582..93ea99ae 100755
--- a/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon
+++ b/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon
index 66802846..e9df13c8 100755
--- a/general/package/hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon
+++ b/general/package/hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon
index 66802846..e9df13c8 100755
--- a/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon
+++ b/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/novatek-osdrv-nt9856x/files/script/S95novatek b/general/package/novatek-osdrv-nt9856x/files/script/S95novatek
index c7dc0db0..024fecca 100755
--- a/general/package/novatek-osdrv-nt9856x/files/script/S95novatek
+++ b/general/package/novatek-osdrv-nt9856x/files/script/S95novatek
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t novatek "Check MAC for Novatek devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t novatek "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t novatek "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t novatek "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t novatek "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/rockchip-osdrv-rv11xx/files/script/S95rockchip b/general/package/rockchip-osdrv-rv11xx/files/script/S95rockchip
index 9d1ddde3..1df0ffb8 100755
--- a/general/package/rockchip-osdrv-rv11xx/files/script/S95rockchip
+++ b/general/package/rockchip-osdrv-rv11xx/files/script/S95rockchip
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t rockchip "Check MAC for rockchip devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t rockchip "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t rockchip "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t rockchip "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t rockchip "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/xiongmai-osdrv-xm510/files/script/S95xiongmai b/general/package/xiongmai-osdrv-xm510/files/script/S95xiongmai
index c627c70c..9223e85a 100755
--- a/general/package/xiongmai-osdrv-xm510/files/script/S95xiongmai
+++ b/general/package/xiongmai-osdrv-xm510/files/script/S95xiongmai
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t xiongmai "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t xiongmai "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t xiongmai "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t xiongmai "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t xiongmai "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/general/package/xiongmai-osdrv-xm530/files/script/S95xiongmai b/general/package/xiongmai-osdrv-xm530/files/script/S95xiongmai
index 1d117707..ee0ec738 100755
--- a/general/package/xiongmai-osdrv-xm530/files/script/S95xiongmai
+++ b/general/package/xiongmai-osdrv-xm530/files/script/S95xiongmai
@@ -33,7 +33,7 @@ start() {
 	logger -s -p daemon.info -t xiongmai "Check MAC for Xiongmai devices"
 	if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then
 		logger -s -p daemon.info -t xiongmai "The eth0 interface has a lousy MAC, let's try to change it.."
-		XMMAC="$(ipcinfo --xm_mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t xiongmai "It is not possible to install a new MAC on the eth0 interface.."
+		XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t xiongmai "It is not possible to install a new MAC on the eth0 interface.."
 	else
 		logger -s -p daemon.info -t xiongmai "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)"
 	fi
diff --git a/scripts/executing_commands_for_glibc.sh b/scripts/executing_commands_for_glibc.sh
index 4779c6dd..35adc8c8 100755
--- a/scripts/executing_commands_for_glibc.sh
+++ b/scripts/executing_commands_for_glibc.sh
@@ -5,7 +5,7 @@
 
 D=$(date "+%y.%m.%d")
 echo "OPENIPC_VERSION=${D:0:1}.${D:1}" >>${TARGET_DIR}/usr/lib/os-release
-date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
+date "+GITHUB_VERSION=\"${BRANCH}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
 if grep -q fpv_defconfig ${BR2_CONFIG}; then
     echo "BUILD_OPTION=fpv" >>${TARGET_DIR}/usr/lib/os-release
 elif grep -q ultimate_defconfig ${BR2_CONFIG}; then
diff --git a/scripts/executing_commands_for_musl.sh b/scripts/executing_commands_for_musl.sh
index 60a1af9f..873060a3 100755
--- a/scripts/executing_commands_for_musl.sh
+++ b/scripts/executing_commands_for_musl.sh
@@ -5,7 +5,7 @@
 
 D=$(date "+%y.%m.%d")
 echo "OPENIPC_VERSION=${D:0:1}.${D:1}" >>${TARGET_DIR}/usr/lib/os-release
-date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
+date "+GITHUB_VERSION=\"${BRANCH}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
 if grep -q fpv_defconfig ${BR2_CONFIG}; then
     echo "BUILD_OPTION=fpv" >>${TARGET_DIR}/usr/lib/os-release
 elif grep -q ultimate_defconfig ${BR2_CONFIG}; then
diff --git a/scripts/executing_commands_for_uclibc.sh b/scripts/executing_commands_for_uclibc.sh
index ef79da49..69ae31ee 100755
--- a/scripts/executing_commands_for_uclibc.sh
+++ b/scripts/executing_commands_for_uclibc.sh
@@ -5,7 +5,7 @@
 
 D=$(date "+%y.%m.%d")
 echo "OPENIPC_VERSION=${D:0:1}.${D:1}" >>${TARGET_DIR}/usr/lib/os-release
-date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
+date "+GITHUB_VERSION=\"${BRANCH}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
 if grep -q fpv_defconfig ${BR2_CONFIG}; then
     echo "BUILD_OPTION=fpv" >>${TARGET_DIR}/usr/lib/os-release
 elif grep -q ultimate_defconfig ${BR2_CONFIG}; then