This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via ba801eb10cd94a9c25d409b9596200d91fa94c5a (commit)
via 378c20769d13dd890f804d765c562c2f3b05995c (commit)
from 50a84cd283d64dd1573611c8a57fd659e6cfb47f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ba801eb10cd94a9c25d409b9596200d91fa94c5a
Merge: 50a84cd 378c207
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 1 22:00:37 2010 +0200
Merge branch 'reiser4'
commit 378c20769d13dd890f804d765c562c2f3b05995c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Aug 1 15:15:51 2010 +0200
Remove reiser4progs from installer system.
The installer does not support installation on
reiser4 any more.
-----------------------------------------------------------------------
Summary of changes:
lfs/libaal | 12 +-----------
lfs/reiser4progs | 16 +---------------
make.sh | 2 --
3 files changed, 2 insertions(+), 28 deletions(-)
Difference in files:
diff --git a/lfs/libaal b/lfs/libaal
index 99ede17..08d8ac1 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 92a9338..99cbb84 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 15b049e..a7cda09 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
hooks/post-receive
--
IPFire 2.x development tree