197 lines
8.3 KiB
Diff
197 lines
8.3 KiB
Diff
From 02b7acd5c530c5dc9dd703ad089b2c6ada53ee2a Mon Sep 17 00:00:00 2001
|
|
From: liweigang <liweiganga@uniontech.com>
|
|
Date: Wed, 22 Jun 2022 15:08:19 +0800
|
|
Subject: [PATCH] adapt E
|
|
|
|
---
|
|
Makefile | 28 +++++++++----------
|
|
files/{os-license-amd => os-license-amd64-E} | 4 +--
|
|
files/{os-license-arm => os-license-arm64-E} | 4 +--
|
|
files/{os-license-mips => os-license-mips4-E} | 2 +-
|
|
files/{os-license-sw => os-license-sw64-E} | 2 +-
|
|
files/{os-version-amd => os-version-amd64-E} | 2 +-
|
|
files/{os-version-arm => os-version-arm64-E} | 2 +-
|
|
files/{os-version-mips => os-version-mips4-E} | 2 +-
|
|
files/{os-version-sw => os-version-sw64-E} | 2 +-
|
|
9 files changed, 24 insertions(+), 24 deletions(-)
|
|
rename files/{os-license-amd => os-license-amd64-E} (72%)
|
|
rename files/{os-license-arm => os-license-arm64-E} (72%)
|
|
rename files/{os-license-mips => os-license-mips4-E} (89%)
|
|
rename files/{os-license-sw => os-license-sw64-E} (88%)
|
|
rename files/{os-version-amd => os-version-amd64-E} (91%)
|
|
rename files/{os-version-arm => os-version-arm64-E} (91%)
|
|
rename files/{os-version-mips => os-version-mips4-E} (91%)
|
|
rename files/{os-version-sw => os-version-sw64-E} (91%)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 45f3b8b..89356d7 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -13,27 +13,27 @@ 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-E > files/os-license
|
|
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64-E > 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-E > files/os-license
|
|
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64-E > 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-E > files/os-license
|
|
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64-E > 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-E > files/os-license
|
|
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-mips64-E > 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-E > files/os-license
|
|
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-mips64-E > 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-E > files/os-license
|
|
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-sw64-E > 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
|
|
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-arm64-E > files/os-license
|
|
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm64-E > 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
|
|
diff --git a/files/os-license-amd b/files/os-license-amd64-E
|
|
similarity index 72%
|
|
rename from files/os-license-amd
|
|
rename to files/os-license-amd64-E
|
|
index 84972ab..0239a62 100644
|
|
--- a/files/os-license-amd
|
|
+++ b/files/os-license-amd64-E
|
|
@@ -4,8 +4,8 @@ product_name=服务器
|
|
instruction_type=全架构
|
|
version=20
|
|
minor_version=1050
|
|
-build_id=101
|
|
+build_id=102
|
|
system_cn=e
|
|
system_en=e
|
|
name_version=v1
|
|
-server_sum=c939334f76070ca6fcbc43bd00b2539d
|
|
+server_sum=4929f09213232c01117cacfed3254f0a
|
|
diff --git a/files/os-license-arm b/files/os-license-arm64-E
|
|
similarity index 72%
|
|
rename from files/os-license-arm
|
|
rename to files/os-license-arm64-E
|
|
index 84972ab..0239a62 100644
|
|
--- a/files/os-license-arm
|
|
+++ b/files/os-license-arm64-E
|
|
@@ -4,8 +4,8 @@ product_name=服务器
|
|
instruction_type=全架构
|
|
version=20
|
|
minor_version=1050
|
|
-build_id=101
|
|
+build_id=102
|
|
system_cn=e
|
|
system_en=e
|
|
name_version=v1
|
|
-server_sum=c939334f76070ca6fcbc43bd00b2539d
|
|
+server_sum=4929f09213232c01117cacfed3254f0a
|
|
diff --git a/files/os-license-mips b/files/os-license-mips4-E
|
|
similarity index 89%
|
|
rename from files/os-license-mips
|
|
rename to files/os-license-mips4-E
|
|
index 0d12009..219e03a 100644
|
|
--- a/files/os-license-mips
|
|
+++ b/files/os-license-mips4-E
|
|
@@ -3,7 +3,7 @@ product_id=AJAEAA
|
|
product_name=服务器
|
|
instruction_type=MIPS64
|
|
version=20
|
|
-minor_version=1020
|
|
+minor_version=1050
|
|
build_id=102
|
|
system_cn=e
|
|
system_en=e
|
|
diff --git a/files/os-license-sw b/files/os-license-sw64-E
|
|
similarity index 88%
|
|
rename from files/os-license-sw
|
|
rename to files/os-license-sw64-E
|
|
index d9fdb5e..7ecfcff 100644
|
|
--- a/files/os-license-sw
|
|
+++ b/files/os-license-sw64-E
|
|
@@ -3,7 +3,7 @@ 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
|
|
diff --git a/files/os-version-amd b/files/os-version-amd64-E
|
|
similarity index 91%
|
|
rename from files/os-version-amd
|
|
rename to files/os-version-amd64-E
|
|
index 6048f74..93fd28f 100644
|
|
--- a/files/os-version-amd
|
|
+++ b/files/os-version-amd64-E
|
|
@@ -7,4 +7,4 @@ EditionName=e
|
|
EditionName[zh_CN]=e
|
|
MajorVersion=20
|
|
MinorVersion=1050
|
|
-OsBuild=12038.101
|
|
+OsBuild=12038.102
|
|
diff --git a/files/os-version-arm b/files/os-version-arm64-E
|
|
similarity index 91%
|
|
rename from files/os-version-arm
|
|
rename to files/os-version-arm64-E
|
|
index f50577f..5df2b05 100644
|
|
--- a/files/os-version-arm
|
|
+++ b/files/os-version-arm64-E
|
|
@@ -7,4 +7,4 @@ EditionName=e
|
|
EditionName[zh_CN]=e
|
|
MajorVersion=20
|
|
MinorVersion=1050
|
|
-OsBuild=12034.101
|
|
+OsBuild=12034.102
|
|
diff --git a/files/os-version-mips b/files/os-version-mips4-E
|
|
similarity index 91%
|
|
rename from files/os-version-mips
|
|
rename to files/os-version-mips4-E
|
|
index b6f49cb..5df2b05 100644
|
|
--- a/files/os-version-mips
|
|
+++ b/files/os-version-mips4-E
|
|
@@ -6,5 +6,5 @@ ProductType[zh_CN]=服务器
|
|
EditionName=e
|
|
EditionName[zh_CN]=e
|
|
MajorVersion=20
|
|
-MinorVersion=1020
|
|
+MinorVersion=1050
|
|
OsBuild=12034.102
|
|
diff --git a/files/os-version-sw b/files/os-version-sw64-E
|
|
similarity index 91%
|
|
rename from files/os-version-sw
|
|
rename to files/os-version-sw64-E
|
|
index b6f49cb..5df2b05 100644
|
|
--- a/files/os-version-sw
|
|
+++ b/files/os-version-sw64-E
|
|
@@ -6,5 +6,5 @@ ProductType[zh_CN]=服务器
|
|
EditionName=e
|
|
EditionName[zh_CN]=e
|
|
MajorVersion=20
|
|
-MinorVersion=1020
|
|
+MinorVersion=1050
|
|
OsBuild=12034.102
|
|
--
|
|
2.20.1
|
|
|