diff --git a/0001-add-loongarch64-support-for-deepin-desktop-base.patch b/0001-add-loongarch64-support-for-deepin-desktop-base.patch new file mode 100644 index 0000000000000000000000000000000000000000..17dab0ac951b67420ca1a931e94b43d293ed7d07 --- /dev/null +++ b/0001-add-loongarch64-support-for-deepin-desktop-base.patch @@ -0,0 +1,82 @@ +From 757ef44b45ea8bd1c52ae0f8592412fa7a57f407 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Wed, 31 May 2023 06:13:00 +0000 +Subject: [PATCH] add loongarch64 support for deepin-desktop-base + +--- + Makefile | 5 +++++ + files/desktop-version-loongarch-server.in | 9 +++++++++ + files/os-license-loongarch | 11 +++++++++++ + files/os-version-loongarch | 10 ++++++++++ + 4 files changed, 35 insertions(+) + create mode 100644 files/desktop-version-loongarch-server.in + create mode 100644 files/os-license-loongarch + create mode 100644 files/os-version-loongarch + +diff --git a/Makefile b/Makefile +index d2ab82d..1947995 100644 +--- a/Makefile ++++ b/Makefile +@@ -42,6 +42,11 @@ build: + 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 ++ else ifeq (${ARCH_BUILD}, loongarch64) ++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version-loongarch-server.in > files/desktop-version ++ 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 + endif + sed -e "s|@@VERSION@@|20|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/lsb-release.in > files/lsb-release + sed -e "s|@@VERSION@@|20|g" -e "s|@@RELEASE@@|$(RELEASE)|g" files/device/lsb-release.in > files/device/lsb-release +diff --git a/files/desktop-version-loongarch-server.in b/files/desktop-version-loongarch-server.in +new file mode 100644 +index 0000000..e66b575 +--- /dev/null ++++ b/files/desktop-version-loongarch-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/os-license-loongarch b/files/os-license-loongarch +new file mode 100644 +index 0000000..5dbdae2 +--- /dev/null ++++ b/files/os-license-loongarch +@@ -0,0 +1,11 @@ ++[UOS-System] ++product_id=AJACAA ++product_name=服务器 ++instruction_type=LOONGARCH64 ++version=20 ++minor_version=1020 ++build_id=102 ++system_cn=e ++system_en=e ++name_version=v2 ++server_sum= +diff --git a/files/os-version-loongarch b/files/os-version-loongarch +new file mode 100644 +index 0000000..b6f49cb +--- /dev/null ++++ b/files/os-version-loongarch +@@ -0,0 +1,10 @@ ++[Version] ++SystemName=UnionTech OS Server ++SystemName[zh_CN]=统信服务器操作系统 ++ProductType=Server ++ProductType[zh_CN]=服务器 ++EditionName=e ++EditionName[zh_CN]=e ++MajorVersion=20 ++MinorVersion=1020 ++OsBuild=12034.102 +-- +2.33.0 + diff --git a/deepin-desktop-base.spec b/deepin-desktop-base.spec index 457a581dbcda39bb0a894aa13c1834719ecf2365..e0067c59e478d635951ac3593e6bc84f3e0b6a70 100644 --- a/deepin-desktop-base.spec +++ b/deepin-desktop-base.spec @@ -1,12 +1,13 @@ Name: deepin-desktop-base Version: 2020.09.11 -Release: 2 +Release: 3 Summary: Base files for Deepin Desktop License: GPLv3 URL: https://github.com/linuxdeepin/deepin-desktop-base Source0: %{url}/archive/%{version}/%{name}_%{version}.tar.xz BuildArch: noarch Patch1: 0001-fix-logo.patch +Patch2: 0001-add-loongarch64-support-for-deepin-desktop-base.patch %description %{summary}. @@ -72,6 +73,9 @@ ln -sfv %{_datadir}/deepin/desktop-version-server %{buildroot}%{_sysconfdir}/dee %exclude %{_sysconfdir}/os-version %changelog +* Wed May 31 2023 Wenlong Zhang - 2020.09.11-3 +- fix build error for loongarch64 + * Thu Aug 26 2021 konglidong