make.sh: Drop option to generate a source ISO

This is a very weird way to distribute sources in 2017.
Let's save the environment and stop using CDs.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/Config b/lfs/Config
index 1077f25545e42421650803b9ef33166c120eb248..e647e753f2e2955f70faa4bb25857d40e407ebf3 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -175,7 +175,6 @@ define MD5
        # error mean file signature don't match the one in lfs script
        [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]
        echo "$@ checksum OK"
-       echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log
 endef
 
 define PAK

diff --git a/lfs/sources-iso b/lfs/sources-iso
deleted file mode 100644 (file)
index 4f658cf..0000000
--- a/lfs/sources-iso
+++ /dev/null
@@ -1,52 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-THISAPP    = sources-iso
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-install : $(DIR_INFO)/_build.othersrc-list.log
-       rm -rf /install/cdrom/*
-       for i in `cat $(DIR_INFO)/_build.othersrc-list.log`; do \
-               cp $(DIR_DL)/$$i /install/cdrom; \
-       done
-       
-       # make the sources CDROM iso
-       cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
-               . > /install/images/$(SNAME)-sources-cd-$(VERSION).$(BUILD_ARCH).iso
-       rm -rf /install/cdrom/*

diff --git a/make.sh b/make.sh
index f8a2e5b34ab2810f76e03b23ed13e04b03726074..b13e455c655a0b04d274e6c6c08b02d153d41ad4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1165,22 +1165,6 @@ gettoolchain)
                echo "Toolchain is already downloaded. Exiting..."
        fi
        ;;
-othersrc)
-       prepareenv
-       echo -ne "`date -u '+%b %e %T'`: Build sources iso for ${BUILD_ARCH}" | tee -a $LOGFILE
-       chroot $LFS /tools/bin/env -i   HOME=/root \
-       TERM=$TERM PS1='\u:\w\$ ' \
-       PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
-       VERSION=$VERSION NAME="$NAME" SNAME="$SNAME" BUILD_ARCH="${BUILD_ARCH}" \
-       /bin/bash -x -c "cd /usr/src/lfs && make -f sources-iso LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
-       mv $LFS/install/images/ipfire-* $BASEDIR >> $LOGFILE 2>&1
-       if [ $? -eq "0" ]; then
-               beautify message DONE
-       else
-               beautify message FAIL
-       fi
-       stdumount
-       ;;
 uploadsrc)
        PWD=`pwd`
        if [ -z $IPFIRE_USER ]; then