Merge branch 'master' into uefi

diff --git a/.gitignore b/.gitignore
index 5e55873265db13b370aff3f69797c48b1afadbba..a7074f2291574fedab2cab98d6f2319d86d12e39 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ stretch_*_config/
 stretch_*_root/
 stretch_*.squashfs
 mount/
+vmlinuz
+initrd.img

diff --git a/Makefile b/Makefile
index 0d6dd2593f44797f34036d86ed30f317d574080f..1e5afbb8cfc09eb53a88ee648f7da08a31d7a6e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,12 @@ stretch_%.squashfs: stretch_%_config/
        rm "$@" || true
        mksquashfs "$<" "$@" -comp xz
 
+vmlinuz: stretch_*_root/
+       ln -s '$<$@' ./
+
+initrd.img: stretch_*_root/
+       ln -s '$<$@' ./
+
 /dev/sd%: partitions .FORCE
        sfdisk ${@} <partitions
        dd of=${@} if=/usr/lib/syslinux/mbr/gptmbr.bin

diff --git a/initrd.img b/initrd.img
deleted file mode 120000 (symlink)
index aa779de..0000000
--- a/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-stretch_uefi_root/initrd.img
\ No newline at end of file

diff --git a/vmlinuz b/vmlinuz
deleted file mode 120000 (symlink)
index 327b3aa..0000000
--- a/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-stretch_uefi_root/vmlinuz
\ No newline at end of file