diff --git a/1000-lorax-anolis-add-loongarch-support.patch b/1000-lorax-anolis-add-loongarch-support.patch deleted file mode 100644 index 0376779dffc2862427470207543f1895ff9e5db4..0000000000000000000000000000000000000000 --- 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/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..c4868c17a1e3d267cb787aa03833fb32a4784c8d --- /dev/null +++ b/download @@ -0,0 +1 @@ +660b2768fe2a730895cbe5b0a2862fc3 lorax-28.14.68.tar.gz diff --git a/lorax-28.14.62.tar.gz b/lorax-28.14.62.tar.gz deleted file mode 100644 index 2db6eee19d1f24409721a2ee066f0420b233dd16..0000000000000000000000000000000000000000 Binary files a/lorax-28.14.62.tar.gz and /dev/null differ diff --git a/lorax.spec b/lorax.spec index bed53d9a7db572b55acf427d1faf508dfc639166..836f096699d26b53fc03314fbab3c56dbb45df6e 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,11 +1,10 @@ -%define anolis_release .0.3 # 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.62 -Release: 1%{anolis_release}%{?dist} +Version: 28.14.68 +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,18 +261,59 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/composer-cli.1* %changelog -* Thu Feb 24 2022 Weitao Zhou - 28.14.62-1.0.3 -- Rebuild on platform-python - -* Wed Feb 23 2022 Liwei Ge - 28.14.62-1.0.2 -- Add loongarch64 support - -* Fri Jan 14 2022 Liwei Ge - 28.14.62-1.0.1 -- Update requires to lorax-templates-anolis for anolis - -* Thu Sep 16 2021 Brian C. Lane 28.14.62-1 +* Fri Feb 04 2022 Brian C. Lane 28.14.68-1 +- mkksiso: Fix check for unsupported arch error (bcl) + Related: rhbz#2049205 + +* Thu Feb 03 2022 Brian C. Lane 28.14.67-1 +- mkksiso: Fix the order of the ppc mkisofs command (bcl) + Related: rhbz#2049205 +- mkksiso: mkfsiso argument order matters (bcl) + Resolves: rhbz#2049205 +- mkksiso: Improve debug message about unsupported arch (bcl) + Related: rhbz#2049190 +- mkksiso: Add kickstart to s390x cdboot.prm (bcl) + Resolves: rhbz#2049190 + +* Mon Jan 31 2022 Brian C. Lane 28.14.66-1 +- livemedia.ks: Add isomd5sum for use with rd.live.check (bcl) +- Resolves: rhbz#2048447 + +* Thu Jan 20 2022 Brian C. Lane 28.14.65-1 +- Enable sftp when using inst.sshd (bcl) +- Resolves: rhbz#2041770 + +* Thu Dec 09 2021 Brian C. Lane 28.14.64-1 +- mkksiso: Check the length of the filenames (bcl) + Related: rhbz#2028048 +- mkksiso: Check the iso's arch against the host's (bcl) + Related: rhbz#2028048 +- mkksiso: Add missing implantisomd5 tool requirements (bcl) + Related: rhbz#2028048 +- mkksiso: Raise error if no volume id is found (bcl) + Related: rhbz#2028048 +- mount: Add aarch64 and s390x support to IsoMountopoint (bcl) + Resolves: rhbz#2028089 +- mkksiso: Skip mkefiboot for non-UEFI isos (bcl) + Resolves: rhbz#2028097 +- mkksiso: Add -joliet-long (bcl) + Resolves: rhbz#2028044 +- mkksiso: Return 1 on errors (bcl) + Resolves: rhbz#2028048 +- Increase boot.iso rootfs to 4GiB (bcl) + Resolves: rhbz#2028059 +- Fix specfile to match the one from dist-git (bcl) + Related: rhbz#2001942 + +* Fri Oct 15 2021 Brian C. Lane 28.14.63-1 +- Handle all possible dnf group_install errors (bcl) + Related: rhbz#1947958 +- runtime-install: Install nvme-cli tool (bcl) + Related: rhbz#1903339 + +* Thu Sep 16 2021 Brian C. Lane 28.14.62-2 - Increase root partition of rhel-livemedia.ks to 8000MB (bcl) - Resolves: rhbz#2001942 + Resolves: rhbz#2004864 * Thu Jul 08 2021 Brian C. Lane - 28.14.61-2 - Add Conflicts to composer-cli for manpage move