Merge remote-tracking branch 'origin/next' into thirteen

[people/teissler/ipfire-2.x.git] / lfs / reiserfsprogs

diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs
index 9e37caf8c5e7b6c4e75309234631b580c207b367..402753ee02597d9cef162fead7cc96cda0df0675 100644 (file)
--- a/lfs/reiserfsprogs
+++ b/lfs/reiserfsprogs
@@ -24,17 +24,13 @@
 
 include Config
 
-VER        = 3.6.19
+VER        = 3.6.21
 
 THISAPP    = reiserfsprogs-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 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
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b42cf15f6651c3ceff5cb84996c0d539
+$(DL_FILE)_MD5 = 0639cefac8f8150536cfa7531c2aa2d2
 
 install : $(TARGET)
 
@@ -73,17 +69,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(LFS_PASS)" "install"
-       cd $(DIR_APP) && ./configure --prefix=/ --sbindir=/sbin
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && install -v -m 755 mkreiserfs/mkreiserfs /install/initrd/sbin/mkreiserfs
-else
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        ln -svf reiserfsck /sbin/fsck.reiserfs
        ln -svf mkreiserfs /sbin/mkfs.reiserfs
-endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)