faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding 'fallback' to the Makefile was stupid

Browse Source 
Add a script to build all ISOs instead.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
Aaron Griffin 2009-01-30 10:53:07 -06:00
parent f852276274
commit c749f9c321
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configs/install-iso/Makefile
View File

@ -1,4 +1,4 @@
ver=2009.01-1 ver=2009.01-beta3
kver=2.6.28-ARCH kver=2.6.28-ARCH
WORKDIR=work WORKDIR=work
@ -9,11 +9,10 @@ BOOTLOADER?=grub-gfx
PWD:=`pwd` PWD:=`pwd`
FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)
COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH) COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH)
FALLBACKname=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)-isolinux
PACKAGES="`cat packages.list` $(BOOTLOADER)" PACKAGES="`cat packages.list` $(BOOTLOADER)"
all: ftp-iso ftp-usb core-iso core-usb fallback all: ftp-iso ftp-usb core-iso core-usb
all-iso: ftp-iso core-iso all-iso: ftp-iso core-iso
all-usb: ftp-usb core-usb all-usb: ftp-usb core-usb
all-ftp: ftp-iso ftp-usb all-ftp: ftp-iso ftp-usb
@ -47,25 +46,6 @@ base-iso: root-image
mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img
mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img
fallback:
#Build the fallback ISO (isolinux) in a separate workdir
#root-image
mkarchiso -p "`cat packages.list` syslinux" create $(WORKDIR)-fallback
#base-iso
mv $(WORKDIR)-fallback/root-image/boot $(WORKDIR)-fallback/iso/
cp -r boot-files/* $(WORKDIR)-fallback/iso/boot/
#ugh... copied from syslinux rule
cp -r $(WORKDIR)-fallback/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)-fallback/iso/boot/isolinux
cp isomounts $(WORKDIR)-fallback
sed -i "s|@ARCH@|$(ARCH)|g" "$(WORKDIR)-fallback/isomounts"
mkinitcpio -c initcpio-ide -b $(WORKDIR)-fallback/root-image -k $(kver) -g $(WORKDIR)-fallback/iso/boot/archiso_ide.img
mkinitcpio -c initcpio-pata -b $(WORKDIR)-fallback/root-image -k $(kver) -g $(WORKDIR)-fallback/iso/boot/archiso_pata.img
#overlay
cp -r overlay $(WORKDIR)-fallback/
#ftp-iso
mkarchiso -f -p syslinux iso $(WORKDIR)-fallback $(FALLBACKname).iso
core-pkgs: base-iso core-pkgs: base-iso
mkdir $(WORKDIR)/core-pkgs/ mkdir $(WORKDIR)/core-pkgs/
./download-repo.sh core "$(WORKDIR)/core-pkgs" ./download-repo.sh core "$(WORKDIR)/core-pkgs"
@ -81,4 +61,4 @@ syslinux:
cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux
clean: clean:
rm -rf $(WORKDIR) $(WORKDIR)-fallback *.img.part1 $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso $(FALLBACKname).iso rm -rf $(WORKDIR) *.img.part1 $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso

20
configs/install-iso/buildall.sh Executable file
View File

@ -0,0 +1,20 @@
#!/bin/sh
arch="$(uname -m)"
mkdir release/
#Build grub iso/img's
make ARCH=$arch clean
make ARCH=$arch all
mv *.iso *.img release/
# Build isolinux iso's
make ARCH=$arch clean
make ARCH=$arch BOOTLOADER=syslinux all-iso
rename .iso -isolinux.iso *.iso
mv *.iso release/
# Upload
cd release
scp * archlinux.org:public_html/archiso/