diff options
| -rw-r--r-- | configs/syslinux-iso/Makefile | 27 | ||||
| -rw-r--r-- | configs/syslinux-iso/boot-files/isolinux/isolinux.cfg | 2 | ||||
| -rw-r--r-- | configs/syslinux-iso/boot-files/x86test (renamed from configs/syslinux-iso/boot-files/x86test_zImage.bin) | bin | 38695 -> 38695 bytes | |||
| -rw-r--r-- | configs/syslinux-iso/boot-files/x86test.COPYING (renamed from configs/syslinux-iso/boot-files/x86test_zImage.bin.COPYING) | 0 |
4 files changed, 14 insertions, 15 deletions
diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile index 0cce23c..e7bc245 100644 --- a/configs/syslinux-iso/Makefile +++ b/configs/syslinux-iso/Makefile @@ -9,7 +9,7 @@ PWD=$(shell pwd) NETname=$(PWD)/archlinux-$(ver)-netinstall-$(ARCH).iso COREname=$(PWD)/archlinux-$(ver)-core-$(ARCH).iso -PACKAGES="$(shell cat packages.$(ARCH)) $(BOOTLOADER)" +PACKAGES="$(shell cat packages.$(ARCH))" all: net-iso core-iso @@ -18,12 +18,12 @@ core-iso: $(COREname) net-iso: $(NETname) $(COREname): core-pkgs base-fs - mkarchiso -p syslinux iso $(WORKDIR) $@ + mkarchiso iso $(WORKDIR) $@ $(NETname): base-fs - mkarchiso -p syslinux iso $(WORKDIR) $@ + mkarchiso iso $(WORKDIR) $@ # This is the main rule for make the working filesystem. -base-fs: root-image boot-files initcpio overlay iso-mounts syslinux +base-fs: root-image bootfiles initcpio overlay iso-mounts # Rules for make the root-image for base filesystem. @@ -32,9 +32,14 @@ $(WORKDIR)/root-image/.arch-chroot: mkarchiso -p $(PACKAGES) create $(WORKDIR) # Rule for make /boot -boot-files: root-image - cp -r $(WORKDIR)/root-image/boot $(WORKDIR)/iso/ +bootfiles: root-image + cp $(WORKDIR)/root-image/boot/System.map26 $(WORKDIR)/iso/ + cp $(WORKDIR)/root-image/boot/vmlinuz26 $(WORKDIR)/iso/ + cp $(WORKDIR)/root-image/boot/memtest86+/memtest.bin $(WORKDIR)/iso/memtest + cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/boot/memtest.COPYING cp -r boot-files/* $(WORKDIR)/iso/boot/ + cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/isolinux/ + cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux/ # Rules for initcpio images @@ -63,13 +68,6 @@ core-pkgs: ./download-repo.sh core $(WORKDIR)/core-pkgs -# Rules for the bootloader -syslinux: root-image - mkdir -p $(WORKDIR)/iso/boot/isolinux - cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/isolinux/ - cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux/ - - # Clean-up all work clean: rm -rf $(WORKDIR) $(NETname) $(COREname) @@ -77,8 +75,7 @@ clean: .PHONY: all core-iso net-iso .PHONY: base-fs -.PHONY: root-image boot-files initcpio overlay iso-mounts +.PHONY: root-image bootfiles initcpio overlay iso-mounts .PHONY: core-pkgs -.PHONY: syslinux .PHONY: clean diff --git a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg index 7ce1ae1..821dd5b 100644 --- a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg +++ b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg @@ -36,10 +36,12 @@ MENU LABEL Boot Arch Linux KERNEL /boot/vmlinuz26 APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75% initrd=/boot/archiso.img radeon.modeset=0 +# http://www.memtest.org/ LABEL memtest MENU LABEL Run Memtest86+ (RAM test) KERNEL /boot/memtest +# http://www.vortex.prodigynet.co.uk/x86test/ LABEL x86test MENU LABEL Run x86test (CPU test) KERNEL /boot/x86test diff --git a/configs/syslinux-iso/boot-files/x86test_zImage.bin b/configs/syslinux-iso/boot-files/x86test Binary files differindex 8c598e1..8c598e1 100644 --- a/configs/syslinux-iso/boot-files/x86test_zImage.bin +++ b/configs/syslinux-iso/boot-files/x86test diff --git a/configs/syslinux-iso/boot-files/x86test_zImage.bin.COPYING b/configs/syslinux-iso/boot-files/x86test.COPYING index d511905..d511905 100644 --- a/configs/syslinux-iso/boot-files/x86test_zImage.bin.COPYING +++ b/configs/syslinux-iso/boot-files/x86test.COPYING |