From 09b4b073acee5ce318a15f4250a51b3d7a0152b8 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 4 Jul 2023 21:09:24 +0800 Subject: [PATCH 1/3] update to lorax-28.14.70-1.el8.src.rpm Signed-off-by: Zhao Hang --- 1000-lorax-anolis-add-loongarch-support.patch | 35 ------------------ dist | 1 + download | 2 +- lorax.spec | 36 +++++++++++++------ 4 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 1000-lorax-anolis-add-loongarch-support.patch create mode 100644 dist diff --git a/1000-lorax-anolis-add-loongarch-support.patch b/1000-lorax-anolis-add-loongarch-support.patch deleted file mode 100644 index 0376779..0000000 --- a/1000-lorax-anolis-add-loongarch-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nur lorax-28.14.58/src/pylorax/__init__.py lorax-28.14.58.new/src/pylorax/__init__.py ---- lorax-28.14.58/src/pylorax/__init__.py 2021-03-05 05:40:56.000000000 +0800 -+++ lorax-28.14.58.new/src/pylorax/__init__.py 2021-09-24 11:34:15.413626911 +0800 -@@ -68,7 +68,7 @@ - DEFAULT_PLATFORM_ID = "platform:el8" - - class ArchData(DataHolder): -- lib64_arches = ("x86_64", "ppc64", "ppc64le", "s390x", "ia64", "aarch64") -+ lib64_arches = ("x86_64", "ppc64", "ppc64le", "s390x", "ia64", "aarch64", "loongarch64") - bcj_arch = dict(i386="x86", x86_64="x86", - ppc="powerpc", ppc64="powerpc", ppc64le="powerpc", - arm="arm", armhfp="arm") -@@ -351,7 +351,10 @@ - for arg in user_dracut_args: - dracut_args += arg.split(" ", 1) - -- anaconda_args = dracut_args + ["--add", "anaconda pollcdrom qemu qemu-net prefixdevname-tools"] -+ if self.arch.basearch == "loongarch64": -+ anaconda_args = dracut_args + ["--add", "anaconda pollcdrom qemu qemu-net"] -+ else: -+ anaconda_args = dracut_args + ["--add", "anaconda pollcdrom qemu qemu-net prefixdevname-tools"] - - # ppc64 cannot boot an initrd > 32MiB so remove some drivers - if self.arch.basearch in ("ppc64", "ppc64le"): -diff -Nur lorax-28.14.58/src/pylorax/treebuilder.py lorax-28.14.58.new/src/pylorax/treebuilder.py ---- lorax-28.14.58/src/pylorax/treebuilder.py 2021-03-05 05:40:56.000000000 +0800 -+++ lorax-28.14.58.new/src/pylorax/treebuilder.py 2021-09-24 11:09:05.655014696 +0800 -@@ -43,6 +43,7 @@ - 'aarch64': 'aarch64.tmpl', - 'arm': 'arm.tmpl', - 'armhfp': 'arm.tmpl', -+ 'loongarch64': 'loongarch64.tmpl', - } - - def generate_module_info(moddir, outfile=None): diff --git a/dist b/dist new file mode 100644 index 0000000..9c0e36e --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/download b/download index c4868c1..da0351a 100644 --- a/download +++ b/download @@ -1 +1 @@ -660b2768fe2a730895cbe5b0a2862fc3 lorax-28.14.68.tar.gz +48cf9e25bbaa0be3d68b93daa4c5ba56 lorax-28.14.70.tar.gz diff --git a/lorax.spec b/lorax.spec index 64997a6..4542493 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,11 +1,10 @@ -%define anolis_release .0.1 # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} Name: lorax -Version: 28.14.68 -Release: 1%{anolis_release}%{?dist} +Version: 28.14.70 +Release: 1%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -16,15 +15,12 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz -# Add by anolis -Patch1000: 1000-lorax-anolis-add-loongarch-support.patch -# End BuildRequires: python3-devel Requires: lorax-templates -%if 0%{?rhel} >= 8 && 0%{?anolis} -Requires: lorax-templates-anolis +%if 0%{?rhel} >= 8 +Requires: lorax-templates-rhel %endif Requires: GConf2 @@ -265,9 +261,27 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Mon Apr 18 2022 Liwei Ge 28.14.68-1.0.1 -- Update requires to lorax-templates-anolis for anolis -- Add loongarch64 support +* Fri Jul 29 2022 Brian C. Lane 28.14.70-1 +- templates: Update runtime-* templates (bcl) + Resolves: rhbz#2042101 +- templates: Don't include redhat.exec on s390 (bcl) + Related: rhbz#2042101 +- templates: Drop non-64bit PPC support from live grub.cfg (bcl) + Related: rhbz#2042101 +- templates: Update config_files for inst.* usage (bcl) + Related: rhbz#2042101 +- tests: Run the 'test-in-docker' tests for github PRs (bcl) + Resolves: rhbz#2095578 + +* Thu Jun 09 2022 Brian C. Lane 28.14.69-1 +- runtime-cleanup: Use branding package name instead of product.name (bcl) + Related: rhbz#2052154 +- treebuilder: Add branding package to template variables (bcl) + Related: rhbz#2052154 +- api: Read substitution variables from the host (bcl) + Resolves: rhbz#2095053 +- tests: Switch to using centos:stream8 for Dockerfile.test (bcl) + Related: rhbz#2095053 * Fri Feb 04 2022 Brian C. Lane 28.14.68-1 - mkksiso: Fix check for unsupported arch error (bcl) -- Gitee From 7d3e8e613f9df46bc4368fad82cf95a1a154ef58 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Sat, 26 Dec 2020 00:33:38 +0800 Subject: [PATCH 2/3] Update requires to lorax-templates-anolis for anolis Signed-off-by: ZhouWeitao --- lorax.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lorax.spec b/lorax.spec index 4542493..4f1768f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,10 +1,11 @@ +%define anolis_release .0.1 # NOTE: This specfile is generated from upstream at https://github.com/rhinstaller/lorax # NOTE: Please submit changes as a pull request %define debug_package %{nil} Name: lorax Version: 28.14.70 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -19,8 +20,8 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: python3-devel Requires: lorax-templates -%if 0%{?rhel} >= 8 -Requires: lorax-templates-rhel +%if 0%{?rhel} >= 8 && 0%{?anolis} +Requires: lorax-templates-anolis %endif Requires: GConf2 @@ -261,6 +262,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog +* Tue Jul 04 2023 Liwei Ge 28.14.70-1.0.1 +- Update requires to lorax-templates-anolis for anolis + * Fri Jul 29 2022 Brian C. Lane 28.14.70-1 - templates: Update runtime-* templates (bcl) Resolves: rhbz#2042101 -- Gitee From 6646ae5dcc4568e26e044fabcb9cd59a91ac2a0d Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 23 Sep 2021 20:21:50 +0800 Subject: [PATCH 3/3] build: support loongarch64 Signed-off-by: Liwei Ge --- 1000-lorax-anolis-add-loongarch-support.patch | 35 +++++++++++++++++++ lorax.spec | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 1000-lorax-anolis-add-loongarch-support.patch diff --git a/1000-lorax-anolis-add-loongarch-support.patch b/1000-lorax-anolis-add-loongarch-support.patch new file mode 100644 index 0000000..0376779 --- /dev/null +++ b/1000-lorax-anolis-add-loongarch-support.patch @@ -0,0 +1,35 @@ +diff -Nur lorax-28.14.58/src/pylorax/__init__.py lorax-28.14.58.new/src/pylorax/__init__.py +--- lorax-28.14.58/src/pylorax/__init__.py 2021-03-05 05:40:56.000000000 +0800 ++++ lorax-28.14.58.new/src/pylorax/__init__.py 2021-09-24 11:34:15.413626911 +0800 +@@ -68,7 +68,7 @@ + DEFAULT_PLATFORM_ID = "platform:el8" + + class ArchData(DataHolder): +- lib64_arches = ("x86_64", "ppc64", "ppc64le", "s390x", "ia64", "aarch64") ++ lib64_arches = ("x86_64", "ppc64", "ppc64le", "s390x", "ia64", "aarch64", "loongarch64") + bcj_arch = dict(i386="x86", x86_64="x86", + ppc="powerpc", ppc64="powerpc", ppc64le="powerpc", + arm="arm", armhfp="arm") +@@ -351,7 +351,10 @@ + for arg in user_dracut_args: + dracut_args += arg.split(" ", 1) + +- anaconda_args = dracut_args + ["--add", "anaconda pollcdrom qemu qemu-net prefixdevname-tools"] ++ if self.arch.basearch == "loongarch64": ++ anaconda_args = dracut_args + ["--add", "anaconda pollcdrom qemu qemu-net"] ++ else: ++ anaconda_args = dracut_args + ["--add", "anaconda pollcdrom qemu qemu-net prefixdevname-tools"] + + # ppc64 cannot boot an initrd > 32MiB so remove some drivers + if self.arch.basearch in ("ppc64", "ppc64le"): +diff -Nur lorax-28.14.58/src/pylorax/treebuilder.py lorax-28.14.58.new/src/pylorax/treebuilder.py +--- lorax-28.14.58/src/pylorax/treebuilder.py 2021-03-05 05:40:56.000000000 +0800 ++++ lorax-28.14.58.new/src/pylorax/treebuilder.py 2021-09-24 11:09:05.655014696 +0800 +@@ -43,6 +43,7 @@ + 'aarch64': 'aarch64.tmpl', + 'arm': 'arm.tmpl', + 'armhfp': 'arm.tmpl', ++ 'loongarch64': 'loongarch64.tmpl', + } + + def generate_module_info(moddir, outfile=None): diff --git a/lorax.spec b/lorax.spec index 4f1768f..c033dbf 100644 --- a/lorax.spec +++ b/lorax.spec @@ -16,6 +16,9 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Add by anolis +Patch1000: 1000-lorax-anolis-add-loongarch-support.patch +# End BuildRequires: python3-devel @@ -264,6 +267,7 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %changelog * Tue Jul 04 2023 Liwei Ge 28.14.70-1.0.1 - Update requires to lorax-templates-anolis for anolis +- Add loongarch64 support * Fri Jul 29 2022 Brian C. Lane 28.14.70-1 - templates: Update runtime-* templates (bcl) -- Gitee