Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/install-iso/Makefile
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-12-18 22:08:38 -0600
committerAaron Griffin <aaronmgriffin@gmail.com>2008-12-18 22:09:19 -0600
commit4e638eaf2430d4036df536cad6fdda219aabf114 (patch)
tree9b21ffc6c55ee6876ff6b78ae0ad496eb0886e9c /configs/install-iso/Makefile
parent30ff7ea7a61dc1c6b0d46fab69c8d149ec4586f5 (diff)
Final changes for new nextgen scripts
Too much to list. Just look at the diff 8) Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'configs/install-iso/Makefile')
-rw-r--r--configs/install-iso/Makefile62
1 files changed, 28 insertions, 34 deletions
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 7a14298..c2607e3 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -1,9 +1,11 @@
-ver=2008.10
+ver=2008.12
kver=2.6.27-ARCH
#Define outside of 'make' for other arches
ARCH=i686
+WORKDIR=work
+
PWD=`pwd`
FTPname=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)
COREname=$(PWD)/archlinux-$(ver)-core-$(ARCH)
@@ -12,44 +14,36 @@ all: core-iso core-usb ftp-iso ftp-usb
all-iso: core-iso ftp-iso
all-usb: core-usb ftp-usb
-core-usb: core-pkgs root-image boot-files
- mkarchiso -v -p grub-gfx -t disk image image-dir/ $(COREname).img
+core-usb: core-pkgs overlay
+ mkarchiso -v -p grub-gfx usb $(WORKDIR) $(FTPname).iso
-core-iso: core-pkgs root-image boot-files
- mkarchiso -v -p grub-gfx image image-dir/ $(FTPname).iso
+core-iso: core-pkgs overlay
+ mkarchiso -v -p grub-gfx iso $(WORKDIR) $(FTPname).iso
-ftp-usb: root-image boot-files
- mkarchiso -v -p grub-gfx -t disk image image-dir/ $(FTPname).img
+ftp-usb: overlay
+ mkarchiso -v -p grub-gfx usb $(WORKDIR) $(FTPname).img
-ftp-iso: root-image boot-files
- mkarchiso -v -p grub-gfx image image-dir/ $(FTPname).iso
+ftp-iso: overlay
+ mkarchiso -v -p grub-gfx iso $(WORKDIR) $(FTPname).iso
-.PHONY: boot-files
-boot-files:
- mkdir -p image-dir/boot/grub/
- mkdir -p image-dir/boot/isolinux
- #ick! this section needs reworking
- cp -r work/usr/lib/grub/i386-pc/* image-dir/boot/grub
- cp -r work/usr/lib/syslinux/isolinux.bin image-dir/boot/isolinux
- cp -r work/boot/* image-dir/boot/
- cp -r boot-files/* image-dir/boot/
- #end ick
- mkinitcpio -c initcpio-ide -b work/ -k $(kver) -g image-dir/boot/archiso_ide.img
- mkinitcpio -c initcpio-pata -b work/ -k $(kver) -g image-dir/boot/archiso_pata.img
+overlay: base-iso
+ cp -r overlay $(WORKDIR)/
root-image:
- mkarchiso -v -p "`cat packages.list-$(ARCH)`" install work
- cp -r overlay/* work
- chmod 0440 work/etc/sudoers
- mkdir image-dir/
- mkarchiso -v squash work image-dir/root-image.sqfs
-
-# hacky way to always pull
-.PHONY: core-pkgs
-core-pkgs:
- wget --mirror -P core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH)
- mkdir image-dir/
- mkarchiso -v squash core-pkgs image-dir/core-pkgs.sqfs
+ mkarchiso -v -p "`cat packages.list-$(ARCH)`" create $(WORKDIR)
+
+base-iso: root-image
+ mv $(WORKDIR)/root-image/boot $(WORKDIR)/iso/
+ cp -r boot-files/* $(WORKDIR)/iso/boot/
+ cp -r $(WORKDIR)/root-image/usr/lib/grub/i386-pc/* $(WORKDIR)/iso/boot/grub
+ cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux
+
+ 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)
clean:
- rm -rf work image-dir $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso
+ rm -rf $(WORKDIR) image-dir $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso