From 9d32b14b296e500c0c2a41db1758b03b1433a1e2 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sat, 25 Oct 2008 00:54:28 -0500 Subject: Installer config fixups Make sure we copy the boot directory we installed to the actual ISO image. We need this for vmlinuz26 and the like... Are we doing too much in the Makefile? Signed-off-by: Aaron Griffin --- configs/install-iso/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index a04b43f..47da11e 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -27,14 +27,15 @@ ftp-iso: root-image boot-files .PHONY: boot-files boot-files: mkdir -p image-dir/boot/ + cp -r work/boot/* 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 root-image: - chmod 0440 overlay/etc/sudoers 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 @@ -42,8 +43,8 @@ root-image: .PHONY: core-pkgs core-pkgs: wget --mirror -P core-pkgs -nH --cut-dirs=3 ftp://ftp.archlinux.org/core/os/$(ARCH) - mkdir image/ + mkdir image-dir/ mkarchiso -v squash core-pkgs image-dir/core-pkgs.sqfs clean: - rm -rf work image + rm -rf work image-dir $(FTPname) $(COREname) -- cgit v1.2.3-70-g09d2