!115 增加LoongArch架构的支持。
Merge pull request !115 from 孙海勇/openEuler-22.03-LTS-Next
This commit is contained in:
commit
f61cae63ff
99
0001-Add-loongarch-architecture-support.patch
Normal file
99
0001-Add-loongarch-architecture-support.patch
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
From 3100da59abd272fc3f301a30ebabedf86b0b4a00 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sun Haiyong <sunhaiyong@loongson.cn>
|
||||||
|
Date: Tue, 21 Dec 2021 20:40:27 +0800
|
||||||
|
Subject: [PATCH] Add loongarch architecture support.
|
||||||
|
|
||||||
|
---
|
||||||
|
installplatform | 12 ++++++++++++
|
||||||
|
rpmrc.in | 17 +++++++++++++++++
|
||||||
|
2 files changed, 29 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/installplatform b/installplatform
|
||||||
|
index 12339fc..74c50a2 100755
|
||||||
|
--- a/installplatform
|
||||||
|
+++ b/installplatform
|
||||||
|
@@ -168,6 +168,18 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
|
||||||
|
CANONARCH=mips64r6el
|
||||||
|
CANONCOLOR=3
|
||||||
|
;;
|
||||||
|
+ loongarch32)
|
||||||
|
+ ISANAME=loongarch
|
||||||
|
+ ISABITS=32
|
||||||
|
+ CANONARCH=loongarch32
|
||||||
|
+ CANONCOLOR=0
|
||||||
|
+ ;;
|
||||||
|
+ loongarch64)
|
||||||
|
+ ISANAME=loongarch
|
||||||
|
+ ISABITS=64
|
||||||
|
+ CANONARCH=loongarch64
|
||||||
|
+ CANONCOLOR=3
|
||||||
|
+ ;;
|
||||||
|
m68k)
|
||||||
|
ISANAME=m68k
|
||||||
|
ISABITS=32
|
||||||
|
diff --git a/rpmrc.in b/rpmrc.in
|
||||||
|
index 5bd9ba3..fc2932a 100644
|
||||||
|
--- a/rpmrc.in
|
||||||
|
+++ b/rpmrc.in
|
||||||
|
@@ -67,6 +67,8 @@ optflags: mipsr6el -O2 -g
|
||||||
|
optflags: mips64r6 -O2 -g
|
||||||
|
optflags: mips64r6el -O2 -g
|
||||||
|
|
||||||
|
+optflags: loongarch64 -O2 -g
|
||||||
|
+
|
||||||
|
optflags: armv3l -O2 -g -march=armv3
|
||||||
|
optflags: armv4b -O2 -g -march=armv4
|
||||||
|
optflags: armv4l -O2 -g -march=armv4
|
||||||
|
@@ -137,6 +139,9 @@ archcolor: mipsr6el 1
|
||||||
|
archcolor: mips64r6 2
|
||||||
|
archcolor: mips64r6el 2
|
||||||
|
|
||||||
|
+archcolor: loongarch32 1
|
||||||
|
+archcolor: loongarch64 2
|
||||||
|
+
|
||||||
|
archcolor: m68k 1
|
||||||
|
|
||||||
|
archcolor: m68kmint 1
|
||||||
|
@@ -257,6 +262,9 @@ arch_canon: mips64r6el: mips64r6el 21
|
||||||
|
arch_canon: riscv: riscv64 22
|
||||||
|
arch_canon: riscv64: riscv64 22
|
||||||
|
|
||||||
|
+arch_canon: loongarch32: loongarch32 25
|
||||||
|
+arch_canon: loongarch64: loongarch64 26
|
||||||
|
+
|
||||||
|
#############################################################
|
||||||
|
# Canonical OS names and numbers
|
||||||
|
|
||||||
|
@@ -360,6 +368,9 @@ buildarchtranslate: mipsr6el: mipsr6el
|
||||||
|
buildarchtranslate: mips64r6: mips64r6
|
||||||
|
buildarchtranslate: mips64r6el: mips64r6el
|
||||||
|
|
||||||
|
+buildarchtranslate: loongarch32: loongarch32
|
||||||
|
+buildarchtranslate: loongarch64: loongarch64
|
||||||
|
+
|
||||||
|
buildarchtranslate: m68k: m68k
|
||||||
|
|
||||||
|
buildarchtranslate: atarist: m68kmint
|
||||||
|
@@ -449,6 +460,9 @@ arch_compat: mipsr6el: noarch
|
||||||
|
arch_compat: mips64r6: mipsr6
|
||||||
|
arch_compat: mips64r6el: mipsr6el
|
||||||
|
|
||||||
|
+arch_compat: loongarch32: noarch
|
||||||
|
+arch_compat: loongarch64: loongarch32
|
||||||
|
+
|
||||||
|
arch_compat: hppa2.0: hppa1.2
|
||||||
|
arch_compat: hppa1.2: hppa1.1
|
||||||
|
arch_compat: hppa1.1: hppa1.0
|
||||||
|
@@ -586,6 +600,9 @@ buildarch_compat: mipsr6el: noarch
|
||||||
|
buildarch_compat: mips64r6: noarch
|
||||||
|
buildarch_compat: mips64r6el: noarch
|
||||||
|
|
||||||
|
+buildarch_compat: loongarch32: noarch
|
||||||
|
+buildarch_compat: loongarch64: noarch
|
||||||
|
+
|
||||||
|
buildarch_compat: armv4b: noarch
|
||||||
|
buildarch_compat: armv8l: armv7l
|
||||||
|
buildarch_compat: armv7l: armv6l
|
||||||
|
--
|
||||||
|
2.30.0
|
||||||
|
|
||||||
6
rpm.spec
6
rpm.spec
@ -1,6 +1,6 @@
|
|||||||
Name: rpm
|
Name: rpm
|
||||||
Version: 4.17.0
|
Version: 4.17.0
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: RPM Package Manager
|
Summary: RPM Package Manager
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.rpm.org/
|
URL: http://www.rpm.org/
|
||||||
@ -22,6 +22,7 @@ Patch13: rpm-selinux-plugin-check-context-file-exist.patch
|
|||||||
Patch14: get-in-use-of-ndb.patch
|
Patch14: get-in-use-of-ndb.patch
|
||||||
Patch15: backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch
|
Patch15: backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch
|
||||||
Patch16: still-in-use-of-python-scripts-from-old-version.patch
|
Patch16: still-in-use-of-python-scripts-from-old-version.patch
|
||||||
|
Patch17: 0001-Add-loongarch-architecture-support.patch
|
||||||
|
|
||||||
BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel
|
BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel
|
||||||
BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
|
BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
|
||||||
@ -296,6 +297,9 @@ make check || (cat tests/rpmtests.log; exit 0)
|
|||||||
%{_mandir}/man1/gendiff.1*
|
%{_mandir}/man1/gendiff.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 11 2022 Sunhaiyong <sunhaiyong@loongson.cn> - 4.17.0-5
|
||||||
|
- Add loongarch support.
|
||||||
|
|
||||||
* Thu Jan 06 2022 renhongxun<renhongxun@huawei.com> - 4.17.0-4
|
* Thu Jan 06 2022 renhongxun<renhongxun@huawei.com> - 4.17.0-4
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user