diff options
| author | Aaron Griffin <aaronmgriffin@gmail.com> | 2008-12-21 02:20:56 -0600 |
|---|---|---|
| committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2008-12-21 02:20:56 -0600 |
| commit | 4c3572f415e6e640154dbcb385ea3f524004d4c9 (patch) | |
| tree | 0782c23616992e7800a2f1a0d8e3fbe001e75d54 /configs/install-iso/Makefile | |
| parent | 77e9ea45caa7608557b1443acf0ae7d1b27248de (diff) | |
Cleanup the install-iso Makefile
Also do some tidying of the config and set the
default timezone to nothing, to prevent hiccups on
rc.shutdown
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'configs/install-iso/Makefile')
| -rw-r--r-- | configs/install-iso/Makefile | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index 63dabc5..1cf261c 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -1,15 +1,16 @@ ver=2008.12 kver=2.6.27-ARCH -#Define outside of 'make' for other arches -ARCH=i686 - WORKDIR=work -BOOTLOADER=grub-gfx -PWD=`pwd` -FTPname=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) -COREname=$(PWD)/archlinux-$(ver)-core-$(ARCH) +ARCH?=i686 +BOOTLOADER?=grub-gfx + +PWD:=`pwd` +FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) +COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH) + +PACKAGES="`cat packages.list` $(BOOTLOADER)" all: core-iso core-usb ftp-iso ftp-usb all-iso: core-iso ftp-iso @@ -31,15 +32,21 @@ overlay: base-iso cp -r overlay $(WORKDIR)/ root-image: - mkarchiso -p "`cat packages.list-$(ARCH)` $(BOOTLOADER)" create $(WORKDIR) + mkarchiso -p "$(PACKAGES)" create $(WORKDIR) base-iso: root-image mv $(WORKDIR)/root-image/boot $(WORKDIR)/iso/ cp -r boot-files/* $(WORKDIR)/iso/boot/ + cp isomounts $(WORKDIR) - 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 + 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 +core-pkgs: base-iso + mkdir $(WORKDIR)/core-pkgs/ + wget --mirror -P $(WORKDIR)/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH) + +# Bootloaders grub-gfx: cp -r $(WORKDIR)/root-image/usr/lib/grub/i386-pc/* $(WORKDIR)/iso/boot/grub @@ -49,9 +56,5 @@ grub: isolinux: cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux -core-pkgs: base-iso - mkdir $(WORKDIR)/core-pkgs/ - wget --mirror -P $(WORKDIR)/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH) - clean: rm -rf $(WORKDIR) $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso |