From d02350a277a2087f3f774400d1c380510bfbfba9 Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 15 Feb 2007 09:22:09 +0000 Subject: [PATCH] NTFS-Treiber eingebaut fuer das Festplattenfeature von Silvio Morning Reconnect auf 5 Uhr verschoben... git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@419 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/cfgroot/connscheduler.conf | 2 +- config/rootfiles/common/fuse | 30 +++++++++++ config/rootfiles/common/ntfs-3g | 39 ++++++++++++++ doc/packages-list.txt | 2 + lfs/fuse | 86 +++++++++++++++++++++++++++++++ lfs/ntfs-3g | 82 +++++++++++++++++++++++++++++ make.sh | 3 ++ 7 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/common/fuse create mode 100644 config/rootfiles/common/ntfs-3g create mode 100644 lfs/fuse create mode 100644 lfs/ntfs-3g diff --git a/config/cfgroot/connscheduler.conf b/config/cfgroot/connscheduler.conf index 0700506243..9bcf1955d5 100644 --- a/config/cfgroot/connscheduler.conf +++ b/config/cfgroot/connscheduler.conf @@ -1 +1 @@ -on,reconnect,,06:00,weekdays,,Mon Tue Wed Thu Fri Sat Sun ,,MorningReconnect +on,reconnect,,05:00,weekdays,,Mon Tue Wed Thu Fri Sat Sun ,,MorningReconnect diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse new file mode 100644 index 0000000000..2015c96443 --- /dev/null +++ b/config/rootfiles/common/fuse @@ -0,0 +1,30 @@ +#etc/rc.d/init.d/fuse +etc/udev/rules.d/99-fuse.rules +#lib/modules/2.6.16/kernel/fs/fuse +lib/modules/2.6.16/kernel/fs/fuse/fuse.ko +#lib/modules/2.6.16-smp/kernel/fs/fuse +lib/modules/2.6.16-smp/kernel/fs/fuse/fuse.ko +sbin/mount.fuse +usr/bin/fusermount +usr/bin/ulockmgr_server +#usr/include/fuse +#usr/include/fuse.h +#usr/include/fuse/fuse.h +#usr/include/fuse/fuse_common.h +#usr/include/fuse/fuse_common_compat.h +#usr/include/fuse/fuse_compat.h +#usr/include/fuse/fuse_lowlevel.h +#usr/include/fuse/fuse_lowlevel_compat.h +#usr/include/fuse/fuse_opt.h +#usr/include/ulockmgr.h +#usr/lib/libfuse.a +#usr/lib/libfuse.la +usr/lib/libfuse.so +usr/lib/libfuse.so.2 +usr/lib/libfuse.so.2.6.3 +#usr/lib/libulockmgr.a +#usr/lib/libulockmgr.la +usr/lib/libulockmgr.so +usr/lib/libulockmgr.so.1 +usr/lib/libulockmgr.so.1.0.1 +#usr/lib/pkgconfig/fuse.pc diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g new file mode 100644 index 0000000000..01f153669a --- /dev/null +++ b/config/rootfiles/common/ntfs-3g @@ -0,0 +1,39 @@ +sbin/mount.ntfs-3g +usr/bin/ntfs-3g +#usr/include/ntfs-3g +#usr/include/ntfs-3g/attrib.h +#usr/include/ntfs-3g/attrlist.h +#usr/include/ntfs-3g/bitmap.h +#usr/include/ntfs-3g/bootsect.h +#usr/include/ntfs-3g/collate.h +#usr/include/ntfs-3g/compat.h +#usr/include/ntfs-3g/compress.h +#usr/include/ntfs-3g/debug.h +#usr/include/ntfs-3g/device.h +#usr/include/ntfs-3g/device_io.h +#usr/include/ntfs-3g/dir.h +#usr/include/ntfs-3g/endians.h +#usr/include/ntfs-3g/index.h +#usr/include/ntfs-3g/inode.h +#usr/include/ntfs-3g/layout.h +#usr/include/ntfs-3g/lcnalloc.h +#usr/include/ntfs-3g/list.h +#usr/include/ntfs-3g/logfile.h +#usr/include/ntfs-3g/logging.h +#usr/include/ntfs-3g/mft.h +#usr/include/ntfs-3g/mst.h +#usr/include/ntfs-3g/ntfstime.h +#usr/include/ntfs-3g/runlist.h +#usr/include/ntfs-3g/security.h +#usr/include/ntfs-3g/support.h +#usr/include/ntfs-3g/types.h +#usr/include/ntfs-3g/unistr.h +#usr/include/ntfs-3g/version.h +#usr/include/ntfs-3g/volume.h +#usr/lib/libntfs-3g.a +#usr/lib/libntfs-3g.la +usr/lib/libntfs-3g.so +usr/lib/libntfs-3g.so.0 +usr/lib/libntfs-3g.so.0.0.0 +#usr/man/man8/mount.ntfs-3g.8 +#usr/man/man8/ntfs-3g.8 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 91ffd51a0c..6a5b920993 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -79,6 +79,7 @@ * findutils-4.2.27 * flex-2.5.33 * freetype-2.1.10 +* fuse-2.6.3 * fwhits * gawk-3.1.5 * gcc-4.0.3 @@ -174,6 +175,7 @@ * nfs-utils-1.0.8 * nmap-4.03 * noip_updater_v1.6 +* ntfs-3g-0.20070207-RC1 * ntop-3.2 * ntp-4.2.2 * ocaml-3.09.2 diff --git a/lfs/fuse b/lfs/fuse new file mode 100644 index 0000000000..68b3e131df --- /dev/null +++ b/lfs/fuse @@ -0,0 +1,86 @@ +############################################################################### +# 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 # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.6.3 + +THISAPP = fuse-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +ifeq "$(SMP)" "1" + TARGET = $(DIR_INFO)/$(THISAPP)-smp +else + TARGET = $(DIR_INFO)/$(THISAPP) +endif + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 3f4f5d07d12dedc0a3fd23472171fe94 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --with-kernel=/usr/src/linux + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g new file mode 100644 index 0000000000..dcfc3b6789 --- /dev/null +++ b/lfs/ntfs-3g @@ -0,0 +1,82 @@ +############################################################################### +# 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 # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.20070207-RC1 + +THISAPP = ntfs-3g-$(VER) +DL_FILE = $(THISAPP).tgz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 7c8c7a1338a0d36e315b665422e04c46 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d7514aad46..63ffa6edb9 100644 --- a/make.sh +++ b/make.sh @@ -333,6 +333,7 @@ buildipfire() { ipfiremake fcpci SMP=1 # ipfiremake promise-sata-300-tx SMP=1 ipfiremake zaptel SMP=1 + ipfiremake fuse SMP=1 ipfiremake linux ipfiremake ipp2p ipfiremake fcdsl @@ -343,6 +344,7 @@ buildipfire() { ipfiremake fcpci # ipfiremake promise-sata-300-tx ipfiremake zaptel + ipfiremake fuse ipfiremake expat ipfiremake gdbm ipfiremake gmp @@ -381,6 +383,7 @@ buildipfire() { ipfiremake dosfstools ipfiremake reiserfsprogs ipfiremake squashfstools + ipfiremake ntfs-3g ipfiremake ethtool ipfiremake ez-ipupdate ipfiremake fcron -- 2.39.2