| index : archiso32 | |
| Archlinux32 iso tools | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | configs/install-iso/Makefile | 24 |
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index 26f17b8..2b6d7f3 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -9,10 +9,11 @@ BOOTLOADER?=grub-gfx PWD:=`pwd` FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH) +FALLBACKname=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)-isolinux PACKAGES="`cat packages.list` $(BOOTLOADER)" -all: ftp-iso ftp-usb core-iso core-usb +all: ftp-iso ftp-usb core-iso core-usb fallback all-iso: ftp-iso core-iso all-usb: ftp-usb core-usb all-ftp: ftp-iso ftp-usb @@ -45,6 +46,25 @@ base-iso: root-image mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img +fallback: + #Build the fallback ISO (isolinux) in a separate workdir + #root-image + mkarchiso -p "`cat packages.list` syslinux" create $(WORKDIR)-fallback + #base-iso + mv $(WORKDIR)-fallback/root-image/boot $(WORKDIR)-fallback/iso/ + cp -r boot-files/* $(WORKDIR)-fallback/iso/boot/ + #ugh... copied from syslinux rule + cp -r $(WORKDIR)-fallback/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)-fallback/iso/boot/isolinux + cp isomounts $(WORKDIR)-fallback + sed -i "s|@ARCH@|$(ARCH)|g" "$(WORKDIR)-fallback/isomounts" + + mkinitcpio -c initcpio-ide -b $(WORKDIR)-fallback/root-image -k $(kver) -g $(WORKDIR)-fallback/iso/boot/archiso_ide.img + mkinitcpio -c initcpio-pata -b $(WORKDIR)-fallback/root-image -k $(kver) -g $(WORKDIR)-fallback/iso/boot/archiso_pata.img + #overlay + cp -r overlay $(WORKDIR)-fallback/ + #ftp-iso + mkarchiso -f -p syslinux iso $(WORKDIR)-fallback $(FALLBACKname).iso + core-pkgs: base-iso mkdir $(WORKDIR)/core-pkgs/ ./download-repo.sh core "$(WORKDIR)/core-pkgs" @@ -60,4 +80,4 @@ syslinux: cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux clean: - rm -rf $(WORKDIR) *.img.part1 $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso + rm -rf $(WORKDIR) $(WORKDIR)-fallback *.img.part1 $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso $(FALLBACKname).iso |