Revision: 7542
http://sourceforge.net/p/ipcop/svn/7542
Author: owes
Date: 2014-05-17 10:27:38 +0000 (Sat, 17 May 2014)
Log Message:
-----------
Rename and move installer and programs
Modified Paths:
--------------
ipcop/trunk/make.sh
Added Paths:
-----------
ipcop/trunk/config/rootfiles/common/ipcop-installer
ipcop/trunk/config/rootfiles/common/ipcop-progs
ipcop/trunk/lfs/ipcop-installer
ipcop/trunk/lfs/ipcop-progs
ipcop/trunk/src/progs/
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/installer
ipcop/trunk/config/rootfiles/common/misc-progs
ipcop/trunk/lfs/installer
ipcop/trunk/lfs/misc-progs
ipcop/trunk/src/misc-progs/
Deleted: ipcop/trunk/config/rootfiles/common/installer
===================================================================
--- ipcop/trunk/config/rootfiles/common/installer 2014-05-17 10:24:37 UTC
(rev 7541)
+++ ipcop/trunk/config/rootfiles/common/installer 2014-05-17 10:27:38 UTC
(rev 7542)
@@ -1,3 +0,0 @@
-## installer
-##
-usr/local/sbin/setup
Copied: ipcop/trunk/config/rootfiles/common/ipcop-installer (from rev 7540,
ipcop/trunk/config/rootfiles/common/installer)
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop-installer
(rev 0)
+++ ipcop/trunk/config/rootfiles/common/ipcop-installer 2014-05-17 10:27:38 UTC
(rev 7542)
@@ -0,0 +1,3 @@
+## installer
+##
+usr/local/sbin/setup
Copied: ipcop/trunk/config/rootfiles/common/ipcop-progs (from rev 7540,
ipcop/trunk/config/rootfiles/common/misc-progs)
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop-progs
(rev 0)
+++ ipcop/trunk/config/rootfiles/common/ipcop-progs 2014-05-17 10:27:38 UTC
(rev 7542)
@@ -0,0 +1,101 @@
+#etc/rc.d
+#etc/rc.d/rc.bewanadsl
+etc/rc.d/rc.conexantpciadsl
+#etc/rc.d/rc.conexantusbadsl
+etc/rc.d/rc.connectioncheck
+etc/rc.d/rc.dnsmasq
+etc/rc.d/rc.eagleusbadsl
+etc/rc.d/rc.eciadsl
+etc/rc.d/rc.event
+etc/rc.d/rc.event.local
+etc/rc.d/rc.firewall
+etc/rc.d/rc.firewall.local
+etc/rc.d/rc.flash.down
+etc/rc.d/rc.flash.up
+etc/rc.d/rc.fritzdsl
+etc/rc.d/rc.halt
+etc/rc.d/rc.isdn
+etc/rc.d/rc.net
+etc/rc.d/rc.pulsardsl
+etc/rc.d/rc.red
+etc/rc.d/rc.solosdsl
+etc/rc.d/rc.sysinit
+etc/rc.d/rc.updatered
+etc/rc.d/rc.wanpipe
+sbin/mkinitramfs
+#usr/lib/ipcop
+usr/lib/ipcop/DataAccess.pl
+usr/lib/ipcop/countries.pl
+usr/lib/ipcop/ddns-lib.pl
+usr/lib/ipcop/firewall-lib.pl
+usr/lib/ipcop/general-functions.pl
+usr/lib/ipcop/header.pl
+usr/lib/ipcop/lang.pl
+usr/lib/ipcop/library.sh
+#usr/lib/ipcop/multilines.pl
+usr/lib/ipcop/protocols.pl
+usr/lib/ipcop/scheduler-lib.pl
+usr/lib/ipcop/traffic-lib.pl
+usr/lib/ipcop/vpn-functions.pl
+usr/local/bin/Make
+usr/local/bin/accountingctrl
+usr/local/bin/aggregatetraffic.pl
+usr/local/bin/blacklistupdate.pl
+#usr/local/bin/build-rdepend
+usr/local/bin/cc
+usr/local/bin/compile.help
+usr/local/bin/configure
+usr/local/bin/conntrack_helper
+usr/local/bin/dhcpcd.sh
+usr/local/bin/disk-partition.sh
+usr/local/bin/emailhelper
+usr/local/bin/gcc
+usr/local/bin/httpscert
+usr/local/bin/installfcdsl
+usr/local/bin/installpackage
+usr/local/bin/iowrap
+usr/local/bin/ipcopbackup
+usr/local/bin/ipcopbkcfg
+usr/local/bin/ipcopreboot
+usr/local/bin/ipcoprestore
+usr/local/bin/ipsecctrl
+usr/local/bin/ipsecupdown.sh
+usr/local/bin/iptableswrapper
+usr/local/bin/logwatch
+usr/local/bin/make
+usr/local/bin/makegraphs.pl
+usr/local/bin/makesquidconf.pl
+usr/local/bin/monitorTraffic.pl
+usr/local/bin/openvpn.sh
+usr/local/bin/openvpnctrl
+usr/local/bin/openvpnverify
+usr/local/bin/puzzleFwRules.pl
+usr/local/bin/readhash
+usr/local/bin/rebuildhosts
+usr/local/bin/rebuildlangtexts
+usr/local/bin/red
+usr/local/bin/redirectwrapper
+usr/local/bin/resetusb
+usr/local/bin/restartdhcp
+usr/local/bin/restarthttpd
+usr/local/bin/restartntpd
+usr/local/bin/restartshaping
+usr/local/bin/restartsquid
+usr/local/bin/restartssh
+usr/local/bin/restartsyslogd
+usr/local/bin/savelog
+usr/local/bin/scheduler.pl
+usr/local/bin/setaliases
+usr/local/bin/setdate
+usr/local/bin/setddns.pl
+usr/local/bin/setfwrules
+usr/local/bin/setreservedports.pl
+usr/local/bin/sysinfo
+usr/local/bin/trafficsum
+usr/local/bin/updatelists.pl
+usr/local/bin/updatemenu.pl
+usr/local/bin/upgrade.sh
+usr/local/bin/vpn-watch
+usr/local/sbin/installflash.sh
+usr/local/sbin/updatekernel.pl
+usr/sbin/usb_modeswitch.sh
Deleted: ipcop/trunk/config/rootfiles/common/misc-progs
===================================================================
--- ipcop/trunk/config/rootfiles/common/misc-progs 2014-05-17 10:24:37 UTC
(rev 7541)
+++ ipcop/trunk/config/rootfiles/common/misc-progs 2014-05-17 10:27:38 UTC
(rev 7542)
@@ -1,101 +0,0 @@
-#etc/rc.d
-#etc/rc.d/rc.bewanadsl
-etc/rc.d/rc.conexantpciadsl
-#etc/rc.d/rc.conexantusbadsl
-etc/rc.d/rc.connectioncheck
-etc/rc.d/rc.dnsmasq
-etc/rc.d/rc.eagleusbadsl
-etc/rc.d/rc.eciadsl
-etc/rc.d/rc.event
-etc/rc.d/rc.event.local
-etc/rc.d/rc.firewall
-etc/rc.d/rc.firewall.local
-etc/rc.d/rc.flash.down
-etc/rc.d/rc.flash.up
-etc/rc.d/rc.fritzdsl
-etc/rc.d/rc.halt
-etc/rc.d/rc.isdn
-etc/rc.d/rc.net
-etc/rc.d/rc.pulsardsl
-etc/rc.d/rc.red
-etc/rc.d/rc.solosdsl
-etc/rc.d/rc.sysinit
-etc/rc.d/rc.updatered
-etc/rc.d/rc.wanpipe
-sbin/mkinitramfs
-#usr/lib/ipcop
-usr/lib/ipcop/DataAccess.pl
-usr/lib/ipcop/countries.pl
-usr/lib/ipcop/ddns-lib.pl
-usr/lib/ipcop/firewall-lib.pl
-usr/lib/ipcop/general-functions.pl
-usr/lib/ipcop/header.pl
-usr/lib/ipcop/lang.pl
-usr/lib/ipcop/library.sh
-#usr/lib/ipcop/multilines.pl
-usr/lib/ipcop/protocols.pl
-usr/lib/ipcop/scheduler-lib.pl
-usr/lib/ipcop/traffic-lib.pl
-usr/lib/ipcop/vpn-functions.pl
-usr/local/bin/Make
-usr/local/bin/accountingctrl
-usr/local/bin/aggregatetraffic.pl
-usr/local/bin/blacklistupdate.pl
-#usr/local/bin/build-rdepend
-usr/local/bin/cc
-usr/local/bin/compile.help
-usr/local/bin/configure
-usr/local/bin/conntrack_helper
-usr/local/bin/dhcpcd.sh
-usr/local/bin/disk-partition.sh
-usr/local/bin/emailhelper
-usr/local/bin/gcc
-usr/local/bin/httpscert
-usr/local/bin/installfcdsl
-usr/local/bin/installpackage
-usr/local/bin/iowrap
-usr/local/bin/ipcopbackup
-usr/local/bin/ipcopbkcfg
-usr/local/bin/ipcopreboot
-usr/local/bin/ipcoprestore
-usr/local/bin/ipsecctrl
-usr/local/bin/ipsecupdown.sh
-usr/local/bin/iptableswrapper
-usr/local/bin/logwatch
-usr/local/bin/make
-usr/local/bin/makegraphs.pl
-usr/local/bin/makesquidconf.pl
-usr/local/bin/monitorTraffic.pl
-usr/local/bin/openvpn.sh
-usr/local/bin/openvpnctrl
-usr/local/bin/openvpnverify
-usr/local/bin/puzzleFwRules.pl
-usr/local/bin/readhash
-usr/local/bin/rebuildhosts
-usr/local/bin/rebuildlangtexts
-usr/local/bin/red
-usr/local/bin/redirectwrapper
-usr/local/bin/resetusb
-usr/local/bin/restartdhcp
-usr/local/bin/restarthttpd
-usr/local/bin/restartntpd
-usr/local/bin/restartshaping
-usr/local/bin/restartsquid
-usr/local/bin/restartssh
-usr/local/bin/restartsyslogd
-usr/local/bin/savelog
-usr/local/bin/scheduler.pl
-usr/local/bin/setaliases
-usr/local/bin/setdate
-usr/local/bin/setddns.pl
-usr/local/bin/setfwrules
-usr/local/bin/setreservedports.pl
-usr/local/bin/sysinfo
-usr/local/bin/trafficsum
-usr/local/bin/updatelists.pl
-usr/local/bin/updatemenu.pl
-usr/local/bin/upgrade.sh
-usr/local/bin/vpn-watch
-usr/local/sbin/installflash.sh
-usr/local/sbin/updatekernel.pl
-usr/sbin/usb_modeswitch.sh
Deleted: ipcop/trunk/lfs/installer
===================================================================
--- ipcop/trunk/lfs/installer 2014-05-17 10:24:37 UTC (rev 7541)
+++ ipcop/trunk/lfs/installer 2014-05-17 10:27:38 UTC (rev 7542)
@@ -1,73 +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: #
-# 30-12-2003 Alan Hourihane <al...@fairlite.demon.co.uk> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = installer
-HOST_ARCH = all
-OTHER_SRC = no
-
-THISAPP = installer
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(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
-
- mkdir -p /$(INSTALLER_DIR)/initramfs/bin
- cd $(DIR_APP) && install -m 0755 installer
/$(INSTALLER_DIR)/initramfs/bin
- cd $(DIR_APP) && install -m 0755 setup /usr/local/sbin
-
- @rm -rf $(DIR_APP)
- # yes we want it rebuilt at each time, so no POSTBUILD
Copied: ipcop/trunk/lfs/ipcop-installer (from rev 7539,
ipcop/trunk/lfs/installer)
===================================================================
--- ipcop/trunk/lfs/ipcop-installer (rev 0)
+++ ipcop/trunk/lfs/ipcop-installer 2014-05-17 10:27:38 UTC (rev 7542)
@@ -0,0 +1,73 @@
+###############################################################################
+# 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: #
+# 30-12-2003 Alan Hourihane <al...@fairlite.demon.co.uk> #
+# - Modified Makefile for IPCop build #
+# #
+# $Id$
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME = installer
+HOST_ARCH = all
+OTHER_SRC = no
+
+THISAPP = installer
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+install : $(TARGET)
+
+check :
+
+download :
+
+md5 :
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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
+
+ mkdir -p /$(INSTALLER_DIR)/initramfs/bin
+ cd $(DIR_APP) && install -m 0755 installer
/$(INSTALLER_DIR)/initramfs/bin
+ cd $(DIR_APP) && install -m 0755 setup /usr/local/sbin
+
+ @rm -rf $(DIR_APP)
+ # yes we want it rebuilt at each time, so no POSTBUILD
Copied: ipcop/trunk/lfs/ipcop-progs (from rev 7539, ipcop/trunk/lfs/misc-progs)
===================================================================
--- ipcop/trunk/lfs/ipcop-progs (rev 0)
+++ ipcop/trunk/lfs/ipcop-progs 2014-05-17 10:27:38 UTC (rev 7542)
@@ -0,0 +1,108 @@
+###############################################################################
+# 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 = ipcop-progs
+HOST_ARCH = all
+OTHER_SRC = yes
+
+THISAPP = ipcop-progs
+DIR_APP = $(DIR_SRC)/progs
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+install : $(TARGET)
+
+check :
+
+download :
+
+md5 :
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(DIR_SRC)/src/rc.d/*
$(DIR_SRC)/src/progs/* $(DIR_SRC)/src/scripts/* $(DIR_SRC)/src/libs/*
+ @$(PREBUILD)
+
+ # rc.d scripts
+ mkdir -p /etc/rc.d
+ cp -fv $(DIR_SRC)/src/rc.d/rc.* /etc/rc.d
+ chmod -R 755 /etc/rc.d
+
+ # Scripts
+ cp -fv $(DIR_SRC)/src/scripts/* /usr/local/bin/
+ for i in `find $(DIR_SRC)/src/scripts -maxdepth 1 -type f`; do \
+ chmod 755 /usr/local/bin/`basename $$i`; \
+ done
+ # Move flash install script
+ mv -f /usr/local/bin/installflash.sh /usr/local/sbin/installflash.sh
+ # Move updatekernel script
+ mv -f /usr/local/bin/updatekernel.pl /usr/local/sbin/updatekernel.pl
+ # Move mkinitramfs script
+ mv -f /usr/local/bin/mkinitramfs /sbin/mkinitramfs
+ # Move usb modeswitch script
+ mv -f /usr/local/bin/usb_modeswitch.sh /usr/sbin/usb_modeswitch.sh
+ # Symlink compile info
+ for i in cc configure gcc make Make; do \
+ ln -sf /usr/local/bin/compile.help "/usr/local/bin/$$i"; \
+ done
+
+ # lib files containing helper subs
+ mkdir -p /usr/lib/ipcop
+ cp -fv $(DIR_SRC)/src/libs/* /usr/lib/ipcop
+ for i in `find $(DIR_SRC)/src/libs -maxdepth 1 -type f`; do \
+ chmod 644 /usr/lib/ipcop/`basename $$i`; \
+ chown root.root /usr/lib/ipcop/`basename $$i`; \
+ done
+ # Modify variable in general-functions.pl
+ sed -i -e "s+VERSION+$(VERSION)+g" \
+ -e "s+MACHINE+$(MACHINE)+g"
/usr/lib/ipcop/general-functions.pl
+
+ # miscellaneous programs
+ @rm -rf $(DIR_APP) $(DIR_SRC)/installer && cp -R $(DIR_SRC)/src/progs/
$(DIR_SRC)
+
+ cp -R $(DIR_SRC)/src/installer/ $(DIR_SRC)
+
+ cd $(DIR_SRC)/installer && make CFLAGS="$(CFLAGS) -Wall \
+ -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"'" helper
+ cd $(DIR_APP) && make CFLAGS="$(CFLAGS) -Wall \
+ -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"'"
+ cd $(DIR_APP) && make install
+
+ @rm -rf $(DIR_APP) $(DIR_SRC)/installer
+ @$(POSTBUILD)
Deleted: ipcop/trunk/lfs/misc-progs
===================================================================
--- ipcop/trunk/lfs/misc-progs 2014-05-17 10:24:37 UTC (rev 7541)
+++ ipcop/trunk/lfs/misc-progs 2014-05-17 10:27:38 UTC (rev 7542)
@@ -1,108 +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 = misc-progs
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = misc-progs
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(DIR_SRC)/src/rc.d/*
$(DIR_SRC)/src/misc-progs/* $(DIR_SRC)/src/scripts/* $(DIR_SRC)/src/libs/*
- @$(PREBUILD)
-
- # rc.d scripts
- mkdir -p /etc/rc.d
- cp -fv $(DIR_SRC)/src/rc.d/rc.* /etc/rc.d
- chmod -R 755 /etc/rc.d
-
- # Scripts
- cp -fv $(DIR_SRC)/src/scripts/* /usr/local/bin/
- for i in `find $(DIR_SRC)/src/scripts -maxdepth 1 -type f`; do \
- chmod 755 /usr/local/bin/`basename $$i`; \
- done
- # Move flash install script
- mv -f /usr/local/bin/installflash.sh /usr/local/sbin/installflash.sh
- # Move updatekernel script
- mv -f /usr/local/bin/updatekernel.pl /usr/local/sbin/updatekernel.pl
- # Move mkinitramfs script
- mv -f /usr/local/bin/mkinitramfs /sbin/mkinitramfs
- # Move usb modeswitch script
- mv -f /usr/local/bin/usb_modeswitch.sh /usr/sbin/usb_modeswitch.sh
- # Symlink compile info
- for i in cc configure gcc make Make; do \
- ln -sf /usr/local/bin/compile.help "/usr/local/bin/$$i"; \
- done
-
- # lib files containing helper subs
- mkdir -p /usr/lib/ipcop
- cp -fv $(DIR_SRC)/src/libs/* /usr/lib/ipcop
- for i in `find $(DIR_SRC)/src/libs -maxdepth 1 -type f`; do \
- chmod 644 /usr/lib/ipcop/`basename $$i`; \
- chown root.root /usr/lib/ipcop/`basename $$i`; \
- done
- # Modify variable in general-functions.pl
- sed -i -e "s+VERSION+$(VERSION)+g" \
- -e "s+MACHINE+$(MACHINE)+g"
/usr/lib/ipcop/general-functions.pl
-
- # miscellaneous programs
- @rm -rf $(DIR_APP) $(DIR_SRC)/installer && cp -R
$(DIR_SRC)/src/misc-progs/ $(DIR_SRC)
-
- cp -R $(DIR_SRC)/src/installer/ $(DIR_SRC)
-
- cd $(DIR_SRC)/installer && make CFLAGS="$(CFLAGS) -Wall \
- -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"'" helper
- cd $(DIR_APP) && make CFLAGS="$(CFLAGS) -Wall \
- -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"'"
- cd $(DIR_APP) && make install
-
- @rm -rf $(DIR_APP) $(DIR_SRC)/installer
- @$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-05-17 10:24:37 UTC (rev 7541)
+++ ipcop/trunk/make.sh 2014-05-17 10:27:38 UTC (rev 7542)
@@ -1895,6 +1895,7 @@
chroot_make iptstate
chroot_make iftop
chroot_make ipcop-gui
+ chroot_make ipcop-progs
chroot_make iperf
chroot_make iputils
chroot_make isdn4k-utils
@@ -1904,7 +1905,6 @@
chroot_make lsof
chroot_make lzo # OpenVPN
chroot_make mdadm
- chroot_make misc-progs
chroot_make nano
chroot_make nasm # only used in case we patch and fully
compile syslinux
chroot_make sqlite # before DBD-SQLite and ulogd that
depend on it
@@ -2006,7 +2006,7 @@
STAGE=packages
chroot_make fix-up
- chroot_make installer
+ chroot_make ipcop-installer
chroot_make ipcop-initramfs
if [ x"${SKIP_FLOPPY_IMAGES}" != x"yes" ]; then
chroot_make ipcop-boot-floppy
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
