From: Paul Hänsch <paul@plutz.net>
Date: Tue, 26 Jun 2018 11:41:59 +0000 (+0200)
Subject: Merge branch 'master' into uefi
X-Git-Url: http://git.plutz.net/?p=bootimage;a=commitdiff_plain;h=f0d58488893d101cd696826d9825b4713a11161f;hp=5e193ba54893b74e515ece3917eec96ba73348b0

Merge branch 'master' into uefi
---

diff --git a/.gitignore b/.gitignore
index 5e55873..a7074f2 100644
--- 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 0d6dd25..1e5afbb 100644
--- 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
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
index 327b3aa..0000000
--- a/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-stretch_uefi_root/vmlinuz
\ No newline at end of file