X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fe2fsprogs;h=dff6393fd5e246005adb825b58eb793d88401cb7;hp=2fe25fd17eefcc4d930ef2496a1141e55ca30d60;hb=764a3f1ff2384f34c592c311f5435a24eb6a53c8;hpb=76ed51e8f6b2f7e072f4c4da92d9abfde6e5c590

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 2fe25fd17e..dff6393fd5 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# 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 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# 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 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 <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,17 +24,13 @@
 
 include Config
 
-VER      = 1.39
+VER      = 1.42.6
 
 THISAPP    = e2fsprogs-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -46,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 06f7806782e357797fad1d34b7ced0c6
+$(DL_FILE)_MD5 = 9e444c240c1001b3292d108fbad0f49c
 
 install : $(TARGET)
 
@@ -76,30 +70,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(LFS_PASS)" "install"
-	cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" ./configure --host=$(BUILDTARGET) --disable-nls \
-		--prefix=/opt/$(MACHINE)-uClibc
-	# build 'mke2fs 1.39' to override version used in busybox.
-	# To be removed when busybox will use also e2fsprogs 1.39
-	# remove link installed by busybox
-	-rm -f /install/initrd/bin/mke2fs
-	cd $(DIR_APP) && make install-libs
-	cd $(DIR_APP) && make progs
-	cd $(DIR_APP)/misc && install -m 755 mke2fs /install/initrd/bin
-	cd $(DIR_APP)/misc && install -m 755 e2initrd_helper /install/initrd/bin
-	cd $(DIR_APP)/misc && install -m 755 e2image  /install/initrd/bin
-	cd $(DIR_APP)/lib/uuid && make
-	cd $(DIR_APP)/lib/uuid && make install
-	cd $(DIR_APP)/lib/uuid && install -m 755 libuuid.a /opt/$(MACHINE)-uClibc/lib/libuuid.a
-	cd $(DIR_APP)/lib/uuid && install -m 755 uuid.h /opt/$(MACHINE)-uClibc/include/uuid.h
-	cd $(DIR_APP) && unset LD_LIBRARY_PATH
-else
 	cd $(DIR_SRC) && mkdir build
 	cd $(DIR_SRC)/build && $(DIR_APP)/configure --prefix=/usr --with-root-prefix="" \
 						--enable-elf-shlibs --disable-evms --disable-nls
 	cd $(DIR_SRC)/build && make $(MAKETUNING)
 	cd $(DIR_SRC)/build && make install
 	cd $(DIR_SRC)/build && make install-libs
-endif
 	@rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build
 	@$(POSTBUILD)