Revision: 7551
http://sourceforge.net/p/ipcop/svn/7551
Author: owes
Date: 2014-05-18 07:20:47 +0000 (Sun, 18 May 2014)
Log Message:
-----------
Rename lfs update file.
Modified Paths:
--------------
ipcop/trunk/make.sh
Added Paths:
-----------
ipcop/trunk/lfs/ipcop-update
Removed Paths:
-------------
ipcop/trunk/lfs/update
Copied: ipcop/trunk/lfs/ipcop-update (from rev 7549, ipcop/trunk/lfs/update)
===================================================================
--- ipcop/trunk/lfs/ipcop-update (rev 0)
+++ ipcop/trunk/lfs/ipcop-update 2014-05-18 07:20:47 UTC (rev 7551)
@@ -0,0 +1,89 @@
+###############################################################################
+# 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 = update
+HOST_ARCH = all
+OTHER_SRC = no
+
+THISAPP = $(PKG_NAME)
+# no TARGET as no POSTBUILD
+
+IPCOP_UPDATE_DIR = $(DIR_SRC)/updates/$(PASS)
+IPCOP_UPDATE_FILE = $(SNAME)-$(PASS)-update.$(MACHINE).tgz
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+check :
+
+download :
+
+md5 :
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+install :
+ # Clean out some old stuff first
+ rm -rf /$(INSTALLER_DIR)/images/$(IPCOP_UPDATE_FILE) /tmp/*
+
+ # Build update for architecture: $(MACHINE) version: $(PASS)
+
+ # Collect the files that have changed since last IPCop version
+ tar -c --files-from=$(IPCOP_UPDATE_DIR)/ROOTFILES.${MACHINE}-${PASS} \
+ -f /tmp/patch.tar --exclude='#*'
+ cd /tmp && tar -xf /tmp/patch.tar && rm /tmp/patch.tar
+ # Same stripping code as lfs/ipcop-boot-cd plus hide empty path from
find that may happen
+ cd /tmp && find ${EXEC_PATH} -type f 2>/dev/null | xargs
/$(TOOLS_DIR)/bin/strip --strip-all 2>&1 | \
+ grep -v 'File format not recognized' || true
+
+ # allow tar to fail when nothing yet is include in update
+ cd /tmp && tar -cz --exclude=/tmp/patch.tar.gz -f /tmp/patch.tar.gz *
|| true
+ # now remove everything except the package as other files are inside
+ find /tmp/* -not -name patch.tar.gz -delete
+
+ # Add some additional files for the update
+ cp $(IPCOP_UPDATE_DIR)/{setup,information.xml} /tmp
+ echo "$(MACHINE)" >/tmp/ARCH
+ find $(IPCOP_UPDATE_DIR) -name '*.patch' -type f -exec cp -v {} /tmp \;
+
+ # Make sure setup is executable
+ chmod 755 /tmp/setup
+
+ # Build the update, make sure that the files are root owned
+ cd /tmp && tar --owner root -cz -C /tmp -f
/$(INSTALLER_DIR)/images/$(IPCOP_UPDATE_FILE) *
+
+ # yes we want it rebuild at each time, so no POSTBUILD
Deleted: ipcop/trunk/lfs/update
===================================================================
--- ipcop/trunk/lfs/update 2014-05-18 06:58:32 UTC (rev 7550)
+++ ipcop/trunk/lfs/update 2014-05-18 07:20:47 UTC (rev 7551)
@@ -1,89 +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 = update
-HOST_ARCH = all
-OTHER_SRC = no
-
-THISAPP = $(PKG_NAME)
-# no TARGET as no POSTBUILD
-
-IPCOP_UPDATE_DIR = $(DIR_SRC)/updates/$(PASS)
-IPCOP_UPDATE_FILE = $(SNAME)-$(PASS)-update.$(MACHINE).tgz
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-install :
- # Clean out some old stuff first
- rm -rf /$(INSTALLER_DIR)/images/$(IPCOP_UPDATE_FILE) /tmp/*
-
- # Build update for architecture: $(MACHINE) version: $(PASS)
-
- # Collect the files that have changed since last IPCop version
- tar -c --files-from=$(IPCOP_UPDATE_DIR)/ROOTFILES.${MACHINE}-${PASS} \
- -f /tmp/patch.tar --exclude='#*'
- cd /tmp && tar -xf /tmp/patch.tar && rm /tmp/patch.tar
- # Same stripping code as lfs/cdrom plus hide empty path from find that
may happen
- cd /tmp && find ${EXEC_PATH} -type f 2>/dev/null | xargs
/$(TOOLS_DIR)/bin/strip --strip-all 2>&1 | \
- grep -v 'File format not recognized' || true
-
- # allow tar to fail when nothing yet is include in update
- cd /tmp && tar -cz --exclude=/tmp/patch.tar.gz -f /tmp/patch.tar.gz *
|| true
- # now remove everything except the package as other files are inside
- find /tmp/* -not -name patch.tar.gz -delete
-
- # Add some additional files for the update
- cp $(IPCOP_UPDATE_DIR)/{setup,information.xml} /tmp
- echo "$(MACHINE)" >/tmp/ARCH
- find $(IPCOP_UPDATE_DIR) -name '*.patch' -type f -exec cp -v {} /tmp \;
-
- # Make sure setup is executable
- chmod 755 /tmp/setup
-
- # Build the update, make sure that the files are root owned
- cd /tmp && tar --owner root -cz -C /tmp -f
/$(INSTALLER_DIR)/images/$(IPCOP_UPDATE_FILE) *
-
- # yes we want it rebuild at each time, so no POSTBUILD
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-05-18 06:58:32 UTC (rev 7550)
+++ ipcop/trunk/make.sh 2014-05-18 07:20:47 UTC (rev 7551)
@@ -2021,10 +2021,10 @@
if [ "${VERSIONSTEP}" ]; then
PASS="${VERSIONSTEP}"
- chroot_make update
+ chroot_make ipcop-update
fi
PASS="${VERSION}"
- chroot_make update
+ chroot_make ipcop-update
PASS=""
chroot_make ipcop-boot-cd
chroot_make ipcop-boot-net
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
