Fix extlinux configuration for RISC-V (riscv64)
- Remove fdtdir entry (we ship DTB files, but DTB is built-in into FSBL and OpenSBI; also could be in U-Boot). - Use addappend entry instead of append. This allows us to have a single disk image for QEMU virt machine and SiFive Unleashed. Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
parent
33bfa1e82a
commit
04d35b2d65
|
@ -12,7 +12,7 @@
|
||||||
Name: appliance-tools
|
Name: appliance-tools
|
||||||
Summary: Tools for building Appliances
|
Summary: Tools for building Appliances
|
||||||
Version: 009.0
|
Version: 009.0
|
||||||
Release: 7.1.riscv64%{?dist}
|
Release: 7.2.riscv64%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://pagure.io/appliance-tools
|
URL: https://pagure.io/appliance-tools
|
||||||
|
|
||||||
|
@ -26,6 +26,10 @@ Patch0002: 0001-Leave-more-space-4MB-for-uboot-before-the-first-part.patch
|
||||||
# Add support for zstd compression instead of xz (optional)
|
# Add support for zstd compression instead of xz (optional)
|
||||||
Patch0010: appliance-tools-add-zstd.patch
|
Patch0010: appliance-tools-add-zstd.patch
|
||||||
|
|
||||||
|
# NOT upstream
|
||||||
|
# Fix extlinux configuration file for RISC-V (riscv64)
|
||||||
|
Patch0011: riscv-fix-extlinux-conf.patch
|
||||||
|
|
||||||
# Ensure system deps are installed (rhbz#1409536)
|
# Ensure system deps are installed (rhbz#1409536)
|
||||||
Requires: python%{python_pkgversion}-imgcreate >= 1:25.0-2
|
Requires: python%{python_pkgversion}-imgcreate >= 1:25.0-2
|
||||||
Requires: python%{python_pkgversion}-progress
|
Requires: python%{python_pkgversion}-progress
|
||||||
|
@ -70,6 +74,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
|
||||||
%{python_sitelib}/ec2convert/
|
%{python_sitelib}/ec2convert/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 30 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 009.0-7.2.riscv64
|
||||||
|
- Fix extlinux configuration for RISC-V (riscv64)
|
||||||
|
|
||||||
* Wed Oct 02 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 009.0-7.0.riscv64
|
* Wed Oct 02 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 009.0-7.0.riscv64
|
||||||
- Add support for zstd compression for images (optional)
|
- Add support for zstd compression for images (optional)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
diff --git a/appcreate/appliance.py b/appcreate/appliance.py
|
||||||
|
index dc49bcb..f65d12a 100644
|
||||||
|
--- a/appcreate/appliance.py
|
||||||
|
+++ b/appcreate/appliance.py
|
||||||
|
@@ -362,9 +362,7 @@ class ApplianceImageCreator(ImageCreator):
|
||||||
|
for v in versions:
|
||||||
|
extlinux += "label %s (%s)\n" % (self.name, v)
|
||||||
|
extlinux += "\tkernel %s/vmlinuz-%s\n" % (prefix, v)
|
||||||
|
- extlinux += "\tappend ro root=%s %s\n" % (rootdev, options)
|
||||||
|
- if 'extlinux-bootloader' in packages:
|
||||||
|
- extlinux += "\tfdtdir %s/dtb-%s/\n" % (prefix, v)
|
||||||
|
+ extlinux += "\taddappend ro root=%s %s\n" % (rootdev, options)
|
||||||
|
extlinux += "\tinitrd %s/%s-%s.img\n\n" % (prefix, initrd, v)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue