packages/deepin-desktop-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!41 Add riscv64 support

Browse Source 
From: @misaka00251 
Reviewed-by: @weidongkl, @leeffo 
Signed-off-by: @leeffo
This commit is contained in:
openeuler-ci-bot 2023-08-18 08:46:10 +00:00 committed by Gitee
commit 982030ab27
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 113 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
1000-add-riscv64-support.patch Normal file
View File

@ -0,0 +1,106 @@
From 9a2f64700106bfa3c54c780cdbc2bcab39eaddc2 Mon Sep 17 00:00:00 2001
From: misaka00251 <liuxin@iscas.ac.cn>
Date: Fri, 18 Aug 2023 15:13:05 +0800
Subject: [PATCH] Add riscv64 support
---
Makefile | 6 +++++-
files/desktop-version-riscv64-server.in | 9 +++++++++
files/desktop-version-riscv64.in | 9 +++++++++
files/os-license-riscv64 | 10 ++++++++++
files/os-version-riscv64 | 10 ++++++++++
5 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 files/desktop-version-riscv64-server.in
create mode 100644 files/desktop-version-riscv64.in
create mode 100644 files/os-license-riscv64
create mode 100644 files/os-version-riscv64
diff --git a/Makefile b/Makefile
index 3f703d1..03e2908 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,11 @@ build:
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongarch-server.in > files/desktop-version-server
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-loongarch > files/os-license
sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-loongarch > files/os-version
+ else ifeq (${ARCH_BUILD}, riscv64)
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv64.in > files/desktop-version
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-riscv64-server.in > files/desktop-version-server
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-license-riscv64 > files/os-license
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/os-version-riscv64 > files/os-version
endif
sed -e "s|@@VERSION@@|20|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/lsb-release.in > files/lsb-release
@@ -66,7 +71,6 @@ install:
install -Dm644 files/i18n_dependent.json ${DESTDIR}/usr/share/i18n/i18n_dependent.json
install -Dm644 files/language_info.json ${DESTDIR}/usr/share/i18n/language_info.json
install -Dm644 files/desktop-version ${DESTDIR}/usr/lib/deepin/desktop-version
- install -Dm644 files/os-license ${DESTDIR}/var/uos/os-license
install -Dm644 files/os-version ${DESTDIR}/etc/os-version
install -Dm644 files/lsb-release ${DESTDIR}/etc/lsb-release
install -Dm644 files/appstore.json ${DESTDIR}/etc/appstore.json
diff --git a/files/desktop-version-riscv64-server.in b/files/desktop-version-riscv64-server.in
new file mode 100644
index 0000000..e66b575
--- /dev/null
+++ b/files/desktop-version-riscv64-server.in
@@ -0,0 +1,9 @@
+[Release]
+Version=@@VERSION@@
+Type=Server
+Type[zh_CN]=服务器版
+Edition=Y2020E0002
+Copyright=Y2020CR002
+[Addition]
+Milestone=@@RELEASE@@
+Buildid=build1
diff --git a/files/desktop-version-riscv64.in b/files/desktop-version-riscv64.in
new file mode 100644
index 0000000..be95de2
--- /dev/null
+++ b/files/desktop-version-riscv64.in
@@ -0,0 +1,9 @@
+[Release]
+Version=@@VERSION@@
+Type=Desktop
+Type[zh_CN]=社区版
+Edition=Y2020E0001
+Copyright=Y2020CR001
+[Addition]
+Milestone=@@RELEASE@@
+Buildid=build1
diff --git a/files/os-license-riscv64 b/files/os-license-riscv64
new file mode 100644
index 0000000..f972246
--- /dev/null
+++ b/files/os-license-riscv64
@@ -0,0 +1,10 @@
+[UOS-System]
+product_id=AAAZAA
+product_name=桌面
+instruction_type=RISCV64
+version=20
+minor_version=1030
+build_id=103
+system_cn=专业版
+system_en=Professional
+server_sum=ffffffffffffffffffffffffffffffff
diff --git a/files/os-version-riscv64 b/files/os-version-riscv64
new file mode 100644
index 0000000..9566c1d
--- /dev/null
+++ b/files/os-version-riscv64
@@ -0,0 +1,10 @@
+[Version]
+SystemName=deepin
+SystemName[zh_CN]=深度操作系统
+ProductType=Desktop
+ProductType[zh_CN]=桌面
+EditionName=Community
+EditionName[zh_CN]=社区版
+MajorVersion=20
+MinorVersion=1030
+OsBuild=11014.103
--
2.39.2 (Apple Git-143)

8
deepin-desktop-base.spec
View File

@ -2,7 +2,7 @@
Name: deepin-desktop-base
Version: 2022.01.27
Release: 4
Release: 5
Summary: Base files for Deepin Desktop
License: GPLv3
URL: https://github.com/linuxdeepin/deepin-desktop-base
@ -10,6 +10,9 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-compliance-modification-of-regional-and-textual-titl.patch
Patch1: 0001-fix-logo.patch
Patch2: 0001-add-loongarch64-support-for-deepin-desktop-base.patch
%ifarch riscv64
Patch3: 1000-add-riscv64-support.patch
%endif
%description
%{summary}.
@ -76,6 +79,9 @@ ln -sfv %{_datadir}/deepin/desktop-version-server %{buildroot}%{_sysconfdir}/dee
%exclude %{_sysconfdir}/os-version
%changelog
* Fri Aug 18 2023 misaka00251 <liuxin@iscas.ac.cn> - 2022.01.27-5
- Add riscv64 support
* Fri Jun 9 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 2022.01.27-4
- fix build error for loongarch64