summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerhard Brauer <gerbra@archlinux.de>2009-07-26 11:04:25 +0200
committerAaron Griffin <aaronmgriffin@gmail.com>2009-07-27 11:03:38 -0700
commitf736e19d1e2bda6cfc14b3812f29d6106afc93b7 (patch)
treea3d9ea94eec38abed6d4b820a222e181df6da5ed
parent8d57752cedf7ecef5bf7b017755c7fc8274578b0 (diff)
downloadarchiso32-f736e19d1e2bda6cfc14b3812f29d6106afc93b7.tar.xz
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>
-rw-r--r--configs/install-iso/Makefile22
1 files changed, 11 insertions, 11 deletions
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 83e618b..cdfd8a1 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -1,4 +1,4 @@
-ver=2009.06
+ver=2009.08
kver=2.6.30-ARCH
WORKDIR=work
@@ -7,15 +7,15 @@ ARCH?=`uname -m`
BOOTLOADER?=grub-gfx
PWD:=`pwd`
-FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)
+NETname:=$(PWD)/archlinux-$(ver)-netinstall-$(ARCH)
COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH)
PACKAGES="$(shell cat packages.$(ARCH)) $(BOOTLOADER)"
-all: ftp-iso ftp-usb core-iso core-usb
-all-iso: ftp-iso core-iso
-all-usb: ftp-usb core-usb
-all-ftp: ftp-iso ftp-usb
+all: net-iso net-usb core-iso core-usb
+all-iso: net-iso core-iso
+all-usb: net-usb core-usb
+all-net: net-iso net-usb
all-core: core-iso core-usb
core-usb: core-pkgs overlay $(BOOTLOADER)
@@ -24,11 +24,11 @@ core-usb: core-pkgs overlay $(BOOTLOADER)
core-iso: core-pkgs overlay $(BOOTLOADER)
mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(COREname).iso
-ftp-usb: overlay $(BOOTLOADER)
- mkarchiso -f -p $(BOOTLOADER) usb $(WORKDIR) $(FTPname).img
+net-usb: overlay $(BOOTLOADER)
+ mkarchiso -f -p $(BOOTLOADER) usb $(WORKDIR) $(NETname).img
-ftp-iso: overlay $(BOOTLOADER)
- mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(FTPname).iso
+net-iso: overlay $(BOOTLOADER)
+ mkarchiso -f -p $(BOOTLOADER) iso $(WORKDIR) $(NETname).iso
overlay: base-iso
cp -r overlay $(WORKDIR)/
@@ -62,4 +62,4 @@ syslinux:
cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux
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