[Lunar-commits] <lunar-iso> Copy the iso kernel to the isolinux directory

[Peter de Ridder]

commit 36402d416108fff1c8f44d171e59de86e7953735
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Wed, 28 Nov 2012 15:35:02 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/36402d416108fff1c8f44d171e59de86e7953735

Copy the iso kernel to the isolinux directory
---
  mkfiles/iso.mk    | +16/-1    
  mkfiles/kernel.mk | +2/-0     
  2 files changed, 18 insertions(+), 1 deletion(-)

--- a/mkfiles/iso.mk
+++ b/mkfiles/iso.mk
@@ -53,16 +53,31 @@ iso-strip: $(ISO_TARGET)/.iso-strip
 
 # Copy the isolinux files to the target
 $(ISO_TARGET)/usr/share/syslinux/isolinux.bin: $(ISO_TARGET)/.iso-isolinux
+	@test -f $@
 	@touch $@
 
 $(ISO_TARGET)/isolinux/isolinux.bin: $(ISO_TARGET)/usr/share/syslinux/isolinux.bin
 	@cp $< $@
 
+$(ISO_TARGET)/boot/linux: $(ISO_TARGET)/.iso-isolinux
+	@test -f $@
+	@touch $@
+
+$(ISO_TARGET)/isolinux/linux: $(ISO_TARGET)/boot/linux
+	@cp $< $@
+
+$(ISO_TARGET)/boot/initrd: $(ISO_TARGET)/.iso-isolinux
+	@test -f $@
+	@touch $@
+
+$(ISO_TARGET)/isolinux/initrd: $(ISO_TARGET)/boot/initrd
+	@cp $< $@
+
 $(ISO_TARGET)/.iso-isolinux: iso-target
 	@cp -r $(ISO_SOURCE)/isolinux $(ISO_TARGET)
 	@touch $@
 
-iso-isolinux: $(ISO_TARGET)/.iso-isolinux $(ISO_TARGET)/isolinux/isolinux.bin
+iso-isolinux: $(ISO_TARGET)/.iso-isolinux $(ISO_TARGET)/isolinux/isolinux.bin $(ISO_TARGET)/isolinux/linux $(ISO_TARGET)/isolinux/initrd
 
 
 # Generate the actual image
--- a/mkfiles/kernel.mk
+++ b/mkfiles/kernel.mk
@@ -6,6 +6,8 @@ kernel: linux
 $(ISO_TARGET)/var/cache/lunar/linux-$(ISO_ARCH).tar.bz2: stage2
 	cp $(ISO_SOURCE)/kernels/conf/generic $(ISO_TARGET)/etc/lunar/local/.config.current
 	yes n | tr -d '\n' | $(ISO_SOURCE)/scripts/chroot-build lin -c linux
+	mv $(ISO_TARGET)/boot/vmlinuz-* $(ISO_TARGET)/boot/linux
+	mv $(ISO_TARGET)/boot/initramfs-*.img $(ISO_TARGET)/boot/initrd
 	mv $(ISO_TARGET)/var/cache/lunar/linux-$$($(ISO_SOURCE)/scripts/chroot-build lvu installed linux)-$(ISO_BUILD).tar.bz2 $@
 
 linux: $(ISO_TARGET)/var/cache/lunar/linux-$(ISO_ARCH).tar.bz2