Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[syslinux-iso] Unify dir scheme with -dual images

Browse Source 
/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>
This commit is contained in:
Gerardo Exequiel Pozzi 2010-10-21 19:36:38 -03:00
parent 02caf25be9
commit 9629b849c5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configs/syslinux-iso/Makefile
View File

@ -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 $@

4
configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
View File

@ -37,8 +37,8 @@ Boot the Arch Linux live medium. It allows you to install Arch Linux or
perform system maintenance.
ENDTEXT
MENU LABEL Boot Arch Linux
LINUX /%INSTALL_DIR%/boot/vmlinuz26
APPEND initrd=/%INSTALL_DIR%/boot/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8
LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26
APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8
# Next line should be uncommented when prepare enviroment to boot from PXE.
#IPAPPEND 3

6
configs/syslinux-iso/isomounts
View File

@ -7,6 +7,6 @@
# syntax: <img> <arch> <mount point> <type>
# ORDER MATTERS! Files take top-down precedence. Be careful
overlay.sqfs @ARCH@ / squashfs
core-pkgs.sqfs @ARCH@ / squashfs
root-image.sqfs @ARCH@ / squashfs
@ARCH@/overlay.sqfs @ARCH@ / squashfs
@ARCH@/core-pkgs.sqfs @ARCH@ / squashfs
@ARCH@/root-image.sqfs @ARCH@ / squashfs