Remove ED=full.

This was needed to distinct between a full version of IPFire,
a light one without a package manager and a development version
containing a C compiler and stuff.
None of that except the full version were ever realized and so
we can drop the code.
This commit is contained in:
Michael Tremer
2011-09-18 14:43:49 +02:00
parent 9f86ef66a0
commit 3c9374292a
6 changed files with 14 additions and 21 deletions

View File

@@ -102,9 +102,9 @@ endif
ifeq "$(MACHINE_TYPE)" "arm"
cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
. > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED)-core$(CORE).iso
. > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso
else
cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED)-core$(CORE).iso
-c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso
endif

View File

@@ -44,8 +44,8 @@ md5 :
###############################################################################
# Installation Details
###############################################################################
IMGinst := /install/images/$(SNAME)-$(VERSION).1gb-ext2.$(MACHINE)-$(ED)-core$(CORE).img
IMGinsts := /install/images/$(SNAME)-$(VERSION).1gb-ext2-scon.$(MACHINE)-$(ED)-core$(CORE).img
IMGinst := /install/images/$(SNAME)-$(VERSION).1gb-ext2.$(MACHINE)-full-core$(CORE).img
IMGinsts := /install/images/$(SNAME)-$(VERSION).1gb-ext2-scon.$(MACHINE)-full-core$(CORE).img
MNThdd := /install/harddisk
IMGpart := /install/images/part_area
IMGboot := /install/images/bootfs

View File

@@ -44,15 +44,11 @@ md5 :
###############################################################################
# Installation Details
###############################################################################
IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE)-$(ED)-core$(CORE).img
IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE)-$(ED)-core$(CORE).img
IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE)-full-core$(CORE).img
IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE)-full-core$(CORE).img
IMGfs := /install/images/fs
ifeq "$(ED)" "devel"
DISKSIZE=480000
else
DISKSIZE=120000
endif
DISKSIZE=120000
define COPY_TO_IMG
mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \

View File

@@ -44,7 +44,7 @@ md5 :
###############################################################################
# Installation Details
###############################################################################
IMGinst := /install/images/$(SNAME)-$(VERSION).xen.$(MACHINE)-$(ED)-core$(CORE).tar.bz2
IMGinst := /install/images/$(SNAME)-$(VERSION).xen.$(MACHINE)-full-core$(CORE).tar.bz2
MNThdd := /install/harddisk
IMGboot := /install/images/$(SNAME)/$(SNAME)-boot.img