summaryrefslogtreecommitdiff
path: root/configs/install-iso/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'configs/install-iso/Makefile')
-rw-r--r--configs/install-iso/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index a04b43f..30247a7 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -26,15 +26,19 @@ ftp-iso: root-image boot-files
.PHONY: boot-files
boot-files:
- mkdir -p image-dir/boot/
+ mkdir -p image-dir/boot/grub/
+ #ick! this section needs reworking
+ cp -r work/usr/lib/grub/i386-pc/* image-dir/boot/grub
+ 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
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 +46,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).img $(FTPname).iso $(COREname).img $(COREname).iso