From 8b2ac4ccf3325dc4ae0b6d861884edc2a738b08f Mon Sep 17 00:00:00 2001 From: zhuhongbo Date: Fri, 20 Mar 2026 14:14:22 +0800 Subject: [PATCH] update licenses --- ...Modify-product-infomation-for-Anolis.patch | 115 --------- 0001-change-desktop-logo.patch | 45 ---- 0001-change-logo.patch | 105 -------- 0002-adapt-E.patch | 203 ---------------- 0003-adapt-A.patch | 72 +++--- 0004-change-distribution-logos.patch | 128 ++++++++++ 0005-update-license-files.patch | 226 ++++++++++++++++++ 0006-adapt-sw_64.patch | 64 +++++ 0007-update-licenses-for-V25.patch | 55 +++++ 0008-change-control-center-svg.patch | 39 +++ 0009-update-licenses-for-V25.patch | 22 ++ ...atch => 0010-change-Version-20-to-25.patch | 16 +- 0011-update-license.patch | 25 ++ 0012-update-licenses-for-2510.patch | 127 ++++++++++ dde.conf | 1 + deepin-desktop-base.spec | 131 +++++++--- license_config.tar.gz | Bin 0 -> 20480 bytes 17 files changed, 825 insertions(+), 549 deletions(-) delete mode 100644 0001-Modify-product-infomation-for-Anolis.patch delete mode 100644 0001-change-desktop-logo.patch delete mode 100644 0001-change-logo.patch delete mode 100644 0002-adapt-E.patch create mode 100644 0004-change-distribution-logos.patch create mode 100644 0005-update-license-files.patch create mode 100644 0006-adapt-sw_64.patch create mode 100644 0007-update-licenses-for-V25.patch create mode 100644 0008-change-control-center-svg.patch create mode 100644 0009-update-licenses-for-V25.patch rename 0002-change-Version-20-to-23.patch => 0010-change-Version-20-to-25.patch (69%) create mode 100644 0011-update-license.patch create mode 100644 0012-update-licenses-for-2510.patch create mode 100644 license_config.tar.gz diff --git a/0001-Modify-product-infomation-for-Anolis.patch b/0001-Modify-product-infomation-for-Anolis.patch deleted file mode 100644 index 8b9cf1f..0000000 --- a/0001-Modify-product-infomation-for-Anolis.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 7d860ee9f6c6ae48cf430bbe59f22f099185dd73 Mon Sep 17 00:00:00 2001 -From: yangxianzhao -Date: Mon, 18 Mar 2024 10:14:14 +0800 -Subject: [PATCH] Modify product infomation for Anolis - ---- - files/os-version-amd64-A | 10 ++++------ - files/os-version-arm64-A | 12 +++++------- - files/os-version-loongarch64-A | 12 +++++------- - files/os-version-mips | 12 +++++------- - files/os-version-sw | 12 +++++------- - 5 files changed, 24 insertions(+), 34 deletions(-) - -diff --git a/files/os-version-amd64-A b/files/os-version-amd64-A -index 1db9c9a..60546a0 100644 ---- a/files/os-version-amd64-A -+++ b/files/os-version-amd64-A -@@ -1,10 +1,8 @@ - [Version] --SystemName=UOS Server --SystemName[zh_CN]=统信服务器操作系统 -+SystemName=Anolis OS -+SystemName[zh_CN]=龙蜥操作系统 - ProductType=Server - ProductType[zh_CN]=服务器 --EditionName=a --EditionName[zh_CN]=a --MajorVersion=20 --MinorVersion=1060 -+MajorVersion=23 -+MinorVersion=23.4 - OsBuild=12028.101.100 -diff --git a/files/os-version-arm64-A b/files/os-version-arm64-A -index ad5a66c..60546a0 100644 ---- a/files/os-version-arm64-A -+++ b/files/os-version-arm64-A -@@ -1,10 +1,8 @@ - [Version] --SystemName=UOS Server --SystemName[zh_CN]=统信服务器操作系统 -+SystemName=Anolis OS -+SystemName[zh_CN]=龙蜥操作系统 - ProductType=Server - ProductType[zh_CN]=服务器 --EditionName=a --EditionName[zh_CN]=a --MajorVersion=20 --MinorVersion=1060 --OsBuild=12024.101.100 -+MajorVersion=23 -+MinorVersion=23.4 -+OsBuild=12028.101.100 -diff --git a/files/os-version-loongarch64-A b/files/os-version-loongarch64-A -index 729bce6..60546a0 100644 ---- a/files/os-version-loongarch64-A -+++ b/files/os-version-loongarch64-A -@@ -1,10 +1,8 @@ - [Version] --SystemName=UOS Server --SystemName[zh_CN]=统信服务器操作系统 -+SystemName=Anolis OS -+SystemName[zh_CN]=龙蜥操作系统 - ProductType=Server - ProductType[zh_CN]=服务器 --EditionName=a --EditionName[zh_CN]=a --MajorVersion=20 --MinorVersion=1060 --OsBuild=12023.101.100 -+MajorVersion=23 -+MinorVersion=23.4 -+OsBuild=12028.101.100 -diff --git a/files/os-version-mips b/files/os-version-mips -index b6f49cb..60546a0 100644 ---- a/files/os-version-mips -+++ b/files/os-version-mips -@@ -1,10 +1,8 @@ - [Version] --SystemName=UnionTech OS Server --SystemName[zh_CN]=统信服务器操作系统 -+SystemName=Anolis OS -+SystemName[zh_CN]=龙蜥操作系统 - ProductType=Server - ProductType[zh_CN]=服务器 --EditionName=e --EditionName[zh_CN]=e --MajorVersion=20 --MinorVersion=1020 --OsBuild=12034.102 -+MajorVersion=23 -+MinorVersion=23.4 -+OsBuild=12028.101.100 -diff --git a/files/os-version-sw b/files/os-version-sw -index b6f49cb..60546a0 100644 ---- a/files/os-version-sw -+++ b/files/os-version-sw -@@ -1,10 +1,8 @@ - [Version] --SystemName=UnionTech OS Server --SystemName[zh_CN]=统信服务器操作系统 -+SystemName=Anolis OS -+SystemName[zh_CN]=龙蜥操作系统 - ProductType=Server - ProductType[zh_CN]=服务器 --EditionName=e --EditionName[zh_CN]=e --MajorVersion=20 --MinorVersion=1020 --OsBuild=12034.102 -+MajorVersion=23 -+MinorVersion=23.4 -+OsBuild=12028.101.100 --- -2.31.1 - diff --git a/0001-change-desktop-logo.patch b/0001-change-desktop-logo.patch deleted file mode 100644 index 433c734..0000000 --- a/0001-change-desktop-logo.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 81ba47e72041b58ca30a72943ae6803c61e02ce2 Mon Sep 17 00:00:00 2001 -From: yangxianzhao -Date: Tue, 26 Mar 2024 14:12:00 +0800 -Subject: [PATCH] change desktop logo - ---- - files/uos_logo.svg | 27 ++++++++++++++++++--------- - 1 file changed, 18 insertions(+), 9 deletions(-) - -diff --git a/files/uos_logo.svg b/files/uos_logo.svg -index 61d3400..96d9140 100644 ---- a/files/uos_logo.svg -+++ b/files/uos_logo.svg -@@ -1,9 +1,18 @@ -- -- -- uos_logo -- -- -\ No newline at end of file -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.31.1 - diff --git a/0001-change-logo.patch b/0001-change-logo.patch deleted file mode 100644 index 2f6adbb..0000000 --- a/0001-change-logo.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 2bfc36202cec50fe52d5d1860ac629f9e996c90c Mon Sep 17 00:00:00 2001 -From: yangxianzhao -Date: Mon, 18 Mar 2024 17:29:19 +0800 -Subject: [PATCH] change logo - ---- - distribution/distribution_logo.svg | 25 +++++++---------- - distribution/distribution_logo_light.svg | 21 ++++++++------- - .../distribution_logo_transparent.svg | 27 ++++++++++++------- - 3 files changed, 40 insertions(+), 33 deletions(-) - -diff --git a/distribution/distribution_logo.svg b/distribution/distribution_logo.svg -index 6da3f7c..1cfa2bb 100644 ---- a/distribution/distribution_logo.svg -+++ b/distribution/distribution_logo.svg -@@ -1,15 +1,10 @@ -- -- -- 形状结合 -- -- -- -- -- -- -- -- -- -- -- -- -\ No newline at end of file -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/distribution/distribution_logo_light.svg b/distribution/distribution_logo_light.svg -index 37c4ff1..f9568fc 100644 ---- a/distribution/distribution_logo_light.svg -+++ b/distribution/distribution_logo_light.svg -@@ -1,9 +1,12 @@ -- -- -- distribution_logo_light -- -- -- -- -- -- -\ No newline at end of file -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/distribution/distribution_logo_transparent.svg b/distribution/distribution_logo_transparent.svg -index 28de18c..96d9140 100644 ---- a/distribution/distribution_logo_transparent.svg -+++ b/distribution/distribution_logo_transparent.svg -@@ -1,9 +1,18 @@ -- -- -- 桌面水印 -- -- -- -- -- -- -\ No newline at end of file -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.31.1 - diff --git a/0002-adapt-E.patch b/0002-adapt-E.patch deleted file mode 100644 index 6b2343e..0000000 --- a/0002-adapt-E.patch +++ /dev/null @@ -1,203 +0,0 @@ -From a42ff0b7193c0eea1fc2d9996638122f5635d8ce Mon Sep 17 00:00:00 2001 -From: leeffo -Date: Thu, 1 Jun 2023 10:19:21 +0800 -Subject: [PATCH] adapt E - ---- - Makefile | 20 ++++++++++---------- - files/{os-license-amd => os-license-amd64-E} | 4 ++-- - files/{os-license-arm => os-license-arm64-E} | 4 ++-- - files/os-license-sw | 11 ----------- - files/os-license-sw64-E | 11 +++++++++++ - files/{os-version-arm => os-version-amd64-E} | 6 +++--- - files/{os-version-sw => os-version-arm64-E} | 6 +++--- - files/{os-version-amd => os-version-sw64-E} | 6 +++--- - 8 files changed, 34 insertions(+), 34 deletions(-) - rename files/{os-license-amd => os-license-amd64-E} (69%) - rename files/{os-license-arm => os-license-arm64-E} (69%) - delete mode 100644 files/os-license-sw - create mode 100644 files/os-license-sw64-E - rename files/{os-version-arm => os-version-amd64-E} (69%) - rename files/{os-version-sw => os-version-arm64-E} (69%) - rename files/{os-version-amd => os-version-sw64-E} (69%) - -diff --git a/Makefile b/Makefile -index 45f3b8b..85be35f 100644 ---- a/Makefile -+++ b/Makefile -@@ -13,15 +13,15 @@ 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 -@@ -29,11 +29,11 @@ build: - 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/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 69% -rename from files/os-license-amd -rename to files/os-license-amd64-E -index 84972ab..488a261 100644 ---- a/files/os-license-amd -+++ b/files/os-license-amd64-E -@@ -3,9 +3,9 @@ product_id=AJJ8AA - product_name=服务器 - instruction_type=全架构 - version=20 --minor_version=1050 -+minor_version=1060 - build_id=101 - system_cn=e - system_en=e - name_version=v1 --server_sum=c939334f76070ca6fcbc43bd00b2539d -+server_sum=ad3e150d82014c5e38b2102aaeefd6d7 -diff --git a/files/os-license-arm b/files/os-license-arm64-E -similarity index 69% -rename from files/os-license-arm -rename to files/os-license-arm64-E -index 84972ab..488a261 100644 ---- a/files/os-license-arm -+++ b/files/os-license-arm64-E -@@ -3,9 +3,9 @@ product_id=AJJ8AA - product_name=服务器 - instruction_type=全架构 - version=20 --minor_version=1050 -+minor_version=1060 - build_id=101 - system_cn=e - system_en=e - name_version=v1 --server_sum=c939334f76070ca6fcbc43bd00b2539d -+server_sum=ad3e150d82014c5e38b2102aaeefd6d7 -diff --git a/files/os-license-sw b/files/os-license-sw -deleted file mode 100644 -index d9fdb5e..0000000 ---- a/files/os-license-sw -+++ /dev/null -@@ -1,11 +0,0 @@ --[UOS-System] --product_id=AJACAA --product_name=服务器 --instruction_type=SW64 --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-sw64-E b/files/os-license-sw64-E -new file mode 100644 -index 0000000..488a261 ---- /dev/null -+++ b/files/os-license-sw64-E -@@ -0,0 +1,11 @@ -+[UOS-System] -+product_id=AJJ8AA -+product_name=服务器 -+instruction_type=全架构 -+version=20 -+minor_version=1060 -+build_id=101 -+system_cn=e -+system_en=e -+name_version=v1 -+server_sum=ad3e150d82014c5e38b2102aaeefd6d7 -diff --git a/files/os-version-arm b/files/os-version-amd64-E -similarity index 69% -rename from files/os-version-arm -rename to files/os-version-amd64-E -index f50577f..44ce68f 100644 ---- a/files/os-version-arm -+++ b/files/os-version-amd64-E -@@ -1,10 +1,10 @@ - [Version] --SystemName=UnionTech OS Server -+SystemName=UOS Server - SystemName[zh_CN]=统信服务器操作系统 - ProductType=Server - ProductType[zh_CN]=服务器 - EditionName=e - EditionName[zh_CN]=e - MajorVersion=20 --MinorVersion=1050 --OsBuild=12034.101 -+MinorVersion=1060 -+OsBuild=12038.101.100 -diff --git a/files/os-version-sw b/files/os-version-arm64-E -similarity index 69% -rename from files/os-version-sw -rename to files/os-version-arm64-E -index b6f49cb..2ac2da6 100644 ---- a/files/os-version-sw -+++ b/files/os-version-arm64-E -@@ -1,10 +1,10 @@ - [Version] --SystemName=UnionTech OS Server -+SystemName=UOS Server - SystemName[zh_CN]=统信服务器操作系统 - ProductType=Server - ProductType[zh_CN]=服务器 - EditionName=e - EditionName[zh_CN]=e - MajorVersion=20 --MinorVersion=1020 --OsBuild=12034.102 -+MinorVersion=1060 -+OsBuild=12034.101.100 -diff --git a/files/os-version-amd b/files/os-version-sw64-E -similarity index 69% -rename from files/os-version-amd -rename to files/os-version-sw64-E -index 6048f74..def9700 100644 ---- a/files/os-version-amd -+++ b/files/os-version-sw64-E -@@ -1,10 +1,10 @@ - [Version] --SystemName=UnionTech OS Server -+SystemName=UOS Server - SystemName[zh_CN]=统信服务器操作系统 - ProductType=Server - ProductType[zh_CN]=服务器 - EditionName=e - EditionName[zh_CN]=e - MajorVersion=20 --MinorVersion=1050 --OsBuild=12038.101 -+MinorVersion=1060 -+OsBuild=12031.101.100 --- -2.20.1 - diff --git a/0003-adapt-A.patch b/0003-adapt-A.patch index cefc9a5..a0a088e 100644 --- a/0003-adapt-A.patch +++ b/0003-adapt-A.patch @@ -6,22 +6,22 @@ Subject: [PATCH] adapt A --- Makefile | 19 +++++++++++-------- files/os-license-amd | 11 ----------- - files/os-license-amd64-A | 11 +++++++++++ + files/os-license-amd64 | 11 +++++++++++ files/os-license-arm | 11 ----------- - files/os-license-arm64-A | 11 +++++++++++ - files/os-license-loongarch64-A | 11 +++++++++++ - files/{os-version-amd => os-version-amd64-A} | 10 +++++----- - files/{os-version-arm => os-version-arm64-A} | 10 +++++----- - files/os-version-loongarch64-A | 10 ++++++++++ + files/os-license-arm64 | 11 +++++++++++ + files/os-license-loongarch64 | 11 +++++++++++ + files/{os-version-amd => os-version-amd64} | 10 +++++----- + files/{os-version-arm => os-version-arm64} | 10 +++++----- + files/os-version-loongarch64 | 10 ++++++++++ 9 files changed, 64 insertions(+), 40 deletions(-) delete mode 100644 files/os-license-amd - create mode 100644 files/os-license-amd64-A + create mode 100644 files/os-license-amd64 delete mode 100644 files/os-license-arm - create mode 100644 files/os-license-arm64-A - create mode 100644 files/os-license-loongarch64-A - rename files/{os-version-amd => os-version-amd64-A} (54%) - rename files/{os-version-arm => os-version-arm64-A} (54%) - create mode 100644 files/os-version-loongarch64-A + create mode 100644 files/os-license-arm64 + create mode 100644 files/os-license-loongarch64 + rename files/{os-version-amd => os-version-amd64} (54%) + rename files/{os-version-arm => os-version-arm64} (54%) + create mode 100644 files/os-version-loongarch64 diff --git a/Makefile b/Makefile index 45f3b8b..1ab9160 100644 @@ -33,19 +33,19 @@ index 45f3b8b..1ab9160 100644 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 ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd64 > files/os-license ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64 > 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 ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd64 > files/os-license ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64 > 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 ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-amd64 > files/os-license ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd64 > 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 @@ -55,11 +55,11 @@ index 45f3b8b..1ab9160 100644 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-A > files/os-license -+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm64-A > files/os-version ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-arm64 > files/os-license ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm64 > 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 ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-loongarch64 > files/os-license ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loongarch64 > 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 @@ -80,11 +80,11 @@ index 84972ab..0000000 -system_en=e -name_version=v1 -server_sum=c939334f76070ca6fcbc43bd00b2539d -diff --git a/files/os-license-amd64-A b/files/os-license-amd64-A +diff --git a/files/os-license-amd64 b/files/os-license-amd64 new file mode 100644 index 0000000..0d5ed15 --- /dev/null -+++ b/files/os-license-amd64-A ++++ b/files/os-license-amd64 @@ -0,0 +1,11 @@ +[UOS-System] +product_id=AJE8AA @@ -114,11 +114,11 @@ index 84972ab..0000000 -system_en=e -name_version=v1 -server_sum=c939334f76070ca6fcbc43bd00b2539d -diff --git a/files/os-license-arm64-A b/files/os-license-arm64-A +diff --git a/files/os-license-arm64 b/files/os-license-arm64 new file mode 100644 index 0000000..0d5ed15 --- /dev/null -+++ b/files/os-license-arm64-A ++++ b/files/os-license-arm64 @@ -0,0 +1,11 @@ +[UOS-System] +product_id=AJE8AA @@ -131,11 +131,11 @@ index 0000000..0d5ed15 +system_en=a +name_version=v1 +server_sum=3b245699490a4175aec0fab5b0227ea1 -diff --git a/files/os-license-loongarch64-A b/files/os-license-loongarch64-A +diff --git a/files/os-license-loongarch64 b/files/os-license-loongarch64 new file mode 100644 index 0000000..0d5ed15 --- /dev/null -+++ b/files/os-license-loongarch64-A ++++ b/files/os-license-loongarch64 @@ -0,0 +1,11 @@ +[UOS-System] +product_id=AJE8AA @@ -148,13 +148,13 @@ index 0000000..0d5ed15 +system_en=a +name_version=v1 +server_sum=3b245699490a4175aec0fab5b0227ea1 -diff --git a/files/os-version-amd b/files/os-version-amd64-A +diff --git a/files/os-version-amd b/files/os-version-amd64 similarity index 54% rename from files/os-version-amd -rename to files/os-version-amd64-A +rename to files/os-version-amd64 index 6048f74..1db9c9a 100644 --- a/files/os-version-amd -+++ b/files/os-version-amd64-A ++++ b/files/os-version-amd64 @@ -1,10 +1,10 @@ [Version] -SystemName=UnionTech OS Server @@ -171,13 +171,13 @@ index 6048f74..1db9c9a 100644 -OsBuild=12038.101 +MinorVersion=1060 +OsBuild=12028.101.100 -diff --git a/files/os-version-arm b/files/os-version-arm64-A +diff --git a/files/os-version-arm b/files/os-version-arm64 similarity index 54% rename from files/os-version-arm -rename to files/os-version-arm64-A +rename to files/os-version-arm64 index f50577f..ad5a66c 100644 --- a/files/os-version-arm -+++ b/files/os-version-arm64-A ++++ b/files/os-version-arm64 @@ -1,10 +1,10 @@ [Version] -SystemName=UnionTech OS Server @@ -194,11 +194,11 @@ index f50577f..ad5a66c 100644 -OsBuild=12034.101 +MinorVersion=1060 +OsBuild=12024.101.100 -diff --git a/files/os-version-loongarch64-A b/files/os-version-loongarch64-A +diff --git a/files/os-version-loongarch64 b/files/os-version-loongarch64 new file mode 100644 index 0000000..729bce6 --- /dev/null -+++ b/files/os-version-loongarch64-A ++++ b/files/os-version-loongarch64 @@ -0,0 +1,10 @@ +[Version] +SystemName=UOS Server diff --git a/0004-change-distribution-logos.patch b/0004-change-distribution-logos.patch new file mode 100644 index 0000000..75426bc --- /dev/null +++ b/0004-change-distribution-logos.patch @@ -0,0 +1,128 @@ +From 57205412788c664c916c73bfd9779a858de27d6f Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Tue, 6 Jun 2023 17:50:19 +0800 +Subject: [PATCH] change distribution logos + +--- + distribution/distribution_logo.svg | 16 ++++-------- + distribution/distribution_logo_light.svg | 6 ++--- + .../distribution_logo_transparent.svg | 25 +++++++++++++++---- + files/uos_logo.svg | 23 ++++++++++++++--- + 4 files changed, 47 insertions(+), 23 deletions(-) + +diff --git a/distribution/distribution_logo.svg b/distribution/distribution_logo.svg +index 6da3f7c..d2e3c02 100644 +--- a/distribution/distribution_logo.svg ++++ b/distribution/distribution_logo.svg +@@ -1,15 +1,9 @@ + +- +- 形状结合 +- +- +- +- +- +- +- +- +- ++ ++ distribution_logo ++ ++ + + +\ No newline at end of file +diff --git a/distribution/distribution_logo_light.svg b/distribution/distribution_logo_light.svg +index 37c4ff1..9fb4468 100644 +--- a/distribution/distribution_logo_light.svg ++++ b/distribution/distribution_logo_light.svg +@@ -1,9 +1,9 @@ + + + distribution_logo_light +- +- +- ++ ++ ++ + + + +\ No newline at end of file +diff --git a/distribution/distribution_logo_transparent.svg b/distribution/distribution_logo_transparent.svg +index 28de18c..4d5cc59 100644 +--- a/distribution/distribution_logo_transparent.svg ++++ b/distribution/distribution_logo_transparent.svg +@@ -1,9 +1,24 @@ + +- +- 桌面水印 +- +- +- ++ ++ uos_logo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +\ No newline at end of file +diff --git a/files/uos_logo.svg b/files/uos_logo.svg +index 61d3400..4d5cc59 100644 +--- a/files/uos_logo.svg ++++ b/files/uos_logo.svg +@@ -1,9 +1,24 @@ + +- ++ + uos_logo +- +\ No newline at end of file +-- +2.31.1 + diff --git a/0005-update-license-files.patch b/0005-update-license-files.patch new file mode 100644 index 0000000..66513e8 --- /dev/null +++ b/0005-update-license-files.patch @@ -0,0 +1,226 @@ +From 5464bf95ad5c46f7b010105a01c268a3a8bae762 Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Mon, 16 Dec 2024 13:21:06 +0800 +Subject: [PATCH] test + +--- + license_config/aarch64/etc/.uos/os-license | 14 +++++++------- + license_config/aarch64/etc/os-version | 10 +++++----- + license_config/loongarch64/etc/.uos/os-license | 14 +++++++------- + license_config/loongarch64/etc/os-version | 10 +++++----- + license_config/mips64el/etc/.uos/os-license | 14 +++++++------- + license_config/mips64el/etc/os-version | 10 +++++----- + license_config/sw_64/etc/.uos/os-license | 14 +++++++------- + license_config/sw_64/etc/os-version | 10 +++++----- + license_config/x86_64/etc/.uos/os-license | 14 +++++++------- + license_config/x86_64/etc/os-version | 10 +++++----- + 10 files changed, 60 insertions(+), 60 deletions(-) + +diff --git a/license_config/aarch64/etc/.uos/os-license b/license_config/aarch64/etc/.uos/os-license +index 0d5ed15..703100c 100644 +--- a/license_config/aarch64/etc/.uos/os-license ++++ b/license_config/aarch64/etc/.uos/os-license +@@ -1,11 +1,11 @@ + [UOS-System] +-product_id=AJE8AA ++product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 +-version=20 +-minor_version=1060 +-build_id=101 +-system_cn=a +-system_en=a ++version=25 ++minor_version=2500 ++build_id=100 ++system_cn=标准版 ++system_en=Standard + name_version=v1 +-server_sum=3b245699490a4175aec0fab5b0227ea1 ++server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb +diff --git a/license_config/aarch64/etc/os-version b/license_config/aarch64/etc/os-version +index ad5a66c..cc83c7e 100644 +--- a/license_config/aarch64/etc/os-version ++++ b/license_config/aarch64/etc/os-version +@@ -3,8 +3,8 @@ SystemName=UOS Server + SystemName[zh_CN]=统信服务器操作系统 + ProductType=Server + ProductType[zh_CN]=服务器 +-EditionName=a +-EditionName[zh_CN]=a +-MajorVersion=20 +-MinorVersion=1060 +-OsBuild=12024.101.100 ++EditionName=Standard ++EditionName[zh_CN]=标准版 ++MajorVersion=25 ++MinorVersion=2500 ++OsBuild=22184.100.100 +diff --git a/license_config/loongarch64/etc/.uos/os-license b/license_config/loongarch64/etc/.uos/os-license +index 0d5ed15..703100c 100644 +--- a/license_config/loongarch64/etc/.uos/os-license ++++ b/license_config/loongarch64/etc/.uos/os-license +@@ -1,11 +1,11 @@ + [UOS-System] +-product_id=AJE8AA ++product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 +-version=20 +-minor_version=1060 +-build_id=101 +-system_cn=a +-system_en=a ++version=25 ++minor_version=2500 ++build_id=100 ++system_cn=标准版 ++system_en=Standard + name_version=v1 +-server_sum=3b245699490a4175aec0fab5b0227ea1 ++server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb +diff --git a/license_config/loongarch64/etc/os-version b/license_config/loongarch64/etc/os-version +index 729bce6..29da698 100644 +--- a/license_config/loongarch64/etc/os-version ++++ b/license_config/loongarch64/etc/os-version +@@ -3,8 +3,8 @@ SystemName=UOS Server + SystemName[zh_CN]=统信服务器操作系统 + ProductType=Server + ProductType[zh_CN]=服务器 +-EditionName=a +-EditionName[zh_CN]=a +-MajorVersion=20 +-MinorVersion=1060 +-OsBuild=12023.101.100 ++EditionName=Standard ++EditionName[zh_CN]=标准版 ++MajorVersion=25 ++MinorVersion=2500 ++OsBuild=22183.100.100 +diff --git a/license_config/mips64el/etc/.uos/os-license b/license_config/mips64el/etc/.uos/os-license +index 488a261..703100c 100644 +--- a/license_config/mips64el/etc/.uos/os-license ++++ b/license_config/mips64el/etc/.uos/os-license +@@ -1,11 +1,11 @@ + [UOS-System] +-product_id=AJJ8AA ++product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 +-version=20 +-minor_version=1060 +-build_id=101 +-system_cn=e +-system_en=e ++version=25 ++minor_version=2500 ++build_id=100 ++system_cn=标准版 ++system_en=Standard + name_version=v1 +-server_sum=ad3e150d82014c5e38b2102aaeefd6d7 ++server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb +diff --git a/license_config/mips64el/etc/os-version b/license_config/mips64el/etc/os-version +index 44ce68f..204ef65 100644 +--- a/license_config/mips64el/etc/os-version ++++ b/license_config/mips64el/etc/os-version +@@ -3,8 +3,8 @@ SystemName=UOS Server + SystemName[zh_CN]=统信服务器操作系统 + ProductType=Server + ProductType[zh_CN]=服务器 +-EditionName=e +-EditionName[zh_CN]=e +-MajorVersion=20 +-MinorVersion=1060 +-OsBuild=12038.101.100 ++EditionName=Standard ++EditionName[zh_CN]=标准版 ++MajorVersion=25 ++MinorVersion=2500 ++OsBuild=22182.100.100 +diff --git a/license_config/sw_64/etc/.uos/os-license b/license_config/sw_64/etc/.uos/os-license +index 488a261..703100c 100644 +--- a/license_config/sw_64/etc/.uos/os-license ++++ b/license_config/sw_64/etc/.uos/os-license +@@ -1,11 +1,11 @@ + [UOS-System] +-product_id=AJJ8AA ++product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 +-version=20 +-minor_version=1060 +-build_id=101 +-system_cn=e +-system_en=e ++version=25 ++minor_version=2500 ++build_id=100 ++system_cn=标准版 ++system_en=Standard + name_version=v1 +-server_sum=ad3e150d82014c5e38b2102aaeefd6d7 ++server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb +diff --git a/license_config/sw_64/etc/os-version b/license_config/sw_64/etc/os-version +index 2ac2da6..96a7bcc 100644 +--- a/license_config/sw_64/etc/os-version ++++ b/license_config/sw_64/etc/os-version +@@ -3,8 +3,8 @@ SystemName=UOS Server + SystemName[zh_CN]=统信服务器操作系统 + ProductType=Server + ProductType[zh_CN]=服务器 +-EditionName=e +-EditionName[zh_CN]=e +-MajorVersion=20 +-MinorVersion=1060 +-OsBuild=12034.101.100 ++EditionName=Standard ++EditionName[zh_CN]=标准版 ++MajorVersion=25 ++MinorVersion=2500 ++OsBuild=22181.100.100 +diff --git a/license_config/x86_64/etc/.uos/os-license b/license_config/x86_64/etc/.uos/os-license +index 0d5ed15..703100c 100644 +--- a/license_config/x86_64/etc/.uos/os-license ++++ b/license_config/x86_64/etc/.uos/os-license +@@ -1,11 +1,11 @@ + [UOS-System] +-product_id=AJE8AA ++product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 +-version=20 +-minor_version=1060 +-build_id=101 +-system_cn=a +-system_en=a ++version=25 ++minor_version=2500 ++build_id=100 ++system_cn=标准版 ++system_en=Standard + name_version=v1 +-server_sum=3b245699490a4175aec0fab5b0227ea1 ++server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb +diff --git a/license_config/x86_64/etc/os-version b/license_config/x86_64/etc/os-version +index 1db9c9a..9a6759b 100644 +--- a/license_config/x86_64/etc/os-version ++++ b/license_config/x86_64/etc/os-version +@@ -3,8 +3,8 @@ SystemName=UOS Server + SystemName[zh_CN]=统信服务器操作系统 + ProductType=Server + ProductType[zh_CN]=服务器 +-EditionName=a +-EditionName[zh_CN]=a +-MajorVersion=20 +-MinorVersion=1060 +-OsBuild=12028.101.100 ++EditionName=Standard ++EditionName[zh_CN]=标准版 ++MajorVersion=25 ++MinorVersion=2500 ++OsBuild=22188.100.100 +-- +2.39.3 + diff --git a/0006-adapt-sw_64.patch b/0006-adapt-sw_64.patch new file mode 100644 index 0000000..5f87320 --- /dev/null +++ b/0006-adapt-sw_64.patch @@ -0,0 +1,64 @@ +From 49cf0f1fab62550a7b54d2b32391e7c5fd1e74b2 Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Mon, 16 Dec 2024 13:38:04 +0800 +Subject: [PATCH] adapt sw64 + +--- + Makefile | 4 ++-- + files/os-license-sw64 | 11 +++++++++++ + files/os-version-sw64 | 10 ++++++++++ + 3 files changed, 23 insertions(+), 2 deletions(-) + create mode 100644 files/os-license-sw64 + create mode 100644 files/os-version-sw64 + +diff --git a/Makefile b/Makefile +index b3343ee..b4651cf 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,8 +29,8 @@ build: + 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/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 > files/os-license ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-sw64 > files/os-version + else ifeq (${ARCH_BUILD}, aarch64) + sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-arm64 > files/os-license + sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-arm64 > files/os-version +diff --git a/files/os-license-sw64 b/files/os-license-sw64 +new file mode 100644 +index 0000000..703100c +--- /dev/null ++++ b/files/os-license-sw64 +@@ -0,0 +1,11 @@ ++[UOS-System] ++product_id=SJ68AA ++product_name=服务器 ++instruction_type=全架构 ++version=25 ++minor_version=2500 ++build_id=100 ++system_cn=标准版 ++system_en=Standard ++name_version=v1 ++server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb +diff --git a/files/os-version-sw64 b/files/os-version-sw64 +new file mode 100644 +index 0000000..96a7bcc +--- /dev/null ++++ b/files/os-version-sw64 +@@ -0,0 +1,10 @@ ++[Version] ++SystemName=UOS Server ++SystemName[zh_CN]=统信服务器操作系统 ++ProductType=Server ++ProductType[zh_CN]=服务器 ++EditionName=Standard ++EditionName[zh_CN]=标准版 ++MajorVersion=25 ++MinorVersion=2500 ++OsBuild=22181.100.100 +-- +2.39.3 + diff --git a/0007-update-licenses-for-V25.patch b/0007-update-licenses-for-V25.patch new file mode 100644 index 0000000..51f73d1 --- /dev/null +++ b/0007-update-licenses-for-V25.patch @@ -0,0 +1,55 @@ +From a7f75b2af16cbe50226b2690ddf73e1b660bafa3 Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Mon, 6 Jan 2025 11:38:22 +0800 +Subject: [PATCH] update licenses for V25 + +--- + license_config/aarch64/etc/os-version | 2 +- + license_config/loongarch64/etc/os-version | 2 +- + license_config/sw_64/etc/os-version | 2 +- + license_config/x86_64/etc/os-version | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/license_config/aarch64/etc/os-version b/license_config/aarch64/etc/os-version +index cc83c7e..a6f1c58 100644 +--- a/license_config/aarch64/etc/os-version ++++ b/license_config/aarch64/etc/os-version +@@ -7,4 +7,4 @@ EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 + MinorVersion=2500 +-OsBuild=22184.100.100 ++OsBuild=22084.100.100 +diff --git a/license_config/loongarch64/etc/os-version b/license_config/loongarch64/etc/os-version +index 29da698..6c460f7 100644 +--- a/license_config/loongarch64/etc/os-version ++++ b/license_config/loongarch64/etc/os-version +@@ -7,4 +7,4 @@ EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 + MinorVersion=2500 +-OsBuild=22183.100.100 ++OsBuild=22083.100.100 +diff --git a/license_config/sw_64/etc/os-version b/license_config/sw_64/etc/os-version +index 96a7bcc..f686541 100644 +--- a/license_config/sw_64/etc/os-version ++++ b/license_config/sw_64/etc/os-version +@@ -7,4 +7,4 @@ EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 + MinorVersion=2500 +-OsBuild=22181.100.100 ++OsBuild=22081.100.100 +diff --git a/license_config/x86_64/etc/os-version b/license_config/x86_64/etc/os-version +index 9a6759b..1032095 100644 +--- a/license_config/x86_64/etc/os-version ++++ b/license_config/x86_64/etc/os-version +@@ -7,4 +7,4 @@ EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 + MinorVersion=2500 +-OsBuild=22188.100.100 ++OsBuild=22088.100.100 +-- +2.39.3 + diff --git a/0008-change-control-center-svg.patch b/0008-change-control-center-svg.patch new file mode 100644 index 0000000..f437b67 --- /dev/null +++ b/0008-change-control-center-svg.patch @@ -0,0 +1,39 @@ +From ac2d5a8b118f73bc087c9a223a8797abc1ef3aea Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Thu, 9 Jan 2025 09:42:21 +0800 +Subject: [PATCH] change control center svg + +--- + distribution/distribution_logo.svg | 2 +- + distribution/distribution_logo_light.svg | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/distribution/distribution_logo.svg b/distribution/distribution_logo.svg +index d2e3c02..5e221b4 100644 +--- a/distribution/distribution_logo.svg ++++ b/distribution/distribution_logo.svg +@@ -2,7 +2,7 @@ + + distribution_logo + +- +diff --git a/distribution/distribution_logo_light.svg b/distribution/distribution_logo_light.svg +index 9fb4468..1555a55 100644 +--- a/distribution/distribution_logo_light.svg ++++ b/distribution/distribution_logo_light.svg +@@ -2,7 +2,7 @@ + + distribution_logo_light + +- ++ + + + +-- +2.39.3 + diff --git a/0009-update-licenses-for-V25.patch b/0009-update-licenses-for-V25.patch new file mode 100644 index 0000000..b409421 --- /dev/null +++ b/0009-update-licenses-for-V25.patch @@ -0,0 +1,22 @@ +From 6809fc65620634b0217904b7de812dfba95493b9 Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Mon, 7 Jul 2025 10:25:18 +0800 +Subject: [PATCH] update licenses for V25 + +--- + license_config/mips64el/etc/os-version | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/license_config/mips64el/etc/os-version b/license_config/mips64el/etc/os-version +index 204ef65..897421c 100644 +--- a/license_config/mips64el/etc/os-version ++++ b/license_config/mips64el/etc/os-version +@@ -7,4 +7,4 @@ EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 + MinorVersion=2500 +-OsBuild=22182.100.100 ++OsBuild=22082.100.100 +-- +2.43.5 + diff --git a/0002-change-Version-20-to-23.patch b/0010-change-Version-20-to-25.patch similarity index 69% rename from 0002-change-Version-20-to-23.patch rename to 0010-change-Version-20-to-25.patch index 30c6c30..c733350 100644 --- a/0002-change-Version-20-to-23.patch +++ b/0010-change-Version-20-to-25.patch @@ -1,19 +1,19 @@ -From 502f950df6a68ca5554d78f5802edddaab59534e Mon Sep 17 00:00:00 2001 -From: pangqing -Date: Wed, 3 Dec 2025 16:14:25 +0800 -Subject: [PATCH] change Version 20 to 23 +From d6851f62c570077591fb2588117b0406c1ecb544 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Fri, 15 Aug 2025 15:55:43 +0800 +Subject: [PATCH] change Version 20 to 25 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 1ab9160..da3b1cc 100644 +index b4651cf..f4317ac 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION := 20 -+VERSION := 23 ++VERSION := 25 RELEASE := ARCH_BUILD :=$(shell uname -m) @@ -22,10 +22,10 @@ index 1ab9160..da3b1cc 100644 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 -+ sed -e "s|@@VERSION@@|23|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/lsb-release.in > files/lsb-release ++ sed -e "s|@@VERSION@@|25|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/lsb-release.in > files/lsb-release install: mkdir -p ${DESTDIR}/etc -- -2.43.5 +2.43.0 diff --git a/0011-update-license.patch b/0011-update-license.patch new file mode 100644 index 0000000..99d6214 --- /dev/null +++ b/0011-update-license.patch @@ -0,0 +1,25 @@ +From 342da89cc4f3bef135d59883695e7d5c5355c04c Mon Sep 17 00:00:00 2001 +From: maqi +Date: Tue, 19 Aug 2025 13:07:30 +0800 +Subject: [PATCH] update license + +--- + rpm/deepin-desktop-base.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rpm/deepin-desktop-base.spec b/rpm/deepin-desktop-base.spec +index c89d84c..e8cbd1e 100755 +--- a/rpm/deepin-desktop-base.spec ++++ b/rpm/deepin-desktop-base.spec +@@ -4,7 +4,7 @@ Name: deepin-desktop-base + Version: 2022.01.27 + Release: 1 + Summary: Base files for Deepin Desktop +-License: GPLv3 ++License: GPLv3+ + URL: https://github.com/linuxdeepin/deepin-desktop-base + Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + %description +-- +2.39.3 + diff --git a/0012-update-licenses-for-2510.patch b/0012-update-licenses-for-2510.patch new file mode 100644 index 0000000..2e7b401 --- /dev/null +++ b/0012-update-licenses-for-2510.patch @@ -0,0 +1,127 @@ +From beca027fe6d937fbff3bd9c915d516806c8b1748 Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Tue, 6 Jan 2026 11:15:16 +0800 +Subject: [PATCH] update licenses for 2510 + +--- + license_config/aarch64/etc/.uos/os-license | 4 ++-- + license_config/aarch64/etc/os-version | 2 +- + license_config/loongarch64/etc/.uos/os-license | 4 ++-- + license_config/loongarch64/etc/os-version | 2 +- + license_config/sw_64/etc/.uos/os-license | 4 ++-- + license_config/sw_64/etc/os-version | 2 +- + license_config/x86_64/etc/.uos/os-license | 4 ++-- + license_config/x86_64/etc/os-version | 2 +- + 8 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/license_config/aarch64/etc/.uos/os-license b/license_config/aarch64/etc/.uos/os-license +index 703100c..6970ee7 100644 +--- a/license_config/aarch64/etc/.uos/os-license ++++ b/license_config/aarch64/etc/.uos/os-license +@@ -3,9 +3,9 @@ product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 + version=25 +-minor_version=2500 ++minor_version=2510 + build_id=100 + system_cn=标准版 + system_en=Standard + name_version=v1 +-server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb ++server_sum=ff14526c1d05e3debc74bf8b49401944 +diff --git a/license_config/aarch64/etc/os-version b/license_config/aarch64/etc/os-version +index a6f1c58..86fa6b2 100644 +--- a/license_config/aarch64/etc/os-version ++++ b/license_config/aarch64/etc/os-version +@@ -6,5 +6,5 @@ ProductType[zh_CN]=服务器 + EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 +-MinorVersion=2500 ++MinorVersion=2510 + OsBuild=22084.100.100 +diff --git a/license_config/loongarch64/etc/.uos/os-license b/license_config/loongarch64/etc/.uos/os-license +index 703100c..6970ee7 100644 +--- a/license_config/loongarch64/etc/.uos/os-license ++++ b/license_config/loongarch64/etc/.uos/os-license +@@ -3,9 +3,9 @@ product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 + version=25 +-minor_version=2500 ++minor_version=2510 + build_id=100 + system_cn=标准版 + system_en=Standard + name_version=v1 +-server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb ++server_sum=ff14526c1d05e3debc74bf8b49401944 +diff --git a/license_config/loongarch64/etc/os-version b/license_config/loongarch64/etc/os-version +index 6c460f7..79c95bc 100644 +--- a/license_config/loongarch64/etc/os-version ++++ b/license_config/loongarch64/etc/os-version +@@ -6,5 +6,5 @@ ProductType[zh_CN]=服务器 + EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 +-MinorVersion=2500 ++MinorVersion=2510 + OsBuild=22083.100.100 +diff --git a/license_config/sw_64/etc/.uos/os-license b/license_config/sw_64/etc/.uos/os-license +index 703100c..6970ee7 100644 +--- a/license_config/sw_64/etc/.uos/os-license ++++ b/license_config/sw_64/etc/.uos/os-license +@@ -3,9 +3,9 @@ product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 + version=25 +-minor_version=2500 ++minor_version=2510 + build_id=100 + system_cn=标准版 + system_en=Standard + name_version=v1 +-server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb ++server_sum=ff14526c1d05e3debc74bf8b49401944 +diff --git a/license_config/sw_64/etc/os-version b/license_config/sw_64/etc/os-version +index f686541..f5bbe86 100644 +--- a/license_config/sw_64/etc/os-version ++++ b/license_config/sw_64/etc/os-version +@@ -6,5 +6,5 @@ ProductType[zh_CN]=服务器 + EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 +-MinorVersion=2500 ++MinorVersion=2510 + OsBuild=22081.100.100 +diff --git a/license_config/x86_64/etc/.uos/os-license b/license_config/x86_64/etc/.uos/os-license +index 703100c..6970ee7 100644 +--- a/license_config/x86_64/etc/.uos/os-license ++++ b/license_config/x86_64/etc/.uos/os-license +@@ -3,9 +3,9 @@ product_id=SJ68AA + product_name=服务器 + instruction_type=全架构 + version=25 +-minor_version=2500 ++minor_version=2510 + build_id=100 + system_cn=标准版 + system_en=Standard + name_version=v1 +-server_sum=1f5184ff9d3af79d2e7c15103e5a5cfb ++server_sum=ff14526c1d05e3debc74bf8b49401944 +diff --git a/license_config/x86_64/etc/os-version b/license_config/x86_64/etc/os-version +index 1032095..b35a192 100644 +--- a/license_config/x86_64/etc/os-version ++++ b/license_config/x86_64/etc/os-version +@@ -6,5 +6,5 @@ ProductType[zh_CN]=服务器 + EditionName=Standard + EditionName[zh_CN]=标准版 + MajorVersion=25 +-MinorVersion=2500 ++MinorVersion=2510 + OsBuild=22088.100.100 +-- +2.43.5 + diff --git a/dde.conf b/dde.conf index 79c4309..02287de 100644 --- a/dde.conf +++ b/dde.conf @@ -10,3 +10,4 @@ MONOTONE_CHARACTER_NUM = 0 CONSECUTIVE_SAME_CHARACTER_NUM = 0 DICT_PATH = FIRST_LETTER_UPPERCASE = false +PASSWORD_PART_OF_USERNAME = false diff --git a/deepin-desktop-base.spec b/deepin-desktop-base.spec index e0f8cbb..66d3d40 100644 --- a/deepin-desktop-base.spec +++ b/deepin-desktop-base.spec @@ -1,18 +1,18 @@ -%define anolis_release 4 %global debug_package %{nil} %global source_version 2022.01.27 Name: deepin-desktop-base -Version: 2023.04.21 -Release: 1.%{anolis_release}%{?dist} +Version: 2026.02.27 +Release: 1%{?dist}.17 Summary: Base files for Deepin Desktop -License: GPLv3 +License: GPLv3+ URL: https://github.com/linuxdeepin/deepin-desktop-base Source0: %{url}/archive/%{version}/%{name}-%{source_version}.tar.gz Source1: dde.conf +Source2: license_config.tar.gz Patch1: 0001-fix-unified-use-desktop-version-server.in.patch -Patch2: 0002-adapt-E.patch +#Patch2: 0002-adapt-E.patch Patch3: 0003-adapt-A.patch #add for uos @@ -21,11 +21,15 @@ Patch4: compliance-modification-of-regional-and-textual-titl.patch # compliance Patch5: 0001-feat-modify-uniontech-os-to-UOS-for-lsb-release.patch Patch6: 0002-feat-uniontech-os.patch - -Patch7: 0001-Modify-product-infomation-for-Anolis.patch -Patch8: 0001-change-logo.patch -Patch9: 0001-change-desktop-logo.patch -Patch10: 0002-change-Version-20-to-23.patch +Patch7: 0004-change-distribution-logos.patch +Patch8: 0005-update-license-files.patch +Patch9: 0006-adapt-sw_64.patch +Patch10: 0007-update-licenses-for-V25.patch +Patch11: 0008-change-control-center-svg.patch +Patch12: 0009-update-licenses-for-V25.patch +Patch13: 0010-change-Version-20-to-25.patch +Patch14: 0011-update-license.patch +Patch15: 0012-update-licenses-for-2510.patch %description %{summary}. @@ -40,15 +44,21 @@ Recommends: deepin-screensaver %description -n deepin-desktop-server %{summary}. +%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 -%setup -q -n %{name}-%{source_version} +%setup -q -n %{name}-%{source_version} -a 2 %patch1 -p1 -%if 0%{?openeuler} -%patch2 -p1 -%else +#%if 0%{?openeuler} %patch3 -p1 -%endif +#%else +#%patch2 -p1 +#%endif %patch4 -p1 %patch5 -p1 @@ -57,7 +67,12 @@ Recommends: deepin-screensaver %patch8 -p1 %patch9 -p1 %patch10 -p1 -%ifarch aarch64 x86_64 loongarch64 i386 i686 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%ifarch aarch64 x86_64 loongarch64 i386 i686 sw_64 mips64el short_arch="$( %ifarch aarch64 echo "arm64" @@ -68,6 +83,12 @@ echo "amd64" %ifarch loongarch64 echo "%{_arch}" %endif +%ifarch sw_64 +echo "sw64" +%endif +%ifarch mips64el +echo "mips" +%endif )" long_arch="%{_arch}" @@ -77,7 +98,15 @@ long_arch="x86_64" export short_arch long_arch -branch_name="$(if test "0%{?openeuler}" != "0"; then echo "E"; else echo "A"; fi)" +#%ifnarch sw_64 +#branch_name="$(if test "0%{?openeuler}" != "0"; then echo "A"; else echo "E"; fi)" +#%else +#branch_name="E" +#%endif +%{__cp} -vf "./license_config/${long_arch}/etc/.uos/os-license" \ + "./files/os-license-${short_arch}" +%{__cp} -vf "./license_config/${long_arch}/etc/os-version" \ + "./files/os-version-${short_arch}" %endif %build @@ -98,18 +127,12 @@ install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.co 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 -Dm644 files/os-license %{buildroot}/%{_sysconfdir}/.uos/os-license install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/deepin/dde.conf -%endif %files -n deepin-desktop-server %{_sysconfdir}/deepin-version -%if 0%{?openeuler} -%else %{_sysconfdir}/deepin/dde.conf -%endif %{_datadir}/i18n/*.json %{_datadir}/deepin/distribution.info %{_datadir}/deepin/distribution/ @@ -123,27 +146,61 @@ install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/deepin/dde.conf %{_datadir}/python-apt/templates/Deepin.mirrors %{_datadir}/deepin/dde-desktop-watermask.json %{_sysconfdir}/deepin/dde-session-ui.conf -%{_sysconfdir}/.uos/os-license -%{_sysconfdir}/os-version %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 -* Wed Dec 03 2025 pangqing - 2023.04.21-1.4 -- Change Desktop logo +* Fri Feb 27 2026 zhuhongbo - 2026.02.27-1.17 +- feat: add configuration PASSWORD_PART_OF_USERNAME + +* Tue Jan 06 2026 pangqing - 2026.01.06-1.16 +- feat: update licenses for 2510 + +* Tue Aug 19 2025 maqi - 2025.08.15-1.15 +- spec: update license + +* Fri Aug 15 2025 pangqing - 2025.08.15-1.14 +- feat: change Version 20 to 25 + +* Tue Jul 23 2025 pangqing - 2025.07.22-1.13 +- feat: update mips64el licenses for V25 + +* Mon Jul 07 2025 pangqing - 2025.07.07-1.12 +- feat: update licenses for V25 + +* Thu Jan 09 2025 pangqing - 2025.01.09-1.11 +- fix: change control center svg(bugid:297743) + +* Mon Jan 06 2025 pangqing - 2025.01.06-1.10 +- feat: update license for V25 + +* Mon Dec 16 2024 pangqing - 2024.09.26-1.09 +- feat: add V25 licenses + +* Wed Nov 27 2024 liweigang - 2024.09.26-1.08 +- feat: fix sw_64 build error + +* Thu Sep 26 2024 pangqing - 2024.09.26-1.07 +- rebuild: rebuild for V25 + +* Mon Apr 22 2024 wangce - 2024.04.22-1.07 +- feat: update licenses -* Wed Dec 03 2025 pangqing - 2023.04.21-1.3 -- Modify product infomation to anolis +* Mon Nov 27 2023 pangqing - 2023.11.27-1.06 +- feat: update licenses -* Tue Nov 07 2023 yangxianzhao - 2023.04.21-1.2 -- rebuild for qt +* Thu Nov 23 2023 songmingliang - 2023.11.24-1.05 +- fix: add dde.conf for e in this package(bugid:226167) -* Mon Aug 28 2023 yangxianzhao - 2023.04.21-1.03.1 -- Specification spec file +* Tue Jun 06 2023 pangqing - 2023.06.06-1.04 +- fix: change distribution_logo_transparent.svg(bugid:203265) * Thu Jun 01 2023 leeffo - 2023.04.21-1.03 - rebuild: update license config files @@ -156,16 +213,16 @@ install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/deepin/dde.conf - fix: compliance modification of regional and textual titles(bugid:263149) * Fri Apr 21 2023 yangxiaoxuan - 2023.04.21-1 -- feat: update product version +- feat: update product version to 1060-RC4 * Tue Feb 07 2023 herengui - 2023.02.03-2 -- feat: update product version +- feat: update product version to 1060-RC * Fri Feb 03 2023 liweigang - 2023.02.03-1 - update: update to 2023.02.03 * Wed Feb 01 2023 herengui - 2022.01.27-1.06 -- feat: update product version +- feat: update product version to 1060 * Fri Oct 28 2022 herengui - 2022.01.27-1.05 - feat: update OsBuild number diff --git a/license_config.tar.gz b/license_config.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d600dadb2f79239e8e80bbf6c49e7fcb8d59b281 GIT binary patch literal 20480 zcmeI4%Wl&^6o$R_Q{)8-bDwmPML}$kxJU&yRTVkOv^C15iW6>Y*dVcDg;W)>V~@lJ zAzp^IufZATLYlU=#~lXFDY!CW-@&3)AiWh;GmNI}h zswG)`w;$P8K!s*nb1DfB2xW|mpeC!hndNJalTkFR)q?RLS^ntUao*?Wg8!X^?s@)E zG;ALz;kO-F!1??IBSLa5Eq^W)L;kC1MOW}Qqqe^`;KE-}3j76Q*#B37Kgi%eNH(6C zVGdy)yYuRxdHeouyJ|9wn} zBH@GN);R8V8k7+xZcswuhlGXb|Mx)|{r?6`dAtk)wvQJb|0nt{DJ3}mucC40@rOZR z8dCmlEdNaXXQ26vDGs_1p`iboD2n=DzQ&7}+ySZIm?%FC0f!U$ZpNL)*4;bxt*!Z) zz8w~R>vr5vMne#K(C+5Qiv7u(&!@*a5c>YkPA=IlhO)h(;k_WB^xVUmtG z&33;L&3-rbcl%}YV$UEh9g3RCxYyt%W2}Ak=>+kR^kQ@V~AH z%+>#k{!dGd{;wobr()>;oT_W>f|vULi@Iw1-u|=e{zd&C=iJW!U?m9F|8f7f`sQ{y ze{a?={R15MGnMZDa4lf|kNp26e=pW=&cCq#6B_!z0>QxXzk2#Xux|dZj{eW7*<7vv zUaa4|{}){Uo$5cN|KRxV#IbB}4*%;~zd8R*{lDPYLl8{QcTLH~u2c|J9H#i2SR^zr6oH>Hn6$Kl_*R&m8|3 z_W$%G|C2x(Fy?=*fd60Q|IB6ipT;f!lVkp;Tcf#B|NYs&68bL`$NWz>kR_wD`FpW{ z`TBo}|I-}xza&zpVj2GL?h5li%|iaC$;$tXI^4iRf}J{K2#K~dyxwAzuqZNSucJB| z^FN*NFVFva@nNEb>3YfgpWTVW{*Mq=3n*6#^FLZb`|KNXt!1^!he;J}~Wzhe*)fYx%4PXsm4PXsm4PXsm4gBjh@C&>K B`$GT# literal 0 HcmV?d00001 -- Gitee