X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/0ffed154936f329bcc1500e506f1d78c99b2d79e..386d5d35387bb0e6c48759b24bef4ccc3173914a:/bootstrap.sh?ds=sidebyside

diff --git a/bootstrap.sh b/bootstrap.sh
index 32a760e..42d897a 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -78,6 +78,8 @@ build_rootfs()
 
         cd testing
 
+        sudo mkdir -p boot/efi
+
         sudo bash -c 'echo live > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
@@ -137,18 +139,17 @@ build_dd()
 build_efi()
 {
 (
-        rm -f EFI
-        mkdir -p EFI/BOOT
+        rm -rf EFI
+        mkdir -p EFI/boot EFI/debian
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi EFI/boot/bootaa64.efi
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
-        export UUID=`disktype build/media | grep UUID | awk '{print $2}'`
-        cat > EFI/boot/grub.cfg <<EOF
+        export UUID=`blkid media | awk -F\" '{print $2}'`
+        cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root
-set prefix=(\$root)'/boot/'
-linux $VMLINUZ root=UUID=${UUID} ro
-inird $INITRD
+linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
+initrd (\$root)/boot/${INITRD}
 boot
 EOF
         tar czf efi.tgz EFI
@@ -185,7 +186,7 @@ publish_artefacts()
 mkdir -p build
 cd build
 
-sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison
 
 build_linux
 build_m1n1