rpms
/
appliance-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure to check for uInitrd first 

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2019-03-31 10:24:15 +02:00
parent d1dccea49d
commit 665a74ad2a
Signed by: davidlt
GPG Key ID: 7108702C938B13C1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appliance-tools.spec
View File

@ -12,7 +12,7 @@
Name: appliance-tools
Summary: Tools for building Appliances
Version: 009.0
Release: 5.0.riscv64%{?dist}
Release: 5.1.riscv64%{?dist}
License: GPLv2
URL: https://pagure.io/appliance-tools

9
uboot-riscv.patch
View File

@ -1,5 +1,5 @@
diff --git a/appcreate/appliance.py b/appcreate/appliance.py
index c6706cb..b90d6da 100644
index c6706cb..38a8239 100644
--- a/appcreate/appliance.py
+++ b/appcreate/appliance.py
@@ -169,7 +169,7 @@ class ApplianceImageCreator(ImageCreator):
@ -32,6 +32,7 @@ index c6706cb..b90d6da 100644
for version in kernels[kernel]:
versions.append(version)
- if int(subprocess.Popen("ls " + self._instroot + "/boot/initramfs* | wc -l", shell=True, stdout=subprocess.PIPE).communicate()[0].decode("utf-8").strip()) > 0:
+ # Find kernel filename
+ if int(subprocess.Popen("ls " + self._instroot + "/boot/uImage* | wc -l", shell=True, stdout=subprocess.PIPE).communicate()[0].decode("utf-8").strip()) > 0:
+ # U-Boot wrapped kernel
@ -42,11 +43,11 @@ index c6706cb..b90d6da 100644
+ logging.debug("Found kernel filename: %s" % kernelfn)
+
+ # Find ramdisk filename
if int(subprocess.Popen("ls " + self._instroot + "/boot/initramfs* | wc -l", shell=True, stdout=subprocess.PIPE).communicate()[0].decode("utf-8").strip()) > 0:
initrd = "initramfs"
+ elif int(subprocess.Popen("ls " + self._instroot + "/boot/uInitrd* | wc -l", shell=True, stdout=subprocess.PIPE).communicate()[0].decode("utf-8").strip()) > 0:
+ if int(subprocess.Popen("ls " + self._instroot + "/boot/uInitrd* | wc -l", shell=True, stdout=subprocess.PIPE).communicate()[0].decode("utf-8").strip()) > 0:
+ # U-Boot wrapped ramdisk
+ initrd = "uInitrd"
+ elif int(subprocess.Popen("ls " + self._instroot + "/boot/initramfs* | wc -l", shell=True, stdout=subprocess.PIPE).communicate()[0].decode("utf-8").strip()) > 0:
initrd = "initramfs"
else:
initrd = "initrd"