From 88ab5e9efb74f0658ba3102be11b4b2e2cec4c38 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Sun, 9 Jul 2017 22:34:46 +0200
Subject: fix rpi3 64bit

---
 Fedora-rpi64-efi.sh                | 22 ----------------------
 Fedora-rpi64-fedora.sh             | 23 -----------------------
 Fedora-rpi64-kraxel.sh             | 23 -----------------------
 Fedora-rpi64.sh                    | 22 ++++++++++++++++++++++
 scripts/config-blacklist-module.sh |  2 +-
 5 files changed, 23 insertions(+), 69 deletions(-)
 delete mode 100755 Fedora-rpi64-efi.sh
 delete mode 100755 Fedora-rpi64-fedora.sh
 delete mode 100755 Fedora-rpi64-kraxel.sh
 create mode 100755 Fedora-rpi64.sh

diff --git a/Fedora-rpi64-efi.sh b/Fedora-rpi64-efi.sh
deleted file mode 100755
index 068936c..0000000
--- a/Fedora-rpi64-efi.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-vers="${1-25}"
-name="fedora-${vers}-rpi3-efi"
-repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
-rpms="bcm283x-firmware uboot-images-armv8 grub2-efi dracut-config-generic"
-krnl="kernel kernel-modules"
-
-arch="$(uname -m)"
-tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
-img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
-
-echo ""
-echo "###"
-echo "### $name"
-echo "###"
-
-set -ex
-rm -f "$tar" "$img"
-scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --kernel "$krnl" --dnf 
-scripts/tar-to-image.sh --tar "$tar" --image "$img" --rpi64
-scripts/config-systemd-network.sh "$img"
diff --git a/Fedora-rpi64-fedora.sh b/Fedora-rpi64-fedora.sh
deleted file mode 100755
index c5632ad..0000000
--- a/Fedora-rpi64-fedora.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-vers="${1-25}"
-name="fedora-${vers}-rpi3-fedora"
-repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
-rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-generic"
-krnl="kernel kernel-modules"
-
-arch="$(uname -m)"
-tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
-img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
-
-echo ""
-echo "###"
-echo "### $name"
-echo "###"
-
-set -ex
-rm -f "$tar" "$img"
-scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --kernel "$krnl" --dnf 
-scripts/tar-to-image.sh --tar "$tar" --image "$img" --rpi64
-scripts/config-systemd-network.sh "$img"
-scripts/config-kraxel-repo.sh "$img"
diff --git a/Fedora-rpi64-kraxel.sh b/Fedora-rpi64-kraxel.sh
deleted file mode 100755
index fe24986..0000000
--- a/Fedora-rpi64-kraxel.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-vers="${1-25}"
-name="fedora-${vers}-rpi3-kraxel"
-repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
-rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-generic"
-krnl="kernel-main"
-
-arch="$(uname -m)"
-tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
-img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
-
-echo ""
-echo "###"
-echo "### $name"
-echo "###"
-
-set -ex
-rm -f "$tar" "$img"
-scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --kernel "$krnl" --dnf 
-scripts/tar-to-image.sh --tar "$tar" --image "$img" --rpi64
-scripts/config-systemd-network.sh "$img"
-scripts/config-kraxel-repo.sh "$img"
diff --git a/Fedora-rpi64.sh b/Fedora-rpi64.sh
new file mode 100755
index 0000000..04aff82
--- /dev/null
+++ b/Fedora-rpi64.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+vers="${1-25}"
+name="fedora-${vers}-rpi3"
+repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
+rpms="bcm283x-firmware uboot-images-armv8 grub2-efi dracut-config-generic"
+krnl="kernel kernel-modules"
+
+arch="$(uname -m)"
+tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
+img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
+
+echo ""
+echo "###"
+echo "### $name"
+echo "###"
+
+set -ex
+rm -f "$tar" "$img"
+scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --kernel "$krnl" --dnf 
+scripts/tar-to-image.sh --tar "$tar" --image "$img" --rpi64
+scripts/config-systemd-network.sh "$img"
diff --git a/scripts/config-blacklist-module.sh b/scripts/config-blacklist-module.sh
index 4af599d..6e3e812 100755
--- a/scripts/config-blacklist-module.sh
+++ b/scripts/config-blacklist-module.sh
@@ -9,7 +9,7 @@ if test "$image" = ""; then
 fi
 
 if virt-cat -a "$image" /etc/grub2-efi.cfg >/dev/null; then
-	bootedit="/etc/grub2-efi.cfg:s/linuxefi/linuxefi rd.driver.blacklist=${module}/"
+	bootedit="/etc/grub2-efi.cfg:s/^([ \t]*linux[ ]+[^ ]+)/\1 rd.driver.blacklist=${module}/"
 else
 	bootedit="/boot/extlinux/extlinux.conf:s/append/append rd.driver.blacklist=${module}/"
 fi
-- 
cgit