!43 update package

From: @hanshuang123456 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing
This commit is contained in:
openeuler-ci-bot 2023-10-10 10:17:19 +00:00 committed by Gitee
commit b74e9d083a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 721 additions and 94 deletions

View File

@ -0,0 +1,112 @@
From 59cda5758b1a5aedda3a9e46cc36526887a1ffb9 Mon Sep 17 00:00:00 2001
From: liweigang <liweiganga@uniontech.com>
Date: Wed, 22 Jun 2022 14:21:02 +0800
Subject: [PATCH] fix: unified use desktop-version-server.in
---
Makefile | 16 ++--------------
files/desktop-version-arm-server.in | 9 ---------
files/desktop-version-loongson-server.in | 9 ---------
files/desktop-version-sw-server.in | 9 ---------
4 files changed, 2 insertions(+), 41 deletions(-)
delete mode 100644 files/desktop-version-arm-server.in
delete mode 100644 files/desktop-version-loongson-server.in
delete mode 100644 files/desktop-version-sw-server.in
diff --git a/Makefile b/Makefile
index 1a3e7ca..45f3b8b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,42 +13,30 @@ 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/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@@|$(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
else ifeq (${ARCH_BUILD}, x86_32)
- 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@@|$(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
else ifeq (${ARCH_BUILD}, i686)
- 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@@|$(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
else ifeq (${ARCH_BUILD}, mipsel)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson-server.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson-server.in > files/desktop-version-server
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
else ifeq (${ARCH_BUILD}, mips64)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson-server.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongson-server.in > files/desktop-version-server
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
else ifeq (${ARCH_BUILD}, sw_64)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-sw-server.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-sw-server.in > files/desktop-version-server
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
else ifeq (${ARCH_BUILD}, aarch64)
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm-server.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-arm-server.in > files/desktop-version-server
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/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
install:
diff --git a/files/desktop-version-arm-server.in b/files/desktop-version-arm-server.in
deleted file mode 100644
index e66b575..0000000
--- a/files/desktop-version-arm-server.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Release]
-Version=@@VERSION@@
-Type=Server
-Type[zh_CN]=服务器版
-Edition=Y2020E0002
-Copyright=Y2020CR002
-[Addition]
-Milestone=@@RELEASE@@
-Buildid=build1
diff --git a/files/desktop-version-loongson-server.in b/files/desktop-version-loongson-server.in
deleted file mode 100644
index e66b575..0000000
--- a/files/desktop-version-loongson-server.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Release]
-Version=@@VERSION@@
-Type=Server
-Type[zh_CN]=服务器版
-Edition=Y2020E0002
-Copyright=Y2020CR002
-[Addition]
-Milestone=@@RELEASE@@
-Buildid=build1
diff --git a/files/desktop-version-sw-server.in b/files/desktop-version-sw-server.in
deleted file mode 100644
index e66b575..0000000
--- a/files/desktop-version-sw-server.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Release]
-Version=@@VERSION@@
-Type=Server
-Type[zh_CN]=服务器版
-Edition=Y2020E0002
-Copyright=Y2020CR002
-[Addition]
-Milestone=@@RELEASE@@
-Buildid=build1
--
2.20.1

196
0002-adapt-E.patch Normal file
View File

@ -0,0 +1,196 @@
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

329
0003-adapt-A.patch Normal file
View File

@ -0,0 +1,329 @@
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

12
dde.conf Normal file
View File

@ -0,0 +1,12 @@
[Password]
STRONG_PASSWORD = true
PASSWORD_MIN_LENGTH = 8
PASSWORD_MAX_LENGTH = 511
VALIDATE_POLICY = 1234567890;abcdefghijklmnopqrstuvwxyz;ABCDEFGHIJKLMNOPQRSTUVWXYZ;!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
VALIDATE_REQUIRED = 3
PALINDROME_NUM = 4
WORD_CHECK = 1
MONOTONE_CHARACTER_NUM = 0
CONSECUTIVE_SAME_CHARACTER_NUM = 0
DICT_PATH =
FIRST_LETTER_UPPERCASE = false

Binary file not shown.

View File

@ -1,125 +1,103 @@
%global debug_package %{nil}
Name: deepin-desktop-base
Version: 2020.03.23
Release: 5
Version: 2022.01.27
Release: 1%{?dist}.03
Summary: Base files for Deepin Desktop
License: GPLv3
URL: https://github.com/linuxdeepin/deepin-desktop-base
Source0: %{name}_%{version}.orig.tar.xz
BuildArch: noarch
Patch1: 0001-fix-logo.patch
Patch2: 0001-compliance-modification-of-regional-and-textual-titl.patch
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Source1: dde.conf
Provides: deepin-appstore-config
Patch1: 0001-fix-unified-use-desktop-version-server.in.patch
Patch2: 0002-adapt-E.patch
Patch3: 0003-adapt-A.patch
%description
Base files for Deepin Desktop.
%{summary}.
%package -n deepin-desktop-server
Summary: Base files for Deepin Desktop
%package -n deepin-desktop-server
Summary: Base files for Deepin Desktop Server
Provides: deepin-desktop-base
Obsoletes: deepin-desktop-base < %{version}
Recommends: deepin-wallpapers
Recommends: deepin-screensaver
%description -n deepin-desktop-server
%{summary}.
%description -n deepin-desktop-server
Base files for Deepin Desktop.
%package -n license-config
Summary: uos server license config
Provides: license-config >= 0.0.4-3
Obsoletes: license-config < 0.0.4-3
%description -n license-config
%{summary}.
%prep
%autosetup -p1
sed -i -E '/lsb-release/d' Makefile
sed -i 's|/usr/lib|%{_datadir}|' Makefile
sed -i 's|VERSION := 20 SP1|VERSION := 20|' Makefile
sed -i 's|Type=.*|Type=Desktop|' files/{desktop-version-arm.in,desktop-version.in}
sed -i 's|Type\[zh_CN\]=.*|Type\[zh_CN\]=社区版|' files/{desktop-version-arm.in,desktop-version.in}
%setup -q -n %{name}-%{version}
%patch1 -p1
%if 0%{?openeuler}
%patch2 -p1
%else
%patch3 -p1
%endif
%build
# Remove Deepin lsb-release
sed -i '/lsb-release/d' Makefile
# update usr/lib/ path
sed -i 's|/usr/lib|%{_datadir}|' Makefile
%make_build
%install
install -d -p %{buildroot}/%{_datadir}/i18n
install -d -p %{buildroot}/%{_datadir}/python-apt/templates
%make_install
## install distribution.info
install -d -p %{buildroot}/%{_datadir}/deepin/distribution/
install -d -p %{buildroot}/%{_sysconfdir}/deepin
install -Dm644 files/i18n_dependent.json %{buildroot}/%{_datadir}/i18n/i18n_dependent.json
install -Dm644 files/language_info.json %{buildroot}/%{_datadir}/i18n/language_info.json
install -Dm644 files/logind.conf %{buildroot}/%{_sysconfdir}/systemd/logind.conf.d/logind.conf
install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.conf.d/systemd.conf
install -Dm644 files/desktop-version-server %{buildroot}/usr/lib/deepin/desktop-version-server
install -Dm644 files/desktop-version %{buildroot}%{_datadir}/deepin/desktop-version
install -Dm644 files/appstore.json %{buildroot}/%{_sysconfdir}/appstore.json
install -Dm644 files/dde-session-ui.conf %{buildroot}/%{_sysconfdir}/deepin/dde-session-ui.conf
install -Dm644 files/deepin-logo.png %{buildroot}/%{_datadir}/plymouth/deepin-logo.png
install -Dm644 files/uos_logo.svg %{buildroot}/%{_datadir}/deepin/uos_logo.svg
install -Dm644 distribution.info %{buildroot}/%{_datadir}/deepin/distribution.info
install -Dm644 distribution/*.svg %{buildroot}/%{_datadir}/deepin/distribution/
install -Dm644 files/Deepin.info %{buildroot}/%{_datadir}/python-apt/templates/Deepin.info
install -Dm644 files/Deepin.mirrors %{buildroot}/%{_datadir}/python-apt/templates/Deepin.mirrors
install -Dm644 files/dde-desktop-watermask.json %{buildroot}/%{_datadir}/deepin/dde-desktop-watermask.json
[ -e files/systemd.conf ] && install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
[ -e files/logind.conf ] && install -Dm644 files/logind.conf %{buildroot}/%{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
ln -sfv ..%{_datadir}/deepin/desktop-version %{buildroot}/etc/deepin-version
%files
%config(noreplace) %{_sysconfdir}/appstore.json
%{_sysconfdir}/deepin-version
%dir %{_datadir}/deepin/
%{_sysconfdir}/systemd/logind.conf.d/logind.conf
%{_sysconfdir}/systemd/system.conf.d/systemd.conf
%{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
%{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
%{_datadir}/deepin/desktop-version
%{_datadir}/i18n/i18n_dependent.json
%{_datadir}/i18n/language_info.json
%dir %{_datadir}/plymouth
%{_datadir}/plymouth/deepin-logo.png
%{_datadir}/python-apt/templates/Deepin.info
%{_datadir}/python-apt/templates/Deepin.mirrors
%{_datadir}/deepin/dde-desktop-watermask.json
%{_datadir}/deepin/uos_logo.svg
%{_datadir}/deepin/distribution.info
%{_datadir}/deepin/distribution/distribution_logo.svg
%{_datadir}/deepin/distribution/distribution_logo_light.svg
%{_datadir}/deepin/distribution/distribution_logo_transparent.svg
install -Dm644 files/logind.conf %{buildroot}/%{_sysconfdir}/systemd/logind.conf.d/logind.conf
install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.conf.d/systemd.conf
install -Dm644 files/dde-session-ui.conf %{buildroot}/etc/deepin/dde-session-ui.conf
install -Dm644 files/desktop-version-server %{buildroot}%{_datadir}/deepin/desktop-version-server
ln -sfv %{_datadir}/deepin/desktop-version-server %{buildroot}%{_sysconfdir}/deepin-version
install -Dm644 files/os-license %{buildroot}/%{_sysconfdir}/.uos/os-license
%if 0%{?openeuler}
%else
install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/deepin/dde.conf
%endif
%files -n deepin-desktop-server
%config(noreplace) %{_sysconfdir}/appstore.json
%config(noreplace) %{_sysconfdir}/deepin/dde-session-ui.conf
/usr/lib/deepin/desktop-version-server
%dir %{_datadir}/deepin/
%{_sysconfdir}/systemd/logind.conf.d/logind.conf
%{_sysconfdir}/systemd/system.conf.d/systemd.conf
%{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
%{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
%{_datadir}/deepin/desktop-version
%{_datadir}/i18n/i18n_dependent.json
%{_datadir}/i18n/language_info.json
%dir %{_datadir}/plymouth
%{_sysconfdir}/deepin-version
%if 0%{?openeuler}
%else
%{_sysconfdir}/deepin/dde.conf
%endif
%{_datadir}/i18n/*.json
%{_datadir}/deepin/distribution.info
%{_datadir}/deepin/distribution/
%{_datadir}/deepin/desktop-version-server
%{_sysconfdir}/appstore.json
%{_datadir}/plymouth/deepin-logo.png
%{_datadir}/deepin/uos_logo.svg
%{_sysconfdir}/systemd/system.conf.d/systemd.conf
%{_sysconfdir}/systemd/logind.conf.d/logind.conf
%{_datadir}/python-apt/templates/Deepin.info
%{_datadir}/python-apt/templates/Deepin.mirrors
%{_datadir}/deepin/dde-desktop-watermask.json
%{_datadir}/deepin/uos_logo.svg
%{_datadir}/deepin/distribution.info
%{_datadir}/deepin/distribution/distribution_logo.svg
%{_datadir}/deepin/distribution/distribution_logo_light.svg
%{_datadir}/deepin/distribution/distribution_logo_transparent.svg
%{_sysconfdir}/deepin/dde-session-ui.conf
%exclude %{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
%exclude %{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
%exclude %{_sysconfdir}/systemd/user.conf.d/deepin-base.conf
%exclude %{_datadir}/deepin/desktop-version
%exclude %{_localstatedir}/uos/os-license
%files -n license-config
%{_sysconfdir}/.uos/os-license
%{_sysconfdir}/os-version
%changelog
* Sat May 06 2023 liweiganga <liweiganga@uniontech.com> - 2020.03.23-5
- compliance modification of regional and textual titles
* Fri Jun 10 2022 liweigang <liweiganga@uniontech.com> - 2022.01.27-1.03
- rebrand: add dde.conf and add patches
* Sat Jun 05 2021 weidong <weidong@uniontech.com> - 2020.03.23-4
- Fix installation dependency errors
* Tue Feb 23 2021 weidong <weidong@uniontech.com> - 2020.03.23-3
- Update deepin-version
* Sat Dec 05 2020 weidong <weidong@uniontech.com> - 2020.03.23-2
- fix logo
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 2020.03.23-1
- Package init
* Fri Jun 10 2022 uoser <uoser@uniontech.com> - 2022.01.27-1.02
- package init