diff --git a/1001-Adapt-new-version-util-linux.patch b/1001-Adapt-new-version-util-linux.patch new file mode 100644 index 0000000000000000000000000000000000000000..9d22e57d306c1716b5d7c5e46e50e8c09afc0b82 --- /dev/null +++ b/1001-Adapt-new-version-util-linux.patch @@ -0,0 +1,24 @@ +From f76263779504ee63ac8ec4dfb43bf8f8fb083fe5 Mon Sep 17 00:00:00 2001 +From: "taifu.gc" +Date: Thu, 28 Mar 2024 22:38:47 +0800 +Subject: [PATCH] Adapt new version util-linux + +--- + src/pylorax/imgutils.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pylorax/imgutils.py b/src/pylorax/imgutils.py +index 0842882..69cc09e 100644 +--- a/src/pylorax/imgutils.py ++++ b/src/pylorax/imgutils.py +@@ -265,6 +265,7 @@ def umount(mnt, lazy=False, maxretry=3, retrysleep=1.0, delete=True): + raises CalledProcessError if umount fails.''' + cmd = ["umount"] + if lazy: cmd += ["-l"] ++ cmd += ["-R"] + cmd += [mnt] + count = 0 + while maxretry > 0: +-- +2.19.2 + diff --git a/lorax.spec b/lorax.spec index 82ed0defb9589f808355e4003ecbe023b137f2c6..6eef37b02a8e7c401aeed6c44f430a103e58b99b 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 5 # 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} @@ -12,6 +12,7 @@ License: GPL-2.0-or-later URL: https://github.com/weldr/lorax Source0: https://github.com/weldr/lorax/archive/refs/tags/%{name}-%{version}-1.tar.gz Patch001: 0001-add-loongarch64-support-for-lorax.patch +Patch1001: 1001-Adapt-new-version-util-linux.patch BuildRequires: python3-devel BuildRequires: make @@ -120,6 +121,7 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{name}-%{version}-1 %patch001 -p1 +%patch1001 -p1 %build @@ -159,6 +161,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Mar 28 2024 Chang Gao - 40.0-5 +- Adapt with new version util-linux + * Tue Mar 12 2024 Bo Ren - 40.0-4 - Rebuild with python3.11