From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26740 invoked by alias); 4 May 2009 07:44:19 -0000 Received: (qmail 26734 invoked by alias); 4 May 2009 07:44:19 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - gfs2: fsck and mkfs binaries should be in /sbin To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: f0f94d388f158ff2f80dca6aacff3b41c291f79f X-Git-Newrev: ba3acfc85402118fd955a67ef748078387458e78 From: "Fabio M. Di Nitto" Message-Id: <20090504074355.3290A12036F@lists.fedorahosted.org> Date: Mon, 04 May 2009 07:44:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00158.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ba3acfc85402118fd955a67ef748078387458e78 Commit: ba3acfc85402118fd955a67ef748078387458e78 Parent: f0f94d388f158ff2f80dca6aacff3b41c291f79f Author: Fabio M. Di Nitto AuthorDate: Mon May 4 09:43:14 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Mon May 4 09:43:14 2009 +0200 gfs2: fsck and mkfs binaries should be in /sbin also cleanup the Makefiles and remove more obsolted compat symlinks and use the new FORCESBINT target for mount. Signed-off-by: Fabio M. Di Nitto --- gfs2/fsck/Makefile | 17 ++++++----------- gfs2/mkfs/Makefile | 19 ++++++++----------- gfs2/mount/Makefile | 21 +++++++++------------ 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/gfs2/fsck/Makefile b/gfs2/fsck/Makefile index 0422acc..7a99b36 100644 --- a/gfs2/fsck/Makefile +++ b/gfs2/fsck/Makefile @@ -1,10 +1,8 @@ -TARGET1= fsck.gfs2 -TARGET2= gfs2_fsck +TARGET= fsck.gfs2 -SBINDIRT=$(TARGET1) -SBINSYMT=$(TARGET2) +FORCESBINT=$(TARGET) -all: depends ${TARGET1} ${TARGET2} +all: depends ${TARGET} include ../../make/defines.mk include $(OBJDIR)/make/cobj.mk @@ -41,12 +39,9 @@ LDFLAGS += -L${libdir} LDDEPS += ../libgfs2/libgfs2.a -${TARGET1}: $(OBJS) ../libgfs2/libgfs2.a +${TARGET}: $(OBJS) ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) -${TARGET2}: ${TARGET1} ${LDDEPS} - ln -fs ${TARGET1} ${TARGET2} - depends: $(MAKE) -C ../libgfs2 all @@ -59,9 +54,9 @@ test_bitmap: test_bitmap.o log.o clean: generalclean rm -f test_block_list test_bitmap -${TARGET1}.pot: $(OBJS:.o=.c) +${TARGET}.pot: $(OBJS:.o=.c) xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_ \ --keyword=log_notice --keyword=log_warn --keyword=log_err --keyword=log_crit \ - --keyword=log_debug --keyword=log_err --keyword=log_print -d - $(OBJS:.o=.c) > ${TARGET1}.pot + --keyword=log_debug --keyword=log_err --keyword=log_print -d - $(OBJS:.o=.c) > ${TARGET}.pot -include $(OBJS:.o=.d) diff --git a/gfs2/mkfs/Makefile b/gfs2/mkfs/Makefile index e268c38..aff94df 100644 --- a/gfs2/mkfs/Makefile +++ b/gfs2/mkfs/Makefile @@ -1,12 +1,12 @@ TARGET1= mkfs.gfs2 -TARGET2= gfs2_mkfs -TARGET3= gfs2_jadd -TARGET4= gfs2_grow +TARGET2= gfs2_jadd +TARGET3= gfs2_grow -SBINDIRT=$(TARGET1) -SBINSYMT=$(TARGET2) $(TARGET3) $(TARGET4) +FORCESBINT= $(TARGET1) -all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} +SBINSYMT=$(TARGET2) $(TARGET3) + +all: depends ${TARGET1} ${TARGET2} ${TARGET3} include ../../make/defines.mk include $(OBJDIR)/make/cobj.mk @@ -35,13 +35,10 @@ ${TARGET1}: ${OBJS} ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) ${TARGET2}: ${TARGET1} - ln -sf ${TARGET1} ${TARGET2} + ln -sf /sbin/${TARGET1} ${TARGET2} ${TARGET3}: ${TARGET1} - ln -sf ${TARGET1} ${TARGET3} - -${TARGET4}: ${TARGET1} - ln -sf ${TARGET1} ${TARGET4} + ln -sf /sbin/${TARGET1} ${TARGET3} depends: $(MAKE) -C ../libgfs2 all diff --git a/gfs2/mount/Makefile b/gfs2/mount/Makefile index 8706b17..e653348 100644 --- a/gfs2/mount/Makefile +++ b/gfs2/mount/Makefile @@ -1,12 +1,16 @@ -TARGET1= mount.gfs2 +TARGET= mount.gfs2 -all: ${TARGET1} +FORCESBINT= $(TARGET) + +all: ${TARGET} include ../../make/defines.mk include $(OBJDIR)/make/cobj.mk include $(OBJDIR)/make/clean.mk +include $(OBJDIR)/make/install.mk +include $(OBJDIR)/make/uninstall.mk -OBJS1= mount.gfs2.o \ +OBJS= mount.gfs2.o \ ondisk1.o \ util.o \ mtab.o @@ -23,16 +27,9 @@ LDFLAGS += -L${libdir} LDDEPS += ../../group/libgfscontrol/libgfscontrol.a -${TARGET1}: ${OBJS1} ${LDDEPS} +${TARGET}: ${OBJS} ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) -install: - mkdir -p ${DESTDIR}/sbin - install ${TARGET1} ${DESTDIR}/sbin - -uninstall: - ${UNINSTALL} ${TARGET1} ${DESTDIR}/sbin - clean: generalclean --include $(OBJS1:.o=.d) +-include $(OBJS:.o=.d)