From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 23 Nov 2017 12:01:39 +0000 (+0000)
Subject: make.sh: Drop option to generate a source ISO
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=021169a98b1b6a20092f35a76ad40ebbf2d340ad;p=people%2Fms%2Fipfire-2.x.git

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 71fddaafec..a45b76b995 100644
--- 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
index 4f658cf540..0000000000
--- 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 5ccd298551..020ceb963c 100755
--- a/make.sh
+++ b/make.sh
@@ -1168,22 +1168,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_DIR}/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