From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Aug 2010 13:15:51 +0000 (+0200)
Subject: Remove reiser4progs from installer system.
X-Git-Tag: v2.9-beta1~138^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=378c20769d13dd890f804d765c562c2f3b05995c

Remove reiser4progs from installer system.

The installer does not support installation on
reiser4 any more.
---

diff --git a/lfs/libaal b/lfs/libaal
index 99ede17b01..08d8ac1efb 100644
--- a/lfs/libaal
+++ b/lfs/libaal
@@ -30,11 +30,7 @@ THISAPP    = libaal-$(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
@@ -74,14 +70,8 @@ $(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=/opt/$(MACHINE)-uClibc
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-else
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/reiser4progs b/lfs/reiser4progs
index 92a9338d78..99cbb84342 100644
--- a/lfs/reiser4progs
+++ b/lfs/reiser4progs
@@ -30,11 +30,7 @@ THISAPP    = reiser4progs-$(VER)
 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
@@ -74,18 +70,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(LFS_PASS)" "install"
-	cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc \
-			--with-libaal=/opt/$(MACHINE)-uClibc \
-			--without-readline --disable-shared \
-			--sbindir=/install/initrd/sbin
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	-rm -f /install/initrd/{debugfs.,measurefs.,make_}reiser4
-else
 	cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --enable-static
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 15b049eed6..a7cda0919a 100755
--- a/make.sh
+++ b/make.sh
@@ -682,8 +682,6 @@ buildinstaller() {
   installmake popt
   installmake sysvinit
   installmake misc-progs
-  installmake libaal
-  installmake reiser4progs
   installmake reiserfsprogs
   installmake sysfsutils
   installmake util-linux