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=-c

Merge branch 'master' into uefi
---

f0d58488893d101cd696826d9825b4713a11161f
diff --combined Makefile
index 0d6dd25,2843f5d..1e5afbb
--- a/Makefile
+++ b/Makefile
@@@ -7,7 -7,7 +7,7 @@@ GROUPS := sud
  ARCH := amd64
  CONFIG := config_base/
  
 -PACKAGES := apt bilibop-lockfs btrfs-tools busybox-static bzip2 ca-certificates cron deborphan gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less live-boot live-boot-initramfs-tools make man-db nbd-client net-tools nmap ntpdate openssh-client openssh-server p7zip-full pciutils rsync squashfs-tools sshfs sudo syslinux syslinux-common syslinux-efi systemd unace unrar-free unzip vim wget wireless-tools wpasupplicant xz-utils zip
 +PACKAGES := apt bilibop-lockfs btrfs-tools busybox-static bzip2 ca-certificates cron deborphan efibootmgr firmware-linux-free gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less live-boot live-boot-initramfs-tools make man-db nbd-client net-tools nmap ntpdate openssh-client openssh-server p7zip-full pciutils rsync squashfs-tools sshfs sudo syslinux syslinux-common syslinux-efi systemd unace unrar-free unzip vim wget wireless-tools wpasupplicant xz-utils zip
  
  include *.mk
  
@@@ -48,6 -48,12 +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
@@@ -57,12 -63,8 +63,12 @@@
  	mkfs.vfat -n SQUASHBOOT ${@}
  	syslinux -i ${@}
  	mount -t vfat ${@} mount
 -	cp -L vmlinuz initrd.img *.squashfs syslinux.cfg Makefile partitions mount/
 +	mkdir -p mount/EFI/BOOT
 +	cp /usr/lib/SYSLINUX.EFI/efi32/syslinux.efi mount/EFI/BOOT/BOOTIA32.EFI
 +	cp $(addprefix /usr/lib/syslinux/modules/efi32/, ldlinux.e32 menu.c32 libutil.c32) mount/EFI/BOOT/
 +	cp -L vmlinuz initrd.img syslinux.cfg mount/EFI/BOOT/
  	cp $(addprefix /usr/lib/syslinux/modules/bios/, menu.c32 libutil.c32) mount/
 +	cp -L vmlinuz initrd.img *.squashfs syslinux.cfg Makefile partitions mount/
  	umount mount/
  	sync