From 293c0936e7988bf25aac61f4f14de155289152eb Mon Sep 17 00:00:00 2001 From: ouuleilei Date: Wed, 9 Aug 2023 17:22:01 +0800 Subject: [PATCH] support riscv64 for lorax --- 0001-support-riscv64-for-lorax.patch | 38 ++++++++++++++++++++++++++++ lorax.spec | 12 ++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-support-riscv64-for-lorax.patch diff --git a/0001-support-riscv64-for-lorax.patch b/0001-support-riscv64-for-lorax.patch new file mode 100644 index 0000000..69f06ac --- /dev/null +++ b/0001-support-riscv64-for-lorax.patch @@ -0,0 +1,38 @@ +From fa014d1430eba080f8a30b600441b19297fee67b Mon Sep 17 00:00:00 2001 +From: ouuleilei +Date: Wed, 9 Aug 2023 17:15:11 +0800 +Subject: [PATCH] support riscv64 for lorax + +--- + src/pylorax/__init__.py | 2 +- + src/pylorax/treebuilder.py | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py +index 8700ff5..ee79a6f 100644 +--- a/src/pylorax/__init__.py ++++ b/src/pylorax/__init__.py +@@ -64,7 +64,7 @@ DRACUT_DEFAULT = ["--xz", "--install", "/.buildstamp", "--no-early-microcode", " + DEFAULT_PLATFORM_ID = "platform:f32" + + class ArchData(DataHolder): +- lib64_arches = ("x86_64", "ppc64le", "s390x", "ia64", "aarch64") ++ lib64_arches = ("x86_64", "ppc64le", "s390x", "ia64", "aarch64", "riscv64") + bcj_arch = dict(i386="x86", x86_64="x86", + ppc64le="powerpc", + arm="arm", armhfp="arm") +diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py +index 5a1386c..f0120bb 100644 +--- a/src/pylorax/treebuilder.py ++++ b/src/pylorax/treebuilder.py +@@ -42,6 +42,7 @@ templatemap = { + 'aarch64': 'aarch64.tmpl', + 'arm': 'arm.tmpl', + 'armhfp': 'arm.tmpl', ++ 'riscv64': 'riscv64.tmpl', + } + + def generate_module_info(moddir, outfile=None): +-- +2.39.1 + diff --git a/lorax.spec b/lorax.spec index 2bce3ae..aac2cf7 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ Name: lorax Version: 34.1 -Release: 4 +Release: 5 Summary: A set of tools used to create bootable images License: GPLv2+ URL: https://github.com/weldr/lorax @@ -34,6 +34,9 @@ Patch100: 0001-support-loongarch-for-lorax.patch %ifarch sw_64 Patch200: 0001-add-sw64-architecture.patch %endif +%ifarch riscv64 +Patch300: 0001-support-riscv64-for-lorax.patch +%endif BuildRequires: python3-devel python3-sphinx_rtd_theme python3-magic BuildRequires: python3-pytest python3-pytest-mock python3-pocketlint python3-gevent @@ -149,6 +152,10 @@ build images, etc. from the command line. %patch200 -p1 %endif +%ifarch riscv64 +%patch300 -p1 +%endif + %build %make_build @@ -233,6 +240,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog +* Wed Aug 09 2023 ouuleilei - 34.1-5 +- support riscv64 for lorax + * Mon Jun 19 2023 xinghe - 34.1-4 - Type:bugfix - ID:NA -- Gitee