Rework installer config to support new changes

Lots of changes, mainly for argument processing
and things of that nature in mkarchiso. Split out
some common functionality in the Maekfile as well.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

6 files changed, 38 insertions, 33 deletions

diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 0a99075..a04b43f 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -1,41 +1,49 @@
 ver=2008.10
 kver=2.6.27-ARCH
-carch=i686
-FTPname=$(PWD)/archlinux-$(ver)-ftp-$(carch)
-COREname=$(PWD)/archlinux-$(ver)-core-$(carch)
+
+#Define outside of 'make' for other arches
+ARCH=i686
+
+PWD=`pwd`
+FTPname=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)
+COREname=$(PWD)/archlinux-$(ver)-core-$(ARCH)
 
 all: core-iso core-usb ftp-iso ftp-usb
+all-iso: core-iso ftp-iso 
+all-usb: core-usb ftp-usb
 
-core-usb: .work-core
-	mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archiso-ide.img
-	mkarchiso -v -t disk -i initcpio-pata img .work-core $(COREname).img
+core-usb: core-pkgs root-image boot-files
+	mkarchiso -v -p grub-gfx -t disk image image-dir/ $(COREname).img
 
-core-iso: .work-core
-	mkinitcpio -c initcpio-ide -b .work-core/install -k $(kver) -g .work-core/img/boot/archiso-ide.img
-	mkarchiso -v -t iso -i initcpio-pata img .work-core $(COREname).iso
+core-iso: core-pkgs root-image boot-files
+	mkarchiso -v -p grub-gfx image image-dir/ $(FTPname).iso
 
-ftp-usb: .work-ftp
-	mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archiso-ide.img
-	mkarchiso -v -t disk -i initcpio-pata img .work-ftp $(FTPname).img
+ftp-usb: root-image boot-files
+	mkarchiso -v -p grub-gfx -t disk image image-dir/ $(FTPname).img
 
-ftp-iso: .work-ftp
-	mkinitcpio -c initcpio-ide -b .work-ftp/install -k $(kver) -g .work-ftp/img/boot/archiso-ide.img
-	mkarchiso -v -t iso -i initcpio-pata img .work-ftp $(FTPname).iso
+ftp-iso: root-image boot-files
+	mkarchiso -v -p grub-gfx image image-dir/ $(FTPname).iso
 
-.work-ftp:
-	chmod 0440 overlay/etc/sudoers
-	mkarchiso -v -P packages.list-$(carch) install .work-ftp
-	mkarchiso -v squash .work-ftp
+.PHONY: boot-files
+boot-files:
+	mkdir -p image-dir/boot/
+	cp -r boot-files/* image-dir/boot/
+	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
 
-.work-core: addons/core-pkgs
+root-image:
 	chmod 0440 overlay/etc/sudoers
-	mkarchiso -v -a addons -P packages.list-$(carch) install .work-core
-	mkarchiso -v squash .work-core
+	mkarchiso -v -p "`cat packages.list-$(ARCH)`" install work
+	cp -r overlay/* work
+	mkdir image-dir/
+	mkarchiso -v squash work image-dir/root-image.sqfs
 
 # hacky way to always pull
-.PHONY: addons/core-pkgs
-addons/core-pkgs:
-	wget --mirror -P addons/core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(carch)
+.PHONY: core-pkgs
+core-pkgs:
+	wget --mirror -P core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH)
+	mkdir image/
+	mkarchiso -v squash core-pkgs image-dir/core-pkgs.sqfs
 
 clean:
-	rm -fr .work-ftp .work-core
+	rm -rf work image
diff --git a/configs/install-iso/boot-files/grub/menu.lst b/configs/install-iso/boot-files/grub/menu.lst
index 7d47842..6755d09 100644
--- a/configs/install-iso/boot-files/grub/menu.lst
+++ b/configs/install-iso/boot-files/grub/menu.lst
@@ -7,10 +7,6 @@ title  Boot ArchLinux LiveCD
 kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
 initrd /boot/archiso.img
 
-title  Boot ArchLinux LiveCD [legacy IDE]
-kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75% ide-legacy
-initrd /boot/archiso-ide.img
-
 title Tools...
 configfile /boot/grub/tools.lst
 
diff --git a/configs/install-iso/boot-files/splash.xpm.gz b/configs/install-iso/boot-files/splash.xpm.gz
index e44af43..9f128bf 100644
--- a/configs/install-iso/boot-files/splash.xpm.gz
+++ b/configs/install-iso/boot-files/splash.xpm.gz
diff --git a/configs/install-iso/mounts b/configs/install-iso/mounts
index 0946f5d..16414ca 100644
--- a/configs/install-iso/mounts
+++ b/configs/install-iso/mounts
@@ -4,4 +4,5 @@
 
 # syntax: <img> <mount point> <type>
 
-core-pkgs               /src/core/pkg       bind
+root-image     /                   bind
+core-pkgs      /src/core/pkg       bind
diff --git a/configs/install-iso/packages.list-i686 b/configs/install-iso/packages.list-i686
index f7ef459..287de78 100644
--- a/configs/install-iso/packages.list-i686
+++ b/configs/install-iso/packages.list-i686
@@ -10,9 +10,9 @@ intel-536ep
 intel-537
 ipw2100-fw
 ipw2200-fw
-ipw3945
 iwlwifi-3945-ucode
 iwlwifi-4965-ucode
+iwlwifi-5000-ucode
 lftp
 lilo
 lshwd
diff --git a/configs/install-iso/packages.list-x86_64 b/configs/install-iso/packages.list-x86_64
index d016c38..a82830e 100644
--- a/configs/install-iso/packages.list-x86_64
+++ b/configs/install-iso/packages.list-x86_64
@@ -8,9 +8,9 @@ gnu-netcat
 grub-gfx
 ipw2100-fw
 ipw2200-fw
-ipw3945
 iwlwifi-3945-ucode
 iwlwifi-4965-ucode
+iwlwifi-5000-ucode
 lftp
 lilo
 lshwd