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

[syslinux-cfg] Adjust to work with new -D option of mkarchiso

Browse Source 
This is how ISO will look now:
/syslinux    only syslinux related files (syslinux.cfg, *.c32, etc)
/arch/       isomounts + *.sqfs images
/arch/boot/  Linux + initramfs + Memtest86+ + other files for early boot stage

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2010-10-17 23:36:41 -03:00
parent c186a206a1
commit aae85f4ecb
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
configs/syslinux-iso/Makefile
View File

@ -1,6 +1,7 @@
ver=$(shell date +%Y.%m.%d) ver=$(shell date +%Y.%m.%d)
WORKDIR=work WORKDIR=work
INSTALL_DIR=arch
ARCH?=$(shell uname -m) ARCH?=$(shell uname -m)
@ -19,9 +20,9 @@ core-iso: $(COREname)
net-iso: $(NETname) net-iso: $(NETname)
$(COREname): core-pkgs base-fs $(COREname): core-pkgs base-fs
mkarchiso iso $(WORKDIR) $@ mkarchiso -D $(INSTALL_DIR) iso $(WORKDIR) $@
$(NETname): base-fs $(NETname): base-fs
mkarchiso iso $(WORKDIR) $@ mkarchiso -D $(INSTALL_DIR) iso $(WORKDIR) $@
# This is the main rule for make the working filesystem. # This is the main rule for make the working filesystem.
base-fs: root-image bootfiles initcpio overlay iso-mounts base-fs: root-image bootfiles initcpio overlay iso-mounts
@ -30,32 +31,34 @@ base-fs: root-image bootfiles initcpio overlay iso-mounts
# Rules for make the root-image for base filesystem. # Rules for make the root-image for base filesystem.
root-image: $(WORKDIR)/root-image/.arch-chroot root-image: $(WORKDIR)/root-image/.arch-chroot
$(WORKDIR)/root-image/.arch-chroot: $(WORKDIR)/root-image/.arch-chroot:
mkarchiso -p base create $(WORKDIR) mkarchiso -D $(INSTALL_DIR) -p base create $(WORKDIR)
mkarchiso -p $(PACKAGES) create $(WORKDIR) mkarchiso -D $(INSTALL_DIR) -p $(PACKAGES) create $(WORKDIR)
# Rule for make /boot # Rule for make /boot
bootfiles: root-image bootfiles: root-image
mkdir -p $(WORKDIR)/iso/boot mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot
cp $(WORKDIR)/root-image/boot/System.map26 $(WORKDIR)/iso/boot/ cp $(WORKDIR)/root-image/boot/System.map26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/
cp $(WORKDIR)/root-image/boot/vmlinuz26 $(WORKDIR)/iso/boot/ cp $(WORKDIR)/root-image/boot/vmlinuz26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/
cp $(WORKDIR)/root-image/boot/memtest86+/memtest.bin $(WORKDIR)/iso/boot/memtest 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/boot/memtest.COPYING cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/$(INSTALL_DIR)/boot/memtest.COPYING
cp -r boot-files/* $(WORKDIR)/iso/boot/ cp boot-files/splash.png $(WORKDIR)/iso/$(INSTALL_DIR)/boot/
cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/syslinux/ mkdir -p $(WORKDIR)/iso/syslinux
cp $(WORKDIR)/root-image/usr/lib/syslinux/poweroff.com $(WORKDIR)/iso/boot/syslinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/syslinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/poweroff.com $(WORKDIR)/iso/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/syslinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/syslinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(WORKDIR)/iso/boot/syslinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(WORKDIR)/iso/syslinux/
cp boot-files/syslinux/syslinux.cfg $(WORKDIR)/iso/syslinux/syslinux.cfg
# Add pci.ids and modules.alias for hdt # Add pci.ids and modules.alias for hdt
mkdir -p $(WORKDIR)/iso/boot/syslinux/hdt/ mkdir -p $(WORKDIR)/iso/syslinux/hdt/
wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > $(WORKDIR)/iso/boot/syslinux/hdt/pciids.gz wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > $(WORKDIR)/iso/syslinux/hdt/pciids.gz
cat $(WORKDIR)/root-image/lib/modules/$(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2)/modules.alias | gzip -9 > $(WORKDIR)/iso/boot/syslinux/hdt/modalias.gz 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 # Rules for initcpio images
initcpio: $(WORKDIR)/iso/boot/archiso.img initcpio: $(WORKDIR)/iso/$(INSTALL_DIR)/boot/archiso.img
$(WORKDIR)/iso/boot/archiso.img: mkinitcpio.conf $(WORKDIR)/root-image/.arch-chroot $(WORKDIR)/iso/$(INSTALL_DIR)/boot/archiso.img: mkinitcpio.conf $(WORKDIR)/root-image/.arch-chroot
mkdir -p $(WORKDIR)/iso/boot mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot
mkinitcpio -c ./mkinitcpio.conf -b $(WORKDIR)/root-image -k $(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2) -g $@ mkinitcpio -c ./mkinitcpio.conf -b $(WORKDIR)/root-image -k $(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2) -g $@
@ -68,8 +71,8 @@ overlay:
# Rule to process isomounts file. # Rule to process isomounts file.
iso-mounts: $(WORKDIR)/isomounts iso-mounts: $(WORKDIR)/iso/$(INSTALL_DIR)/isomounts
$(WORKDIR)/isomounts: isomounts root-image $(WORKDIR)/iso/$(INSTALL_DIR)/isomounts: isomounts root-image
sed "s|@ARCH@|$(ARCH)|g" isomounts > $@ sed "s|@ARCH@|$(ARCH)|g" isomounts > $@

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

@ -1,7 +1,7 @@
DEFAULT vesamenu.c32 DEFAULT vesamenu.c32
PROMPT 0 PROMPT 0
MENU TITLE Arch Linux MENU TITLE Arch Linux
MENU BACKGROUND /boot/splash.png MENU BACKGROUND /%INSTALL_DIR%/boot/splash.png
TIMEOUT 3000 TIMEOUT 3000
# TODO: Replace these crappy messages with something useful # TODO: Replace these crappy messages with something useful
@ -37,8 +37,8 @@ Boot the Arch Linux live medium. It allows you to install Arch Linux or
perform system maintenance. perform system maintenance.
ENDTEXT ENDTEXT
MENU LABEL Boot Arch Linux MENU LABEL Boot Arch Linux
LINUX /boot/vmlinuz26 LINUX /%INSTALL_DIR%/boot/vmlinuz26
APPEND initrd=/boot/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 APPEND initrd=/%INSTALL_DIR%/boot/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. # Next line should be uncommented when prepare enviroment to boot from PXE.
#IPAPPEND 3 #IPAPPEND 3
@ -54,7 +54,7 @@ APPEND hd0 0
# http://www.memtest.org/ # http://www.memtest.org/
LABEL memtest LABEL memtest
MENU LABEL Run Memtest86+ (RAM test) MENU LABEL Run Memtest86+ (RAM test)
LINUX /boot/memtest LINUX /%INSTALL_DIR%/boot/memtest
# http://hdt-project.org/ # http://hdt-project.org/
LABEL hdt LABEL hdt