Revision: 6039 http://ipcop.svn.sourceforge.net/ipcop/?rev=6039&view=rev Author: gespinasse Date: 2011-11-06 19:57:25 +0000 (Sun, 06 Nov 2011) Log Message: ----------- Remove lfs/stage5, there is only 2 commands to run and move the 2 lines to lfs/installer
Modified Paths: -------------- ipcop/trunk/lfs/installer ipcop/trunk/make.sh Removed Paths: ------------- ipcop/trunk/lfs/stage5 Modified: ipcop/trunk/lfs/installer =================================================================== --- ipcop/trunk/lfs/installer 2011-11-06 19:48:24 UTC (rev 6038) +++ ipcop/trunk/lfs/installer 2011-11-06 19:57:25 UTC (rev 6039) @@ -57,6 +57,10 @@ ############################################################################### $(TARGET) : $(firstword $(MAKEFILE_LIST)) + # First, start clean by removing anything from previous stage 5 runs + rm -fr /$(INSTALLER_DIR)/{cdrom,images,initramfs} + mkdir -p /$(INSTALLER_DIR)/{cdrom,images,initramfs} + @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/installer/* $(DIR_APP) cd $(DIR_APP) && make Deleted: ipcop/trunk/lfs/stage5 =================================================================== --- ipcop/trunk/lfs/stage5 2011-11-06 19:48:24 UTC (rev 6038) +++ ipcop/trunk/lfs/stage5 2011-11-06 19:57:25 UTC (rev 6039) @@ -1,61 +0,0 @@ -############################################################################### -# This file is part of the IPCop Firewall. # -# # -# IPCop 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPCop 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 IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard <r...@sunsetsystems.com> # -# # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < m...@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id$ -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -PKG_NAME = stage5 -HOST_ARCH = all -OTHER_SRC = no - -THISAPP = stage5 - -############################################################################### -# Top-level Rules -############################################################################### - -check : - -download : - -md5 : - -############################################################################### -# Installation Details -############################################################################### - -install : - - # First, start clean by removing anything from previous runs - rm -fr /$(INSTALLER_DIR)/{cdrom,images,initramfs} - mkdir -p /$(INSTALLER_DIR)/{cdrom,images,initramfs} - - # yes we want it rebuilt at each time, so no PRE/POSTBUILD Modified: ipcop/trunk/make.sh =================================================================== --- ipcop/trunk/make.sh 2011-11-06 19:48:24 UTC (rev 6038) +++ ipcop/trunk/make.sh 2011-11-06 19:57:25 UTC (rev 6039) @@ -1918,7 +1918,6 @@ ${MKDIR} ${BASEDIR}/files_${MACHINE}/05_packages ${MKDIR} ${BASEDIR}/log_${MACHINE}/05_packages - chroot_make stage5 chroot_make fix-up chroot_make installer chroot_make initramfs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 _______________________________________________ Ipcop-svn mailing list Ipcop-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ipcop-svn