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.

diff --git a/lfs/cdrom b/lfs/cdrom
index 3c7a20ed6353f0b5a9fc102e43d0f62a3413a401..c61cd91bd5a90fad63e20daf817fa500b9df0612 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -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

diff --git a/lfs/flash-images b/lfs/flash-images
index b9618f9d399094d4e244a68292958c824991d68d..fb1ca3da9902435704c0876b7273782b81346740 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -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

diff --git a/lfs/usb-stick b/lfs/usb-stick
index acfa409395b45a93b88d7a17e10dbce06ff3c7bf..4c5e716b03871e19f8404337175f76a3af39eacb 100644 (file)
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -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 && \

diff --git a/lfs/xen-image b/lfs/xen-image
index 1b123a72dae4905229cbcf506ce44294d9312f3f..4ab32b49241a96e6d6ed8188ed4f8c17aaed182a 100644 (file)
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -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

diff --git a/make.sh b/make.sh
index 1679d3293a9f07fde8592187e3a2722809e6a084..797ba96de2bd6ee853a1561086c52f21f92fb589 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -38,7 +38,6 @@ MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
 TOOLCHAINVER=1
-IPFVER="full"                          # Which versions should be compiled? (full|devel)
 
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then
@@ -777,14 +776,14 @@ buildpackages() {
   $0 git log
 
   # Create images for install
-  ipfiremake cdrom ED=$IPFVER
+  ipfiremake cdrom
 
   # Check if there is a loop device for building in virtual environments
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
        if [ "${MACHINE_TYPE}" != "arm" ]; then
-               ipfiremake usb-stick ED=$IPFVER
+               ipfiremake usb-stick
        fi
-       ipfiremake flash-images ED=$IPFVER
+       ipfiremake flash-images
   fi
 
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
@@ -795,7 +794,7 @@ buildpackages() {
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
         cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
         cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
-       ipfiremake xen-image ED=$IPFVER
+       ipfiremake xen-image
        rm -rf $LFS/install/packages/linux-xen-*.ipfire
        rm -rf $LFS/install/packages/meta-linux-xen
   fi

diff --git a/tools/make-functions b/tools/make-functions
index e6333a3838b3675401b0177f6242b0cbe465aa07..8031bc83613047f7ed88fa947ac9f220608fb32e 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -399,7 +399,6 @@ lfsmake2() {
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                                MACHINE_TYPE="$MACHINE_TYPE" \
-                                               IPFVER="$IPFVER" \
                                                /tools/bin/bash -x -c "cd /usr/src/lfs && \
                                                make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
        local COMPILE_SUCCESS=$?
@@ -432,7 +431,6 @@ ipfiremake() {
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                                MACHINE_TYPE="$MACHINE_TYPE" \
-                                               IPFVER="$IPFVER" \
                                                /bin/bash -x -c "cd /usr/src/lfs && \
                                                make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
 
@@ -461,7 +459,7 @@ ipfiredist() {
                                        NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                        CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
                                        CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
-                                       KVER=$KVER IPFVER="$IPFVER" \
+                                       KVER=$KVER \
                                        BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                        MACHINE_TYPE="$MACHINE_TYPE" \
                                        /bin/bash -x -c "cd /usr/src/lfs && \
@@ -493,7 +491,7 @@ installmake() {
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="-Os" CXXFLAGS="-Os" \
                                                CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
-                                               KVER=$KVER IPFVER="$IPFVER" \
+                                               KVER=$KVER \
                                                BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                                MACHINE_TYPE="$MACHINE_TYPE" \
                    /bin/bash -x -c "cd /usr/src/lfs && \