Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/syslinux-iso/Makefile
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-10-21 19:36:38 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-12-07 23:48:24 -0300
commit9629b849c5fa40bcef469a2c6f2428f2e1569ecc (patch)
tree5d5c6dc274bc436a2761dea301e174b7f3ee7c75 /configs/syslinux-iso/Makefile
parent02caf25be944d7321506d4eb19769f7814f188f1 (diff)
[syslinux-iso] Unify dir scheme with -dual images
/syslinux/ syslinux only files /arch/boot/ memtest86+ + splash.png + ... /arch/boot/$ARCH/ Linux + initramfs /arch/ isomounts /arch/$ARCH/ *.sqfs Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'configs/syslinux-iso/Makefile')
-rw-r--r--configs/syslinux-iso/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile
index 7bc3a45..f9ce12f 100644
--- a/configs/syslinux-iso/Makefile
+++ b/configs/syslinux-iso/Makefile
@@ -36,9 +36,9 @@ $(WORKDIR)/root-image/.arch-chroot:
# Rule for make /boot
bootfiles: root-image
- mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot
- cp $(WORKDIR)/root-image/boot/System.map26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/
- cp $(WORKDIR)/root-image/boot/vmlinuz26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/
+ mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)
+ cp $(WORKDIR)/root-image/boot/System.map26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/
+ cp $(WORKDIR)/root-image/boot/vmlinuz26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/
cp $(WORKDIR)/root-image/boot/memtest86+/memtest.bin $(WORKDIR)/iso/$(INSTALL_DIR)/boot/memtest
cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/$(INSTALL_DIR)/boot/memtest.COPYING
cp boot-files/splash.png $(WORKDIR)/iso/$(INSTALL_DIR)/boot/
@@ -56,9 +56,9 @@ bootfiles: root-image
cat $(WORKDIR)/root-image/lib/modules/$(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2)/modules.alias | gzip -9 > $(WORKDIR)/iso/syslinux/hdt/modalias.gz
# Rules for initcpio images
-initcpio: $(WORKDIR)/iso/$(INSTALL_DIR)/boot/archiso.img
-$(WORKDIR)/iso/$(INSTALL_DIR)/boot/archiso.img: mkinitcpio.conf $(WORKDIR)/root-image/.arch-chroot
- mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot
+initcpio: $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/archiso.img
+$(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/archiso.img: mkinitcpio.conf $(WORKDIR)/root-image/.arch-chroot
+ mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/
mkinitcpio -c ./mkinitcpio.conf -b $(WORKDIR)/root-image -k $(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2) -g $@