diff --git a/blivet-3.6.0-sw.patch b/blivet-3.6.0-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..8faa6d5a84ae94b6ff6ea344c81ce011961d9d35 --- /dev/null +++ b/blivet-3.6.0-sw.patch @@ -0,0 +1,28 @@ +diff -Naur blivet-3.6.0.org/blivet/arch.py blivet-3.6.0.sw/blivet/arch.py +--- blivet-3.6.0.org/blivet/arch.py 2023-06-13 08:39:39.473429075 +0800 ++++ blivet-3.6.0.sw/blivet/arch.py 2023-06-15 16:44:20.913961862 +0800 +@@ -297,6 +297,15 @@ + return os.uname()[4].startswith('s390') + + ++def is_sw_64(): ++ """ ++ :return: True if the hardware supports Sw_64, False otherwise. ++ :rtype: boolean ++ ++ """ ++ return os.uname()[4] == 'sw_64' ++ ++ + def is_ia64(): + """ + :return: True if the hardware supports IA64, False otherwise. +@@ -344,6 +353,8 @@ + """ + if is_x86(bits=32): + return 'i386' ++ elif is_sw_64(): ++ return 'sw_64' + elif is_x86(bits=64): + return 'x86_64' + elif is_ppc(bits=32): diff --git a/python-blivet.spec b/python-blivet.spec index bbf09e7433de7fd92e666c534ca68ba68645c114..79a0b212c7f48589d2dcefc4cd5acdef9b96cd79 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %define is_rhel 0%{?rhel} != 0 @@ -46,6 +46,7 @@ Patch10: 0011-Default-to-encryption-sector-size-512-for-LUKS-devic.patch # Add by Anolis Patch1001: 1001-blivet-anolis-add-loongarch-support.patch +Patch1002: blivet-3.6.0-sw.patch # End # Versions of required components (done so we make sure the buildrequires @@ -209,6 +210,9 @@ configuration. %endif %changelog +* Tue Jun 13 2023 wxiat - 3.6.0-4.0.1 +- Add sw patch + * Thu Jun 01 2023 Liwei Ge - 3.6.0-4.0.1 - Add loongarch64 support