From 8d2fb6241acd872a205c26a59f50847242223d27 Mon Sep 17 00:00:00 2001
From: liweigang <liweiganga@uniontech.com>
Date: Wed, 22 Jun 2022 15:47:49 +0800
Subject: [PATCH] adapt A

---
 Makefile                                      | 36 +++++++++++--------
 files/{os-license-arm => os-license-amd64-A}  | 10 +++---
 files/os-license-arm64-A                      | 11 ++++++
 files/os-license-loongarch64-A                | 11 ++++++
 files/os-license-mips                         | 11 ------
 files/os-license-mips64-A                     | 11 ++++++
 .../{os-license-amd => os-license-ppc64le-A}  |  4 +--
 files/{os-license-sw => os-license-sw64-A}    |  6 ++--
 files/{os-version-amd => os-version-amd64-A}  |  6 ++--
 files/{os-version-sw => os-version-arm64-A}   |  8 ++---
 files/os-version-loongarch64-A                | 10 ++++++
 files/os-version-mips64-A                     | 10 ++++++
 .../{os-version-arm => os-version-ppc64le-A}  |  4 +--
 files/{os-version-mips => os-version-sw64-A}  |  6 ++--
 14 files changed, 96 insertions(+), 48 deletions(-)
 rename files/{os-license-arm => os-license-amd64-A} (52%)
 create mode 100644 files/os-license-arm64-A
 create mode 100644 files/os-license-loongarch64-A
 delete mode 100644 files/os-license-mips
 create mode 100644 files/os-license-mips64-A
 rename files/{os-license-amd => os-license-ppc64le-A} (88%)
 rename files/{os-license-sw => os-license-sw64-A} (75%)
 rename files/{os-version-amd => os-version-amd64-A} (76%)
 rename files/{os-version-sw => os-version-arm64-A} (68%)
 create mode 100644 files/os-version-loongarch64-A
 create mode 100644 files/os-version-mips64-A
 rename files/{os-version-arm => os-version-ppc64le-A} (84%)
 rename files/{os-version-mips => os-version-sw64-A} (76%)

diff --git a/Makefile b/Makefile
index 45f3b8b..d443c54 100644
--- a/Makefile
+++ b/Makefile
@@ -13,28 +13,34 @@ build:
 		cp -v files/appstore_loongson.json files/appstore.json
         endif
         ifeq (${ARCH_BUILD}, x86_64)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd > files/os-license		
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd64-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64-A > files/os-version
         else ifeq (${ARCH_BUILD}, x86_32)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd > files/os-license		
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd64-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64-A > files/os-version
 
         else ifeq (${ARCH_BUILD}, i686)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd > files/os-license		
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd64-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64-A > files/os-version
         else ifeq (${ARCH_BUILD}, mipsel)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-mips > files/os-license		
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-mips > files/os-version
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-mips64-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-mips64-A > files/os-version
         else ifeq (${ARCH_BUILD}, mips64)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-mips > files/os-license		
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-mips > files/os-version
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-mips64-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-mips64-A > files/os-version
         else ifeq (${ARCH_BUILD}, sw_64)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-sw > files/os-license		
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-sw > files/os-version
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-sw64-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-sw64-A > files/os-version
         else ifeq (${ARCH_BUILD}, aarch64)
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-arm > files/os-license		
-		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm > files/os-version
-        endif
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-arm64-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm64-A > files/os-version
+        else ifeq (${ARCH_BUILD}, ppc64le)
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-ppc64le-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-ppc64le-A > files/os-version
+        else ifeq (${ARCH_BUILD}, loongarch64)
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-loongarch64-A > files/os-license		
+		sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loongarch64-A > files/os-version
+        endif
 	sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version
 	sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-server.in > files/desktop-version-server
 	sed -e "s|@@VERSION@@|20|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/lsb-release.in > files/lsb-release
diff --git a/files/os-license-arm b/files/os-license-amd64-A
similarity index 52%
rename from files/os-license-arm
rename to files/os-license-amd64-A
index 84972ab..5d84495 100644
--- a/files/os-license-arm
+++ b/files/os-license-amd64-A
@@ -1,11 +1,11 @@
 [UOS-System] 
-product_id=AJJ8AA
+product_id=AJE8AA
 product_name=服务器
 instruction_type=全架构
 version=20
 minor_version=1050
-build_id=101
-system_cn=e
-system_en=e
+build_id=102
+system_cn=a
+system_en=a
 name_version=v1
-server_sum=c939334f76070ca6fcbc43bd00b2539d
+server_sum=53e09369d9d316da96f12bbd03726129
diff --git a/files/os-license-arm64-A b/files/os-license-arm64-A
new file mode 100644
index 0000000..5d84495
--- /dev/null
+++ b/files/os-license-arm64-A
@@ -0,0 +1,11 @@
+[UOS-System] 
+product_id=AJE8AA
+product_name=服务器
+instruction_type=全架构
+version=20
+minor_version=1050
+build_id=102
+system_cn=a
+system_en=a
+name_version=v1
+server_sum=53e09369d9d316da96f12bbd03726129
diff --git a/files/os-license-loongarch64-A b/files/os-license-loongarch64-A
new file mode 100644
index 0000000..5d84495
--- /dev/null
+++ b/files/os-license-loongarch64-A
@@ -0,0 +1,11 @@
+[UOS-System] 
+product_id=AJE8AA
+product_name=服务器
+instruction_type=全架构
+version=20
+minor_version=1050
+build_id=102
+system_cn=a
+system_en=a
+name_version=v1
+server_sum=53e09369d9d316da96f12bbd03726129
diff --git a/files/os-license-mips b/files/os-license-mips
deleted file mode 100644
index 0d12009..0000000
--- a/files/os-license-mips
+++ /dev/null
@@ -1,11 +0,0 @@
-[UOS-System] 
-product_id=AJAEAA
-product_name=服务器
-instruction_type=MIPS64
-version=20
-minor_version=1020
-build_id=102
-system_cn=e
-system_en=e
-name_version=v2
-server_sum=
diff --git a/files/os-license-mips64-A b/files/os-license-mips64-A
new file mode 100644
index 0000000..5d84495
--- /dev/null
+++ b/files/os-license-mips64-A
@@ -0,0 +1,11 @@
+[UOS-System] 
+product_id=AJE8AA
+product_name=服务器
+instruction_type=全架构
+version=20
+minor_version=1050
+build_id=102
+system_cn=a
+system_en=a
+name_version=v1
+server_sum=53e09369d9d316da96f12bbd03726129
diff --git a/files/os-license-amd b/files/os-license-ppc64le-A
similarity index 88%
rename from files/os-license-amd
rename to files/os-license-ppc64le-A
index 84972ab..43d7b7b 100644
--- a/files/os-license-amd
+++ b/files/os-license-ppc64le-A
@@ -5,7 +5,7 @@ instruction_type=全架构
 version=20
 minor_version=1050
 build_id=101
-system_cn=e
-system_en=e
+system_cn=a
+system_en=a
 name_version=v1
 server_sum=c939334f76070ca6fcbc43bd00b2539d
diff --git a/files/os-license-sw b/files/os-license-sw64-A
similarity index 75%
rename from files/os-license-sw
rename to files/os-license-sw64-A
index d9fdb5e..c8c1fb3 100644
--- a/files/os-license-sw
+++ b/files/os-license-sw64-A
@@ -3,9 +3,9 @@ product_id=AJACAA
 product_name=服务器
 instruction_type=SW64
 version=20
-minor_version=1020
+minor_version=1050
 build_id=102
-system_cn=e
-system_en=e
+system_cn=a
+system_en=a
 name_version=v2
 server_sum=
diff --git a/files/os-version-amd b/files/os-version-amd64-A
similarity index 76%
rename from files/os-version-amd
rename to files/os-version-amd64-A
index 6048f74..ad50f3a 100644
--- a/files/os-version-amd
+++ b/files/os-version-amd64-A
@@ -3,8 +3,8 @@ SystemName=UnionTech OS Server
 SystemName[zh_CN]=统信服务器操作系统
 ProductType=Server
 ProductType[zh_CN]=服务器
-EditionName=e
-EditionName[zh_CN]=e
+EditionName=a
+EditionName[zh_CN]=a
 MajorVersion=20
 MinorVersion=1050
-OsBuild=12038.101
+OsBuild=12028.102
diff --git a/files/os-version-sw b/files/os-version-arm64-A
similarity index 68%
rename from files/os-version-sw
rename to files/os-version-arm64-A
index b6f49cb..7833b6b 100644
--- a/files/os-version-sw
+++ b/files/os-version-arm64-A
@@ -3,8 +3,8 @@ SystemName=UnionTech OS Server
 SystemName[zh_CN]=统信服务器操作系统
 ProductType=Server
 ProductType[zh_CN]=服务器
-EditionName=e
-EditionName[zh_CN]=e
+EditionName=a
+EditionName[zh_CN]=a
 MajorVersion=20
-MinorVersion=1020
-OsBuild=12034.102
+MinorVersion=1050
+OsBuild=12024.102
diff --git a/files/os-version-loongarch64-A b/files/os-version-loongarch64-A
new file mode 100644
index 0000000..4fa3fbb
--- /dev/null
+++ b/files/os-version-loongarch64-A
@@ -0,0 +1,10 @@
+[Version] 
+SystemName=UnionTech OS Server
+SystemName[zh_CN]=统信服务器操作系统
+ProductType=Server
+ProductType[zh_CN]=服务器
+EditionName=a
+EditionName[zh_CN]=a
+MajorVersion=20
+MinorVersion=1050
+OsBuild=12023.102
diff --git a/files/os-version-mips64-A b/files/os-version-mips64-A
new file mode 100644
index 0000000..4fa3fbb
--- /dev/null
+++ b/files/os-version-mips64-A
@@ -0,0 +1,10 @@
+[Version] 
+SystemName=UnionTech OS Server
+SystemName[zh_CN]=统信服务器操作系统
+ProductType=Server
+ProductType[zh_CN]=服务器
+EditionName=a
+EditionName[zh_CN]=a
+MajorVersion=20
+MinorVersion=1050
+OsBuild=12023.102
diff --git a/files/os-version-arm b/files/os-version-ppc64le-A
similarity index 84%
rename from files/os-version-arm
rename to files/os-version-ppc64le-A
index f50577f..aede45c 100644
--- a/files/os-version-arm
+++ b/files/os-version-ppc64le-A
@@ -3,8 +3,8 @@ SystemName=UnionTech OS Server
 SystemName[zh_CN]=统信服务器操作系统
 ProductType=Server
 ProductType[zh_CN]=服务器
-EditionName=e
-EditionName[zh_CN]=e
+EditionName=a
+EditionName[zh_CN]=a
 MajorVersion=20
 MinorVersion=1050
 OsBuild=12034.101
diff --git a/files/os-version-mips b/files/os-version-sw64-A
similarity index 76%
rename from files/os-version-mips
rename to files/os-version-sw64-A
index b6f49cb..cccf2c1 100644
--- a/files/os-version-mips
+++ b/files/os-version-sw64-A
@@ -3,8 +3,8 @@ SystemName=UnionTech OS Server
 SystemName[zh_CN]=统信服务器操作系统
 ProductType=Server
 ProductType[zh_CN]=服务器
-EditionName=e
-EditionName[zh_CN]=e
+EditionName=a
+EditionName[zh_CN]=a
 MajorVersion=20
-MinorVersion=1020
+MinorVersion=1050
 OsBuild=12034.102
-- 
2.20.1