Rename ftp naming to netinstall

Modified all references from old ftp-iso/-img to netinstall.
This will fix FeatureRequest FS#14587

Signed-off-by: Gerhard Brauer <gerbra@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
Gerhard Brauer 2009-07-26 11:04:25 +02:00 committed by Aaron Griffin
parent 8d57752ced
commit f736e19d1e

View file

@ -1,4 +1,4 @@
ver=2009.06 ver=2009.08
kver=2.6.30-ARCH kver=2.6.30-ARCH
WORKDIR=work WORKDIR=work
@ -7,15 +7,15 @@ ARCH?=`uname -m`
BOOTLOADER?=grub-gfx BOOTLOADER?=grub-gfx
PWD:=`pwd` PWD:=`pwd`
FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) NETname:=$(PWD)/archlinux-$(ver)-netinstall-$(ARCH)
COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH) COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH)
PACKAGES="$(shell cat packages.$(ARCH)) $(BOOTLOADER)" PACKAGES="$(shell cat packages.$(ARCH)) $(BOOTLOADER)"
all: ftp-iso ftp-usb core-iso core-usb all: net-iso net-usb core-iso core-usb
all-iso: ftp-iso core-iso all-iso: net-iso core-iso
all-usb: ftp-usb core-usb all-usb: net-usb core-usb
all-ftp: ftp-iso ftp-usb all-net: net-iso net-usb
all-core: core-iso core-usb all-core: core-iso core-usb
core-usb: core-pkgs overlay $(BOOTLOADER) core-usb: core-pkgs overlay $(BOOTLOADER)
@ -24,11 +24,11 @@ core-usb: core-pkgs overlay $(BOOTLOADER)
core-iso: core-pkgs overlay $(BOOTLOADER) core-iso: core-pkgs overlay $(BOOTLOADER)
mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(COREname).iso mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(COREname).iso
ftp-usb: overlay $(BOOTLOADER) net-usb: overlay $(BOOTLOADER)
mkarchiso -f -p $(BOOTLOADER) usb $(WORKDIR) $(FTPname).img mkarchiso -f -p $(BOOTLOADER) usb $(WORKDIR) $(NETname).img
ftp-iso: overlay $(BOOTLOADER) net-iso: overlay $(BOOTLOADER)
mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(FTPname).iso mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(NETname).iso
overlay: base-iso overlay: base-iso
cp -r overlay $(WORKDIR)/ cp -r overlay $(WORKDIR)/
@ -62,4 +62,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) *.img.part1 $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso rm -rf $(WORKDIR) *.img.part1 $(NETname).img $(NETname).iso $(COREname).img $(COREname).iso