aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-12-05 09:43:49 +0100
committerGerd Hoffmann <kraxel@redhat.com>2019-12-05 09:43:49 +0100
commit7aa7d73198aeb3d7444ebeeddc47b4503690985c (patch)
treebdf0a6a905e469a522be59e46e72d4891306ed26
parentfb4682ea0cbd665d8a2e44f684ec17b03d6046e1 (diff)
downloadimagefish-7aa7d73198aeb3d7444ebeeddc47b4503690985c.tar.gz
try drop Fedora-efi-armv7.sh
-rwxr-xr-xFedora-efi-grub2.sh5
-rwxr-xr-xrun-all.sh4
2 files changed, 5 insertions, 4 deletions
diff --git a/Fedora-efi-grub2.sh b/Fedora-efi-grub2.sh
index 4d16fe7..b67b26b 100755
--- a/Fedora-efi-grub2.sh
+++ b/Fedora-efi-grub2.sh
@@ -7,11 +7,12 @@ rpms="-grubby -dracut-config-rescue dracut-config-generic"
rpms_i686="grub2-efi-ia32 grub2-pc"
rpms_x86_64="shim grub2-efi-x64 grub2-pc"
-rpms_armhfp="grub2-efi-arm grub2-tools"
+#rpms_armhfp="grub2-efi-arm grub2-tools" # fedora
+rpms_armhfp="grub2-efi grubby-deprecated" # kraxel
rpms_aarch64="shim grub2-efi-aa64"
eval "rpms=\"\$rpms \$rpms_$(sh basearch.sh)\""
-arch="$(uname -m)"
+arch="$(sh basearch.sh)"
tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.qcow2"
diff --git a/run-all.sh b/run-all.sh
index 92dab94..5d0f91a 100755
--- a/run-all.sh
+++ b/run-all.sh
@@ -6,8 +6,8 @@ FVER="31"
case "$(hostname --short)" in
arm-b32 | cubietruck)
# rebuild images
- ./Fedora-efi-armv7.sh $FVER || exit 1
-# ./Fedora-efi-grub2.sh $FVER || exit 1
+# ./Fedora-efi-armv7.sh $FVER || exit 1
+ ./Fedora-efi-grub2.sh $FVER || exit 1
;;
arm-b64)