Merge remote-tracking branch 'up/f29' into f29-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>

livecd-tools-25.0-add-riscv64.patch

@@ -0,0 +1,25 @@
+diff --git a/imgcreate/live.py b/imgcreate/live.py
+index b3da184..d464913 100755
+--- a/imgcreate/live.py
++++ b/imgcreate/live.py
+@@ -1043,6 +1043,8 @@ elif arch in ("ppc64",):
+     LiveImageCreator = ppc64LiveImageCreator
+ elif arch.startswith(("arm", "aarch64")):
+     LiveImageCreator = LiveImageCreatorBase
++elif arch in ("riscv64",):
++    LiveImageCreator = LiveImageCreatorBase
+ 
+ else:
+     raise CreatorError("Architecture not supported!")
+diff --git a/tools/editliveos b/tools/editliveos
+index 36d7124..f542201 100755
+--- a/tools/editliveos
++++ b/tools/editliveos
+@@ -2158,5 +2158,7 @@ elif arch in ("ppc64",):
+     LiveImageCreator = ppc64LiveImageCreator
+ elif arch.startswith(("arm", "aarch64")):
+     LiveImageCreator = LiveImageCreatorBase
++elif arch in ("riscv64",):
++    LiveImageCreator = LiveImageCreatorBase
+ else:
+     raise CreatorError("Architecture not supported!")

livecd-tools.spec

@@ -10,7 +10,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 25.0
-Release: 11%{?dist}
+Release: 11.0.riscv64%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Base
@@ -26,6 +26,7 @@ Patch2: 0001-DNF-3-workaround-a-bug-with-config-values-that-are-l.patch
 # Work around same issue again, for DNF 3.6 changes:
 # https://github.com/livecd-tools/livecd-tools/pull/108
 Patch3: 0001-Handle-dnf-config-option-showing-as-tuple-not-list-i.patch
+Patch4: livecd-tools-25.0-add-riscv64.patch
 
 BuildRequires: python2-devel
 %if %{with python3}
@@ -197,6 +198,9 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
 %endif
 
 %changelog
+* Wed Oct 10 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:25.0-11.0.riscv64
+- Add support for riscv64
+
 * Wed Sep 26 2018 Adam Williamson <awilliam@redhat.com> - 1:25.0-11
 - Backport further fix for #1595917